Removed use of 'bundleContext' from 'BaseThingHandler' as it is depre…

…cated (#6395) Signed-off-by: Christoph Weitkamp <[email protected]>
openhab · Nov 16, 2019 · 20f4e5d · 20f4e5d
1 parent 1dd0323
commit 20f4e5d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/...hab.binding.exec/src/main/java/org/openhab/binding/exec/internal/handler/ExecHandler.java b/...hab.binding.exec/src/main/java/org/openhab/binding/exec/internal/handler/ExecHandler.java
@@ -42,6 +42,8 @@
 import org.eclipse.smarthome.core.transform.TransformationService;
 import org.eclipse.smarthome.core.types.Command;
 import org.eclipse.smarthome.core.types.RefreshType;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -56,6 +58,8 @@ public class ExecHandler extends BaseThingHandler {
 
     private Logger logger = LoggerFactory.getLogger(ExecHandler.class);
 
+    private final BundleContext bundleContext;
+
     // List of Configurations constants
     public static final String INTERVAL = "interval";
     public static final String TIME_OUT = "timeout";
@@ -73,6 +77,7 @@ public class ExecHandler extends BaseThingHandler {
 
     public ExecHandler(Thing thing) {
         super(thing);
+        this.bundleContext = FrameworkUtil.getBundle(ExecHandler.class).getBundleContext();
     }
 
     @Override

diff --git a/...he/src/main/java/org/openhab/binding/globalcache/internal/handler/GlobalCacheHandler.java b/...he/src/main/java/org/openhab/binding/globalcache/internal/handler/GlobalCacheHandler.java
@@ -61,6 +61,8 @@
 import org.openhab.binding.globalcache.internal.command.CommandSetstate;
 import org.openhab.binding.globalcache.internal.command.RequestMessage;
 import org.openhab.binding.globalcache.internal.command.ResponseMessage;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -73,6 +75,8 @@
 public class GlobalCacheHandler extends BaseThingHandler {
     private Logger logger = LoggerFactory.getLogger(GlobalCacheHandler.class);
 
+    private final BundleContext bundleContext;
+
     private static final String GLOBALCACHE_THREAD_POOL = "globalCacheHandler";
 
     private InetAddress ifAddress;
@@ -97,6 +101,7 @@ public GlobalCacheHandler(@NonNull Thing gcDevice, String ipv4Address) {
         commandProcessor = new CommandProcessor();
         scheduledFuture = null;
         this.ipv4Address = ipv4Address;
+        this.bundleContext = FrameworkUtil.getBundle(GlobalCacheHandler.class).getBundleContext();
     }
 
     @Override

diff --git a/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java b/...bus/src/main/java/org/openhab/binding/modbus/internal/handler/ModbusDataThingHandler.java
@@ -80,6 +80,8 @@
 import org.openhab.io.transport.modbus.PollTask;
 import org.openhab.io.transport.modbus.endpoint.ModbusSlaveEndpoint;
 import org.openhab.io.transport.modbus.json.WriteRequestJsonUtilities;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -99,6 +101,8 @@ public class ModbusDataThingHandler extends BaseThingHandler implements ModbusRe
 
     private final Logger logger = LoggerFactory.getLogger(ModbusDataThingHandler.class);
 
+    private final BundleContext bundleContext;
+
     private static final Duration MIN_STATUS_INFO_UPDATE_INTERVAL = Duration.ofSeconds(1);
     private static final Map<String, List<Class<? extends State>>> CHANNEL_ID_TO_ACCEPTED_TYPES = new HashMap<>();
 
@@ -153,6 +157,7 @@ public class ModbusDataThingHandler extends BaseThingHandler implements ModbusRe
 
     public ModbusDataThingHandler(Thing thing) {
         super(thing);
+        this.bundleContext = FrameworkUtil.getBundle(ModbusDataThingHandler.class).getBundleContext();
     }
 
     @Override

diff --git a/...nding.modbus/src/test/java/org/openhab/binding/modbus/internal/ModbusDataHandlerTest.java b/...nding.modbus/src/test/java/org/openhab/binding/modbus/internal/ModbusDataHandlerTest.java
@@ -420,9 +420,6 @@ private ModbusDataThingHandler createDataHandler(String id, Bridge bridge,
         hookLinkRegistry(dataThingHandler);
         dataThing.setHandler(dataThingHandler);
         dataThingHandler.setCallback(thingCallback);
-        if (context != null) {
-            dataThingHandler.setBundleContext(context);
-        }
         dataThingHandler.initialize();
         return dataThingHandler;
     }