Fix ConfigConstants deprecations (#8525)

Signed-off-by: Wouter Born <github@maindrain.net>

diff --git a/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/utils/ByteArrayFileCache.java b/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/utils/ByteArrayFileCache.java
index 83ef8c254871d0ca49a27b829e8c1bd4e7284a42..da8bc5918d4950213029bf0e14b35fbfd3d3354f 100644 (file)
--- a/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/utils/ByteArrayFileCache.java
+++ b/bundles/org.openhab.binding.chromecast/src/main/java/org/openhab/binding/chromecast/internal/utils/ByteArrayFileCache.java
@@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,7 +64,7 @@ public class ByteArrayFileCache {
     public ByteArrayFileCache(String servicePID) {
         // TODO track and limit folder size
         // TODO support user specific folder
-        cacheFolder = new File(new File(ConfigConstants.getUserDataFolder(), CACHE_FOLDER_NAME), servicePID);
+        cacheFolder = new File(new File(OpenHAB.getUserDataFolder(), CACHE_FOLDER_NAME), servicePID);
         if (!cacheFolder.exists()) {
             logger.debug("Creating cache folder '{}'", cacheFolder.getAbsolutePath());
             cacheFolder.mkdirs();

diff --git a/bundles/org.openhab.binding.darksky/src/main/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCache.java b/bundles/org.openhab.binding.darksky/src/main/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCache.java
index adbda0bb7b985e9f75be366bccf70235b6f65e72..2bc89ff05ba0609d443e5d720401251cce5071aa 100644 (file)
--- a/bundles/org.openhab.binding.darksky/src/main/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCache.java
+++ b/bundles/org.openhab.binding.darksky/src/main/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCache.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,7 +63,7 @@ public class ByteArrayFileCache {
     public ByteArrayFileCache(String servicePID) {
         // TODO track and limit folder size
         // TODO support user specific folder
-        cacheFolder = new File(new File(ConfigConstants.getUserDataFolder(), CACHE_FOLDER_NAME), servicePID);
+        cacheFolder = new File(new File(OpenHAB.getUserDataFolder(), CACHE_FOLDER_NAME), servicePID);
         if (!cacheFolder.exists()) {
             logger.debug("Creating cache folder '{}'", cacheFolder.getAbsolutePath());
             cacheFolder.mkdirs();

diff --git a/bundles/org.openhab.binding.darksky/src/test/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCacheTest.java b/bundles/org.openhab.binding.darksky/src/test/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCacheTest.java
index eb1ab1075cd70a1cefefef55c696aef6bd5a24b8..a0d8bd4c338517baf5c2b8a525caa712078ac2d4 100644 (file)
--- a/bundles/org.openhab.binding.darksky/src/test/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCacheTest.java
+++ b/bundles/org.openhab.binding.darksky/src/test/java/org/openhab/binding/darksky/internal/utils/ByteArrayFileCacheTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 
 /**
  * Test class for the {@link ByteArrayFileCache} class.
@@ -34,7 +34,7 @@ public class ByteArrayFileCacheTest {
 
     private static final String SERVICE_PID = "org.openhab.binding.darksky";
 
-    private static final File USERDATA_FOLDER = new File(ConfigConstants.getUserDataFolder());
+    private static final File USERDATA_FOLDER = new File(OpenHAB.getUserDataFolder());
     private static final File CACHE_FOLDER = new File(USERDATA_FOLDER, ByteArrayFileCache.CACHE_FOLDER_NAME);
     private static final File SERVICE_CACHE_FOLDER = new File(CACHE_FOLDER, SERVICE_PID);
 

diff --git a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
index d1d016f181cf072a0a20ce7e05e688c5f362f04e..cdafd275f690ecfa91d8fa1d94e870dc86b43359 100644 (file)
--- a/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
+++ b/bundles/org.openhab.binding.exec/src/main/java/org/openhab/binding/exec/internal/ExecWhitelistWatchService.java
@@ -26,7 +26,7 @@ import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.service.AbstractWatchService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @Component(service = ExecWhitelistWatchService.class)
 @NonNullByDefault
 public class ExecWhitelistWatchService extends AbstractWatchService {
-    private static final String COMMAND_WHITELIST_PATH = ConfigConstants.getConfigFolder() + File.separator + "misc";
+    private static final String COMMAND_WHITELIST_PATH = OpenHAB.getConfigFolder() + File.separator + "misc";
     private static final String COMMAND_WHITELIST_FILE = "exec.whitelist";
 
     private final Logger logger = LoggerFactory.getLogger(ExecWhitelistWatchService.class);

diff --git a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java
index 40c346cee858c5ac5050b3f36be1549949db277f..5f943544ee1442bcef7fb0c7fdcb6891082bbfe6 100644 (file)
--- a/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java
+++ b/bundles/org.openhab.binding.icalendar/src/main/java/org/openhab/binding/icalendar/internal/handler/ICalendarHandler.java
@@ -35,7 +35,7 @@ import org.openhab.binding.icalendar.internal.logic.CalendarException;
 import org.openhab.binding.icalendar.internal.logic.CommandTag;
 import org.openhab.binding.icalendar.internal.logic.CommandTagType;
 import org.openhab.binding.icalendar.internal.logic.Event;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.events.EventPublisher;
 import org.openhab.core.items.events.ItemEventFactory;
 import org.openhab.core.library.types.DateTimeType;
@@ -75,7 +75,7 @@ public class ICalendarHandler extends BaseThingHandler implements CalendarUpdate
     public ICalendarHandler(Thing thing, HttpClient httpClient, EventPublisher eventPublisher) {
         super(thing);
         this.httpClient = httpClient;
-        calendarFile = new File(ConfigConstants.getUserDataFolder() + File.separator
+        calendarFile = new File(OpenHAB.getUserDataFolder() + File.separator
                 + getThing().getUID().getAsString().replaceAll("[<>:\"/\\\\|?*]", "_") + ".ical");
         eventPublisherCallback = eventPublisher;
         updateStatesLastCalledTime = Instant.now();

diff --git a/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCache.java b/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCache.java
index 9a26358625bddbaefa55032291944809568acd20..9eced3e4ab245d0a4c95a0aa6d18f81cfe511cca 100644 (file)
--- a/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCache.java
+++ b/bundles/org.openhab.binding.kodi/src/main/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCache.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -63,7 +63,7 @@ public class ByteArrayFileCache {
     public ByteArrayFileCache(String servicePID) {
         // TODO track and limit folder size
         // TODO support user specific folder
-        cacheFolder = new File(new File(ConfigConstants.getUserDataFolder(), CACHE_FOLDER_NAME), servicePID);
+        cacheFolder = new File(new File(OpenHAB.getUserDataFolder(), CACHE_FOLDER_NAME), servicePID);
         if (!cacheFolder.exists()) {
             logger.debug("Creating cache folder '{}'", cacheFolder.getAbsolutePath());
             cacheFolder.mkdirs();

diff --git a/bundles/org.openhab.binding.kodi/src/test/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCacheTest.java b/bundles/org.openhab.binding.kodi/src/test/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCacheTest.java
index 79d5ef97752783cb53e29b21106e75446a4d3b9c..cee8c42cbfe07cf2847ade934f9b7d648c574bb5 100644 (file)
--- a/bundles/org.openhab.binding.kodi/src/test/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCacheTest.java
+++ b/bundles/org.openhab.binding.kodi/src/test/java/org/openhab/binding/kodi/internal/utils/ByteArrayFileCacheTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 
 /**
  * Test class for the {@link ByteArrayFileCache} class.
@@ -34,7 +34,7 @@ public class ByteArrayFileCacheTest {
 
     private static final String SERVICE_PID = "org.openhab.binding.kodi";
 
-    private static final File USERDATA_FOLDER = new File(ConfigConstants.getUserDataFolder());
+    private static final File USERDATA_FOLDER = new File(OpenHAB.getUserDataFolder());
     private static final File CACHE_FOLDER = new File(USERDATA_FOLDER, ByteArrayFileCache.CACHE_FOLDER_NAME);
     private static final File SERVICE_CACHE_FOLDER = new File(CACHE_FOLDER, SERVICE_PID);
 

diff --git a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/MaxBackupUtils.java b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/MaxBackupUtils.java
index d679b366184054441b97f374a5decfcbc0f7fcd4..17e79daa0d6657e973549800f6e98dcf2adf1bb0 100644 (file)
--- a/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/MaxBackupUtils.java
+++ b/bundles/org.openhab.binding.max/src/main/java/org/openhab/binding/max/internal/MaxBackupUtils.java
@@ -19,7 +19,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -42,7 +42,7 @@ public class MaxBackupUtils {
 
     public MaxBackupUtils(String backupId) {
         this.backupId = backupId;
-        dbFolderName = ConfigConstants.getUserDataFolder() + File.separator + BACKUP_PATH;
+        dbFolderName = OpenHAB.getUserDataFolder() + File.separator + BACKUP_PATH;
         File folder = new File(dbFolderName);
         if (!folder.exists()) {
             folder.mkdirs();

diff --git a/bundles/org.openhab.binding.meteoblue/src/main/java/org/openhab/binding/meteoblue/internal/Forecast.java b/bundles/org.openhab.binding.meteoblue/src/main/java/org/openhab/binding/meteoblue/internal/Forecast.java
index 241e4f1a7ca0cca5d73700c754d09a26140fd3d7..ce3c9e555b11dfaaf96df268b850d6a21dce21f2 100644 (file)
--- a/bundles/org.openhab.binding.meteoblue/src/main/java/org/openhab/binding/meteoblue/internal/Forecast.java
+++ b/bundles/org.openhab.binding.meteoblue/src/main/java/org/openhab/binding/meteoblue/internal/Forecast.java
@@ -29,7 +29,7 @@ import javax.imageio.ImageIO;
 import org.openhab.binding.meteoblue.internal.json.JsonDataDay;
 import org.openhab.binding.meteoblue.internal.json.JsonMetadata;
 import org.openhab.binding.meteoblue.internal.json.JsonUnits;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -457,7 +457,7 @@ public class Forecast {
 
     private Image loadImageIcon(String imageFileName) {
         BufferedImage buf = null;
-        String configDirectory = ConfigConstants.getConfigFolder();
+        String configDirectory = OpenHAB.getConfigFolder();
         File dataFile = new File(new File(configDirectory, "icons/classic/"), imageFileName);
         if (!dataFile.exists()) {
             logger.debug("Image file '{}' does not exist. Unable to create imageIcon.", dataFile.getAbsolutePath());

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java
index f31e318423afa7b5f28683d9b4bee5a0257ee610..3ed3c0b9f4c3518d12fd649f32c10c8a51094428 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/basic/MiIoDatabaseWatchService.java
@@ -33,7 +33,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.miio.internal.MiIoBindingConstants;
 import org.openhab.binding.miio.internal.Utils;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.service.AbstractWatchService;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.FrameworkUtil;
@@ -56,7 +56,7 @@ import com.google.gson.JsonSyntaxException;
 @Component(service = MiIoDatabaseWatchService.class)
 @NonNullByDefault
 public class MiIoDatabaseWatchService extends AbstractWatchService {
-    private static final String LOCAL_DATABASE_PATH = ConfigConstants.getConfigFolder() + File.separator + "misc"
+    private static final String LOCAL_DATABASE_PATH = OpenHAB.getConfigFolder() + File.separator + "misc"
             + File.separator + BINDING_ID;
     private static final String DATABASE_FILES = ".json";
     private static final Gson GSON = new GsonBuilder().serializeNulls().create();
@@ -132,7 +132,7 @@ public class MiIoDatabaseWatchService extends AbstractWatchService {
         List<URL> urlEntries = new ArrayList<>();
         Bundle bundle = FrameworkUtil.getBundle(getClass());
         urlEntries.addAll(Collections.list(bundle.findEntries(MiIoBindingConstants.DATABASE_PATH, "*.json", false)));
-        String userDbFolder = ConfigConstants.getConfigFolder() + File.separator + "misc" + File.separator + BINDING_ID;
+        String userDbFolder = OpenHAB.getConfigFolder() + File.separator + "misc" + File.separator + BINDING_ID;
         try {
             File[] userDbFiles = new File(userDbFolder).listFiles((dir, name) -> name.endsWith(".json"));
             if (userDbFiles != null) {

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java
index 6f61c00c7d42b7b41ddf3ec52201da2c811d3c80..df947a5aeeb0a45f2739536731be39329258e067 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/cloud/CloudUtil.java
@@ -34,7 +34,7 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.openhab.binding.miio.internal.MiIoBindingConstants;
 import org.openhab.binding.miio.internal.MiIoCryptoException;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 
 /**
@@ -46,7 +46,7 @@ import org.slf4j.Logger;
 public class CloudUtil {
 
     private static final Random RANDOM = new Random();
-    private static final String DB_FOLDER_NAME = ConfigConstants.getUserDataFolder() + File.separator
+    private static final String DB_FOLDER_NAME = OpenHAB.getUserDataFolder() + File.separator
             + MiIoBindingConstants.BINDING_ID;
 
     /**

diff --git a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
index 1b1d6f79073d85997b4ad774cbea013c0af0dc99..56981c1b983b4f8b564ef1603c10690a175fcd90 100644 (file)
--- a/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
+++ b/bundles/org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoVacuumHandler.java
@@ -46,8 +46,8 @@ import org.openhab.binding.miio.internal.robot.StatusDTO;
 import org.openhab.binding.miio.internal.robot.StatusType;
 import org.openhab.binding.miio.internal.robot.VacuumErrorType;
 import org.openhab.binding.miio.internal.transport.MiIoAsyncCommunication;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.cache.ExpiringCache;
-import org.openhab.core.config.core.ConfigConstants;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.DecimalType;
 import org.openhab.core.library.types.OnOffType;
@@ -84,8 +84,7 @@ public class MiIoVacuumHandler extends MiIoAbstractHandler {
     private final Logger logger = LoggerFactory.getLogger(MiIoVacuumHandler.class);
     private static final float MAP_SCALE = 2.0f;
     private static final SimpleDateFormat DATEFORMATTER = new SimpleDateFormat("yyyyMMdd-HHmmss");
-    private static final String MAP_PATH = ConfigConstants.getUserDataFolder() + File.separator + BINDING_ID
-            + File.separator;
+    private static final String MAP_PATH = OpenHAB.getUserDataFolder() + File.separator + BINDING_ID + File.separator;
     private static final Gson GSON = new GsonBuilder().serializeNulls().create();
     private final ChannelUID mapChannelUid;
 

diff --git a/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/utils/ByteArrayFileCache.java b/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/utils/ByteArrayFileCache.java
index 927625cdf195ad897c420bb65742b4dbd64de5c0..e2edd6b61567b1e82965a717a3ab9aa1c017faba 100644 (file)
--- a/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/utils/ByteArrayFileCache.java
+++ b/bundles/org.openhab.binding.openweathermap/src/main/java/org/openhab/binding/openweathermap/internal/utils/ByteArrayFileCache.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,7 +45,7 @@ public class ByteArrayFileCache {
     public ByteArrayFileCache(String servicePID) {
         // TODO track and limit folder size
         // TODO support user specific folder
-        cacheFolder = new File(new File(new File(ConfigConstants.getUserDataFolder()), CACHE_FOLDER_NAME), servicePID);
+        cacheFolder = new File(new File(new File(OpenHAB.getUserDataFolder()), CACHE_FOLDER_NAME), servicePID);
         if (!cacheFolder.exists()) {
             logger.debug("Creating cache folder '{}'", cacheFolder.getAbsolutePath());
             cacheFolder.mkdirs();

diff --git a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/AbstractConnection.java b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/AbstractConnection.java
index 208c09cc3fc17b8b884d96692015d1e865cfe53f..c8dcd6667658f88a6383d4ccf29fe431d6d08075 100644 (file)
--- a/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/AbstractConnection.java
+++ b/bundles/org.openhab.binding.yamahareceiver/src/main/java/org/openhab/binding/yamahareceiver/internal/protocol/AbstractConnection.java
@@ -17,7 +17,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,7 +56,7 @@ public abstract class AbstractConnection {
 
     public void setProtocolSnifferEnable(boolean enable) {
         if (enable) {
-            File pathWithoutFilename = new File(ConfigConstants.getUserDataFolder());
+            File pathWithoutFilename = new File(OpenHAB.getUserDataFolder());
             pathWithoutFilename.mkdirs();
             File file = new File(pathWithoutFilename, "yamaha_trace.log");
             if (file.exists()) {

diff --git a/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java b/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java
index 010565551caae443b9cac9028cc2ec3d6cce1605..f7b15583a49cd47822acce784070209185a17380 100644 (file)
--- a/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java
+++ b/bundles/org.openhab.io.mqttembeddedbroker/src/main/java/org/openhab/io/mqttembeddedbroker/internal/EmbeddedBrokerService.java
@@ -35,7 +35,7 @@ import javax.net.ssl.KeyManagerFactory;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.config.core.Configuration;
 import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
@@ -177,7 +177,7 @@ public class EmbeddedBrokerService
         if (!config.persistenceFile.isEmpty()) {
             final String persistenceFilename = config.persistenceFile;
             if (!Paths.get(persistenceFilename).isAbsolute()) {
-                Path path = Paths.get(ConfigConstants.getUserDataFolder()).toAbsolutePath();
+                Path path = Paths.get(OpenHAB.getUserDataFolder()).toAbsolutePath();
                 Files.createDirectories(path);
                 this.persistenceFilename = path.resolve(persistenceFilename).toString();
             }

diff --git a/bundles/org.openhab.io.mqttembeddedbroker/src/test/java/org/openhab/io/mqttembeddedbroker/internal/MqttEmbeddedBrokerServiceTest.java b/bundles/org.openhab.io.mqttembeddedbroker/src/test/java/org/openhab/io/mqttembeddedbroker/internal/MqttEmbeddedBrokerServiceTest.java
index 9a742771b6f7d0c412fa4221e7377e412c73642c..92eb4f408ad1317968995612bc3f1932cc1af704 100644 (file)
--- a/bundles/org.openhab.io.mqttembeddedbroker/src/test/java/org/openhab/io/mqttembeddedbroker/internal/MqttEmbeddedBrokerServiceTest.java
+++ b/bundles/org.openhab.io.mqttembeddedbroker/src/test/java/org/openhab/io/mqttembeddedbroker/internal/MqttEmbeddedBrokerServiceTest.java
@@ -40,7 +40,7 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
 import org.openhab.core.io.transport.mqtt.MqttBrokerConnection.Protocol;
 import org.openhab.core.io.transport.mqtt.MqttConnectionObserver;
@@ -157,7 +157,7 @@ public class MqttEmbeddedBrokerServiceTest extends JavaTest {
     @Test
     public void testPersistence() throws InterruptedException, IOException, ExecutionException {
         config.put("persistenceFile", "persist.mqtt");
-        Path path = Paths.get(ConfigConstants.getUserDataFolder()).toAbsolutePath();
+        Path path = Paths.get(OpenHAB.getUserDataFolder()).toAbsolutePath();
         File jksFile = path.resolve("persist.mqtt").toFile();
 
         if (jksFile.exists()) {

diff --git a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoConstants.java b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoConstants.java
index 6b744af5b6f36db9d28dd0e7fcffea6f4bc44bd9..9bfbf6ae73e41b24b6c113adf69803de9b98e3e3 100644 (file)
--- a/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoConstants.java
+++ b/bundles/org.openhab.io.neeo/src/main/java/org/openhab/io/neeo/internal/NeeoConstants.java
@@ -15,7 +15,7 @@ package org.openhab.io.neeo.internal;
 import java.io.File;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 
 /**
  * The constants class for the NEEO Integration
@@ -73,9 +73,9 @@ public class NeeoConstants {
     public static final String PROTOCOL = "http://";
 
     /** The device definitions file name */
-    public static final String FILENAME_DEVICEDEFINITIONS = ConfigConstants.getUserDataFolder() + File.separator
-            + "neeo" + File.separator + "neeodefinitions.json";
-    public static final String FILENAME_DISCOVEREDBRAINS = ConfigConstants.getUserDataFolder() + File.separator + "neeo"
+    public static final String FILENAME_DEVICEDEFINITIONS = OpenHAB.getUserDataFolder() + File.separator + "neeo"
+            + File.separator + "neeodefinitions.json";
+    public static final String FILENAME_DISCOVEREDBRAINS = OpenHAB.getUserDataFolder() + File.separator + "neeo"
             + File.separator + "discoveredbrains.json";
 
     /** The search threshold value */

diff --git a/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java b/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java
index 033eeda6d9d6467a393684cba64dc56f54201607..e2f7137c362af230d0ea956177d22b717a3a0b1c 100644 (file)
--- a/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java
+++ b/bundles/org.openhab.io.openhabcloud/src/main/java/org/openhab/io/openhabcloud/internal/CloudService.java
@@ -31,7 +31,6 @@ import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.jetty.client.HttpClient;
 import org.openhab.core.OpenHAB;
-import org.openhab.core.config.core.ConfigConstants;
 import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventFilter;
@@ -291,7 +290,7 @@ public class CloudService implements ActionService, CloudClientListener, EventSu
      * Returns either existing secret from the file or newly created secret.
      */
     private String getSecret() {
-        File file = new File(ConfigConstants.getUserDataFolder() + File.separator + SECRET_FILE_NAME);
+        File file = new File(OpenHAB.getUserDataFolder() + File.separator + SECRET_FILE_NAME);
         String newSecretString = "";
 
         if (!file.exists()) {

diff --git a/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java b/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
index 77ca8ea3e59b66b6c16b5c4ba6dd59bc9491be34..eb283c38ca486b0357e32cccddba98d379c92312 100644 (file)
--- a/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
+++ b/bundles/org.openhab.transform.exec/src/main/java/org/openhab/transform/exec/internal/ExecTransformationWhitelistWatchService.java
@@ -26,7 +26,7 @@ import java.util.Set;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.service.AbstractWatchService;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
 @Component(service = ExecTransformationWhitelistWatchService.class)
 @NonNullByDefault
 public class ExecTransformationWhitelistWatchService extends AbstractWatchService {
-    private static final String COMMAND_WHITELIST_PATH = ConfigConstants.getConfigFolder() + File.separator + "misc";
+    private static final String COMMAND_WHITELIST_PATH = OpenHAB.getConfigFolder() + File.separator + "misc";
     private static final String COMMAND_WHITELIST_FILE = "exec.whitelist";
 
     private final Logger logger = LoggerFactory.getLogger(ExecTransformationWhitelistWatchService.class);

diff --git a/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java b/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java
index 5ad9e61777cb7ebd7c691fc6dcef908aa6c15aea..cb2d349484e3beeef6c6ef2cdf3541da98ce2e75 100644 (file)
--- a/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java
+++ b/bundles/org.openhab.transform.javascript/src/main/java/org/openhab/transform/javascript/internal/TransformationScriptWatcher.java
@@ -19,7 +19,7 @@ import java.nio.file.Path;
 import java.nio.file.WatchEvent;
 import java.nio.file.WatchEvent.Kind;
 
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.service.AbstractWatchService;
 import org.openhab.core.transform.TransformationService;
 import org.osgi.service.component.annotations.Component;
@@ -35,7 +35,7 @@ import org.osgi.service.component.annotations.Reference;
 @Component()
 public class TransformationScriptWatcher extends AbstractWatchService {
 
-    public static final String TRANSFORM_FOLDER = ConfigConstants.getConfigFolder() + File.separator
+    public static final String TRANSFORM_FOLDER = OpenHAB.getConfigFolder() + File.separator
             + TransformationService.TRANSFORM_FOLDER_NAME;
 
     private JavaScriptEngineManager manager;

diff --git a/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java b/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java
index 3433b9a622c35ba20db3a5e453b242b666761fa2..8653bc6226f758a2b6aa9f3b289a8e0e6207d5b8 100644 (file)
--- a/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java
+++ b/bundles/org.openhab.transform.xslt/src/main/java/org/openhab/transform/xslt/internal/XsltTransformationService.java
@@ -24,7 +24,7 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.core.ConfigConstants;
+import org.openhab.core.OpenHAB;
 import org.openhab.core.transform.TransformationException;
 import org.openhab.core.transform.TransformationService;
 import org.osgi.service.component.annotations.Component;
@@ -63,8 +63,8 @@ public class XsltTransformationService implements TransformationService {
         Source xsl = null;
 
         try {
-            String path = ConfigConstants.getConfigFolder() + File.separator
-                    + TransformationService.TRANSFORM_FOLDER_NAME + File.separator + filename;
+            String path = OpenHAB.getConfigFolder() + File.separator + TransformationService.TRANSFORM_FOLDER_NAME
+                    + File.separator + filename;
             xsl = new StreamSource(new File(path));
         } catch (Exception e) {
             String message = "opening file '" + filename + "' throws exception";

diff --git a/bundles/org.openhab.voice.pollytts/src/main/java/org/openhab/voice/pollytts/internal/PollyTTSService.java b/bundles/org.openhab.voice.pollytts/src/main/java/org/openhab/voice/pollytts/internal/PollyTTSService.java
index 2c0cdaa09ed029736bca6e7b3071ba05ab7f0d9d..42f336377dfd8216c480e47cc5d56b2b7de6664f 100644 (file)
--- a/bundles/org.openhab.voice.pollytts/src/main/java/org/openhab/voice/pollytts/internal/PollyTTSService.java
+++ b/bundles/org.openhab.voice.pollytts/src/main/java/org/openhab/voice/pollytts/internal/PollyTTSService.java
@@ -24,10 +24,10 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import org.openhab.core.OpenHAB;
 import org.openhab.core.audio.AudioException;
 import org.openhab.core.audio.AudioFormat;
 import org.openhab.core.audio.AudioStream;
-import org.openhab.core.config.core.ConfigConstants;
 import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.voice.TTSException;
 import org.openhab.core.voice.TTSService;
@@ -108,7 +108,7 @@ public class PollyTTSService implements TTSService {
             logger.debug("Using configuration {}", config);
 
             // create cache folder
-            File cacheFolder = new File(new File(ConfigConstants.getUserDataFolder(), CACHE_FOLDER_NAME), SERVICE_PID);
+            File cacheFolder = new File(new File(OpenHAB.getUserDataFolder(), CACHE_FOLDER_NAME), SERVICE_PID);
             if (!cacheFolder.exists()) {
                 cacheFolder.mkdirs();
             }

diff --git a/bundles/org.openhab.voice.voicerss/src/main/java/org/openhab/voice/voicerss/internal/VoiceRSSTTSService.java b/bundles/org.openhab.voice.voicerss/src/main/java/org/openhab/voice/voicerss/internal/VoiceRSSTTSService.java
index f20cbc7908bcdae200d3d015e1abb7ebaabf9042..8a627aa32f6ea8483cc7513142ac3ac4c5c33c8d 100644 (file)
--- a/bundles/org.openhab.voice.voicerss/src/main/java/org/openhab/voice/voicerss/internal/VoiceRSSTTSService.java
+++ b/bundles/org.openhab.voice.voicerss/src/main/java/org/openhab/voice/voicerss/internal/VoiceRSSTTSService.java
@@ -20,10 +20,10 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 
+import org.openhab.core.OpenHAB;
 import org.openhab.core.audio.AudioException;
 import org.openhab.core.audio.AudioFormat;
 import org.openhab.core.audio.AudioStream;
-import org.openhab.core.config.core.ConfigConstants;
 import org.openhab.core.config.core.ConfigurableService;
 import org.openhab.core.voice.TTSException;
 import org.openhab.core.voice.TTSService;
@@ -220,7 +220,7 @@ public class VoiceRSSTTSService implements TTSService {
 
     private String getCacheFolderName() {
         // we assume that this folder does NOT have a trailing separator
-        return ConfigConstants.getUserDataFolder() + File.separator + CACHE_FOLDER_NAME;
+        return OpenHAB.getUserDataFolder() + File.separator + CACHE_FOLDER_NAME;
     }
 
     @Override