fix code for new storage service handling (openhab#63)

Related to: openhab/openhab-core#787

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>

Author: maggu2810

bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/card/internal/CardProvider.java

@@ -17,9 +17,9 @@
 import org.eclipse.smarthome.core.common.registry.ManagedProvider;
 import org.eclipse.smarthome.core.storage.StorageService;
 import org.openhab.ui.habot.card.Card;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferencePolicy;
 
 /**
  * The @link {@link ManagedProvider} for {@link Card} elements
@@ -29,6 +29,11 @@
 @Component(service = CardProvider.class, immediate = true)
 public class CardProvider extends DefaultAbstractManagedProvider<Card, String> {
 
+    @Activate
+    public CardProvider(final @Reference StorageService storageService) {
+        super(storageService);
+    }
+
     @Override
     protected String getStorageName() {
         return "habot_cards";
@@ -39,14 +44,4 @@ protected String getStorageName() {
         return key;
     }
 
-    @Reference(policy = ReferencePolicy.DYNAMIC)
-    @Override
-    protected void setStorageService(StorageService storageService) {
-        super.setStorageService(storageService);
-    }
-
-    @Override
-    protected void unsetStorageService(StorageService storageService) {
-        super.unsetStorageService(storageService);
-    }
 }

bundles/org.openhab.ui.habot/src/main/java/org/openhab/ui/habot/notification/internal/SubscriptionProvider.java

@@ -18,9 +18,9 @@
 import org.eclipse.smarthome.core.storage.StorageService;
 import org.openhab.ui.habot.notification.internal.webpush.Subscription;
 import org.openhab.ui.habot.notification.internal.webpush.Subscription.Keys;
+import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
-import org.osgi.service.component.annotations.ReferencePolicy;
 
 /**
  * The @link {@link ManagedProvider} for {@link Subscription} elements
@@ -30,6 +30,11 @@
 @Component(service = SubscriptionProvider.class, immediate = true)
 public class SubscriptionProvider extends DefaultAbstractManagedProvider<Subscription, Keys> {
 
+    @Activate
+    public SubscriptionProvider(final @Reference StorageService storageService) {
+        super(storageService);
+    }
+
     @Override
     protected String getStorageName() {
         return "habot_webpush_subscriptions";
@@ -41,15 +46,4 @@ protected String getStorageName() {
         return String.format("%s.%s", key.p256dh, key.auth);
     }
 
-    @Reference(policy = ReferencePolicy.DYNAMIC)
-    @Override
-    protected void setStorageService(StorageService storageService) {
-        super.setStorageService(storageService);
-    }
-
-    @Override
-    protected void unsetStorageService(StorageService storageService) {
-        super.unsetStorageService(storageService);
-    }
-
 }