X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FRestconfProvider.java;h=242f18d240122597bea4d1dac29a4f1a31ea9e31;hb=1ff9939abc7a4072b07df6b79516fe344b1b42e3;hp=35b751c73fcf1f007f3a9d419b63fbea2c7727d2;hpb=dfc1a61146ab19110c44d584c8c940e78a363d00;p=controller.git

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java
index 35b751c73f..242f18d240 100644
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java
@@ -1,19 +1,31 @@
 package org.opendaylight.controller.sal.rest.impl;
 
-import org.opendaylight.controller.sal.core.api.AbstractProvider;
+import java.util.Collection;
+import java.util.Collections;
+
+import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
+import org.opendaylight.controller.sal.core.api.Provider;
 import org.opendaylight.controller.sal.core.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.core.api.data.DataProviderService;
 import org.opendaylight.controller.sal.core.api.model.SchemaService;
 import org.opendaylight.controller.sal.core.api.model.SchemaServiceListener;
 import org.opendaylight.controller.sal.restconf.impl.BrokerFacade;
 import org.opendaylight.controller.sal.restconf.impl.ControllerContext;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
+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 class RestconfProvider extends AbstractProvider {
+public class RestconfProvider implements BundleActivator, Provider, ServiceTrackerCustomizer<Broker, Broker> {
 
+    public final static String NOT_INITALIZED_MSG = "Restconf is not initialized yet. Please try again later";
+    
     private ListenerRegistration<SchemaServiceListener> listenerRegistration;
+    private ServiceTracker<Broker, Broker> brokerServiceTrancker;
+    private BundleContext bundleContext;
+    private ProviderSession session;
 
     @Override
     public void onSessionInitiated(ProviderSession session) {
@@ -28,8 +40,14 @@ public class RestconfProvider extends AbstractProvider {
     }
 
     @Override
-    protected void stopImpl(BundleContext context) {
-        super.stopImpl(context);
+    public void start(BundleContext context) throws Exception {
+        bundleContext = context;
+        brokerServiceTrancker = new ServiceTracker<>(context, Broker.class, this);
+        brokerServiceTrancker.open();
+    }
+
+    @Override
+    public void stop(BundleContext context) {
         if (listenerRegistration != null) {
             try {
                 listenerRegistration.close();
@@ -37,5 +55,32 @@ public class RestconfProvider extends AbstractProvider {
                 e.printStackTrace();
             }
         }
+        session.close();
+        brokerServiceTrancker.close();
+    }
+
+    @Override
+    public Collection<ProviderFunctionality> getProviderFunctionality() {
+        return Collections.emptySet();
+    }
+
+    @Override
+    public Broker addingService(ServiceReference<Broker> reference) {
+        Broker broker = bundleContext.getService(reference);
+        broker.registerProvider(this, bundleContext);
+        return broker;
+    }
+
+    @Override
+    public void modifiedService(ServiceReference<Broker> reference, Broker service) {
+        // NOOP
+    }
+
+    @Override
+    public void removedService(ServiceReference<Broker> reference, Broker service) {
+        bundleContext.ungetService(reference);
+        BrokerFacade.getInstance().setContext(null);
+        BrokerFacade.getInstance().setDataService(null);
+        ControllerContext.getInstance().setSchemas(null);
     }
 }