Fix checkstyle violations in sal-dom-api

[controller.git] / opendaylight / md-sal / sal-dom-api / src / main / java / org / opendaylight / controller / sal / core / api / AbstractProvider.java

diff --git a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
index 621ef92132a636aabc347e87b69f6b8ac89c3c8f..5cdc26d35e63eeb83e238c2e2c7fe13f6a9e4847 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
+++ b/opendaylight/md-sal/sal-dom-api/src/main/java/org/opendaylight/controller/sal/core/api/AbstractProvider.java
@@ -9,16 +9,17 @@ package org.opendaylight.controller.sal.core.api;
 
 import java.util.Collection;
 import java.util.Collections;
-
-import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
+import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
 
-public abstract class AbstractProvider implements BundleActivator, Provider {
+public abstract class AbstractProvider implements BundleActivator, Provider,ServiceTrackerCustomizer<Broker, Broker> {
 
-    private ServiceReference<Broker> brokerRef;
     private Broker broker;
+    private BundleContext context;
+    private ServiceTracker<Broker, Broker> tracker;
 
     @Override
     public Collection<ProviderFunctionality> getProviderFunctionality() {
@@ -26,25 +27,47 @@ public abstract class AbstractProvider implements BundleActivator, Provider {
     }
 
     @Override
-    public final void start(BundleContext context) throws Exception {
-        brokerRef = context.getServiceReference(Broker.class);
-        broker = context.getService(brokerRef);
-
-        this.startImpl(context);
+    public final void start(final BundleContext bundleContext) throws Exception {
+        this.context = bundleContext;
+        this.startImpl(bundleContext);
+        tracker = new ServiceTracker<>(bundleContext, Broker.class, this);
+        tracker.open();
+    }
 
-        broker.registerProvider(this,context);
+    protected void startImpl(final BundleContext bundleContext) {
+        // NOOP
     }
 
-    protected void startImpl(BundleContext context) {
+    protected void stopImpl(final BundleContext bundleContext) {
         // NOOP
     }
-    protected void stopImpl(BundleContext context) {
+
+    @Override
+    public final void stop(final BundleContext bundleContext) throws Exception {
+        broker = null;
+        tracker.close();
+        tracker = null;
+        stopImpl(bundleContext);
+    }
+
+    @Override
+    public Broker addingService(final ServiceReference<Broker> reference) {
+        if (broker == null) {
+            broker = context.getService(reference);
+            broker.registerProvider(this, context);
+            return broker;
+        }
+
+        return null;
+    }
+
+    @Override
+    public void modifiedService(final ServiceReference<Broker> reference, final Broker service) {
         // NOOP
     }
 
     @Override
-    public final void stop(BundleContext context) throws Exception {
+    public void removedService(final ServiceReference<Broker> reference, final Broker service) {
         stopImpl(context);
     }
-
 }