demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-01-25 11:45:49 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Removed access to 'BundleContext' from 'BaseThingHandler' (#1214)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2019-11-17 21:44:08 +01:00 committed by Kai Kreuzer
parent 0abf994058
commit 931b2007c5
2 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseThingHandler.java
View File

@ -37,7 +37,6 @@ import org.eclipse.smarthome.core.thing.util.ThingHandlerHelper;
import org.eclipse.smarthome.core.types.Command;
import org.eclipse.smarthome.core.types.RefreshType;
import org.eclipse.smarthome.core.types.State;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -67,9 +66,6 @@ public abstract class BaseThingHandler implements ThingHandler {
protected final ScheduledExecutorService scheduler = ThreadPoolManager
.getScheduledPool(THING_HANDLER_THREADPOOL_NAME);
@Deprecated // this must not be used by bindings!
protected @NonNullByDefault({}) BundleContext bundleContext;
protected Thing thing;
private @Nullable ThingHandlerCallback callback;
@ -83,14 +79,6 @@ public abstract class BaseThingHandler implements ThingHandler {
this.thing = thing;
}
public void setBundleContext(final BundleContext bundleContext) {
this.bundleContext = bundleContext;
}
public void unsetBundleContext(final BundleContext bundleContext) {
this.bundleContext = null;
}
@Override
public void handleRemoval() {
// can be overridden by subclasses

22
bundles/org.openhab.core.thing/src/main/java/org/eclipse/smarthome/core/thing/binding/BaseThingHandlerFactory.java
View File

@ -73,7 +73,7 @@ public abstract class BaseThingHandlerFactory implements ThingHandlerFactory {
* @param componentContext component context (must not be null)
*/
protected void activate(ComponentContext componentContext) {
this.bundleContext = componentContext.getBundleContext();
bundleContext = componentContext.getBundleContext();
thingTypeRegistryServiceTracker = new ServiceTracker<>(bundleContext, ThingTypeRegistry.class.getName(), null);
thingTypeRegistryServiceTracker.open();
configDescriptionRegistryServiceTracker = new ServiceTracker<>(bundleContext,
@ -132,7 +132,6 @@ public abstract class BaseThingHandlerFactory implements ThingHandlerFactory {
throw new IllegalStateException(
"Created handler of bridge '" + thing.getUID() + "' must implement the BridgeHandler interface.");
}
setHandlerContext(thingHandler);
registerConfigStatusProvider(thing, thingHandler);
registerFirmwareUpdateHandler(thing, thingHandler);
registerServices(thing, thingHandler);
@ -174,7 +173,7 @@ public abstract class BaseThingHandlerFactory implements ThingHandlerFactory {
if (!serviceNames.isEmpty()) {
String[] serviceNamesArray = serviceNames.toArray(new String[serviceNames.size()]);
ServiceRegistration<?> serviceReg = this.bundleContext.registerService(serviceNamesArray,
ServiceRegistration<?> serviceReg = bundleContext.registerService(serviceNamesArray,
serviceInstance, null);
if (serviceReg != null) {
@ -219,16 +218,6 @@ public abstract class BaseThingHandlerFactory implements ThingHandlerFactory {
*/
protected abstract @Nullable ThingHandler createHandler(Thing thing);
private void setHandlerContext(ThingHandler thingHandler) {
if (thingHandler instanceof BaseThingHandler) {
if (bundleContext == null) {
throw new IllegalStateException(
"Base thing handler factory has not been properly initialized. Did you forget to call super.activate()?");
}
((BaseThingHandler) thingHandler).setBundleContext(bundleContext);
}
}
private void registerConfigStatusProvider(Thing thing, ThingHandler thingHandler) {
if (thingHandler instanceof ConfigStatusProvider) {
ServiceRegistration<ConfigStatusProvider> serviceRegistration = registerAsService(thingHandler,
@ -257,7 +246,6 @@ public abstract class BaseThingHandlerFactory implements ThingHandlerFactory {
ThingHandler thingHandler = thing.getHandler();
if (thingHandler != null) {
removeHandler(thingHandler);
unsetBundleContext(thingHandler);
}
unregisterConfigStatusProvider(thing);
unregisterFirmwareUpdateHandler(thing);
@ -275,12 +263,6 @@ public abstract class BaseThingHandlerFactory implements ThingHandlerFactory {
// can be overridden
}
private void unsetBundleContext(ThingHandler thingHandler) {
if (thingHandler instanceof BaseThingHandler) {
((BaseThingHandler) thingHandler).unsetBundleContext(bundleContext);
}
}
private void unregisterConfigStatusProvider(Thing thing) {
ServiceRegistration<ConfigStatusProvider> serviceRegistration = configStatusProviders
.remove(thing.getUID().getAsString());