[imperihome] Use DS annotations (openhab#4721)

* [imperihome] Use DS annotations Signed-off-by: Wouter Born <[email protected]> Signed-off-by: Pshatsillo <[email protected]>
Pshatsillo · Jun 19, 2019 · bcacb53 · bcacb53
1 parent 314a913
commit bcacb53
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 30 deletions.
diff --git a/addons/io/org.openhab.io.imperihome/OSGI-INF/.gitignore b/addons/io/org.openhab.io.imperihome/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/*.xml
diff --git a/addons/io/org.openhab.io.imperihome/OSGI-INF/imperihome.xml b/addons/io/org.openhab.io.imperihome/OSGI-INF/imperihome.xml
diff --git a/....io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java b/....io.imperihome/src/main/java/org/openhab/io/imperihome/internal/ImperiHomeApiServlet.java
@@ -24,6 +24,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.eclipse.smarthome.config.core.ConfigurableService;
 import org.eclipse.smarthome.core.events.EventPublisher;
 import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.eclipse.smarthome.core.persistence.PersistenceServiceRegistry;
@@ -41,6 +42,13 @@
 import org.openhab.io.imperihome.internal.model.param.ParamType;
 import org.openhab.io.imperihome.internal.processor.DeviceRegistry;
 import org.openhab.io.imperihome.internal.processor.ItemProcessor;
+import org.osgi.framework.Constants;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferencePolicy;
 import org.osgi.service.http.HttpService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,6 +61,11 @@
  *
  * @author Pepijn de Geus - Initial contribution
  */
+@Component(immediate = true, service = HttpServlet.class, configurationPid = "org.openhab.imperihome", property = {
+        Constants.SERVICE_PID + "=org.openhab.imperihome",
+        ConfigurableService.SERVICE_PROPERTY_DESCRIPTION_URI + "=io:imperihome",
+        ConfigurableService.SERVICE_PROPERTY_CATEGORY + "=io",
+        ConfigurableService.SERVICE_PROPERTY_LABEL + "=ImperiHome Integration" })
 public class ImperiHomeApiServlet extends HttpServlet {
 
     private static final long serialVersionUID = -1966364789075448441L;
@@ -107,6 +120,7 @@ public ImperiHomeApiServlet() {
      *
      * @param config Service config.
      */
+    @Activate
     protected void activate(Map<String, Object> config) {
         modified(config);
 
@@ -130,16 +144,18 @@ protected void activate(Map<String, Object> config) {
 
     /**
      * OSGi config modification callback.
-
+     *
      * @param config Service config.
      */
+    @Modified
     protected void modified(Map<String, Object> config) {
         imperiHomeConfig.update(config);
     }
 
     /**
      * OSGi deactivation callback.
      */
+    @Deactivate
     protected void deactivate() {
         try {
             httpService.unregister(PATH);
@@ -159,6 +175,7 @@ protected void deactivate() {
         logger.info("ImperiHome integration service stopped");
     }
 
+    @Reference(policy = ReferencePolicy.DYNAMIC)
     protected void setItemRegistry(ItemRegistry itemRegistry) {
         this.itemRegistry = itemRegistry;
     }
@@ -167,6 +184,7 @@ protected void unsetItemRegistry(ItemRegistry itemRegistry) {
         this.itemRegistry = null;
     }
 
+    @Reference
     protected void setEventPublisher(EventPublisher eventPublisher) {
         this.eventPublisher = eventPublisher;
     }
@@ -175,6 +193,7 @@ protected void unsetEventPublisher(EventPublisher eventPublisher) {
         this.eventPublisher = null;
     }
 
+    @Reference
     protected void setHttpService(HttpService httpService) {
         this.httpService = httpService;
     }
@@ -183,6 +202,7 @@ protected void unsetHttpService(HttpService httpService) {
         this.httpService = null;
     }
 
+    @Reference
     protected void setPersistenceServiceRegistry(PersistenceServiceRegistry persistenceServiceRegistry) {
         this.persistenceServiceRegistry = persistenceServiceRegistry;
     }