demus/openhab-core
1
0
Fork 0
mirror of https://github.com/danieldemus/openhab-core.git synced 2025-02-09 18:36:50 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

model: Use constructor injection to simplify lifecycle (#857)

Browse Source 
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2019-06-09 10:33:22 +02:00 committed by Kai Kreuzer
parent b99c439d77
commit 1f20e8277a
1 changed files with 13 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
bundles/org.openhab.core.model.script/src/org/eclipse/smarthome/model/script/ScriptServiceUtil.java
View File

@ -23,7 +23,6 @@ import org.eclipse.smarthome.core.thing.binding.ThingActions;
import org.eclipse.smarthome.model.core.ModelRepository; import org.eclipse.smarthome.model.core.ModelRepository;
import org.eclipse.smarthome.model.script.engine.ScriptEngine; import org.eclipse.smarthome.model.script.engine.ScriptEngine;
import org.eclipse.smarthome.model.script.engine.action.ActionService; import org.eclipse.smarthome.model.script.engine.action.ActionService;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Deactivate;
@ -46,22 +45,23 @@ public class ScriptServiceUtil {
private static ScriptServiceUtil instance; private static ScriptServiceUtil instance;
private ItemRegistry itemRegistry; private final ItemRegistry itemRegistry;
private final ThingRegistry thingRegistry;
private ThingRegistry thingRegistry; private final EventPublisher eventPublisher;
private final ModelRepository modelRepository;
private EventPublisher eventPublisher;
private ModelRepository modelRepository;
private final AtomicReference<ScriptEngine> scriptEngine = new AtomicReference<>(); private final AtomicReference<ScriptEngine> scriptEngine = new AtomicReference<>();
public final List<ActionService> actionServices = new CopyOnWriteArrayList<>();
public List<ActionService> actionServices = new CopyOnWriteArrayList<>(); public final List<ThingActions> thingActions = new CopyOnWriteArrayList<>();
public List<ThingActions> thingActions = new CopyOnWriteArrayList<>();
@Activate @Activate
public void activate(final BundleContext bc) { public ScriptServiceUtil(final @Reference ItemRegistry itemRegistry, final @Reference ThingRegistry thingRegistry,
final @Reference EventPublisher eventPublisher, final @Reference ModelRepository modelRepository) {
this.itemRegistry = itemRegistry;
this.thingRegistry = thingRegistry;
this.eventPublisher = eventPublisher;
this.modelRepository = modelRepository;
if (instance != null) { if (instance != null) {
throw new IllegalStateException("ScriptServiceUtil should only be activated once!"); throw new IllegalStateException("ScriptServiceUtil should only be activated once!");
} }
@ -141,42 +141,6 @@ public class ScriptServiceUtil {
this.thingActions.remove(thingActions); this.thingActions.remove(thingActions);
} }
@Reference
public void setItemRegistry(ItemRegistry itemRegistry) {
this.itemRegistry = itemRegistry;
}
public void unsetItemRegistry(ItemRegistry itemRegistry) {
this.itemRegistry = null;
}
@Reference
public void setThingRegistry(ThingRegistry thingRegistry) {
this.thingRegistry = thingRegistry;
}
public void unsetThingRegistry(ThingRegistry thingRegistry) {
this.thingRegistry = null;
}
@Reference
public void setEventPublisher(EventPublisher eventPublisher) {
this.eventPublisher = eventPublisher;
}
public void unsetEventPublisher(EventPublisher eventPublisher) {
this.eventPublisher = null;
}
@Reference
public void setModelRepository(ModelRepository modelRepository) {
this.modelRepository = modelRepository;
}
public void unsetModelRepository(ModelRepository modelRepository) {
this.modelRepository = null;
}
public void setScriptEngine(ScriptEngine scriptEngine) { public void setScriptEngine(ScriptEngine scriptEngine) {
// injected as a callback from the script engine, not via DS as it is a circular dependency... // injected as a callback from the script engine, not via DS as it is a circular dependency...
this.scriptEngine.set(scriptEngine); this.scriptEngine.set(scriptEngine);