Added startImpl to provide BundleContext to providers

Change-Id: Id92b7c469ffa6da22745854fc5d58862f232d6a2
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareConsumer.java b/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareConsumer.java
index b90bd2388604af2a19dcce14331fc7c3df46ca91..a176664ff9e377c129fe367cb50a842904f86118 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareConsumer.java
+++ b/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareConsumer.java
@@ -11,9 +11,13 @@ public abstract class AbstractBindingAwareConsumer implements BindingAwareConsum
         ServiceReference<BindingAwareBroker> brokerRef = context.getServiceReference(BindingAwareBroker.class);
         BindingAwareBroker broker = context.getService(brokerRef);
         broker.registerConsumer(this, context);
+        startImpl(context);
         //context.ungetService(brokerRef);
     }
 
+    @Deprecated
+    abstract protected void startImpl(BundleContext context);
+    
     @Override
     public final  void stop(BundleContext context) throws Exception {
         // TODO Auto-generated method stub

diff --git a/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java b/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java
index dbdedc359ed34d5c96a9596e152d354ec1b58f7c..20a7c0d779310037372a1a7ae5c4e1c6e8e59043 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java
+++ b/opendaylight/sal/yang-prototype/sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/AbstractBindingAwareProvider.java
@@ -11,8 +11,12 @@ public abstract class AbstractBindingAwareProvider implements BindingAwareProvid
             ServiceReference<BindingAwareBroker> brokerRef = context.getServiceReference(BindingAwareBroker.class);
             BindingAwareBroker broker = context.getService(brokerRef);
             broker.registerProvider(this, context);
+            startImpl(context);
     }
-
+    
+    @Deprecated
+    abstract protected void startImpl(BundleContext context);
+    
     @Override
     public final void stop(BundleContext context) throws Exception {
             

diff --git a/opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java b/opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java
index 0a73110262116ba99a753697c695381ecad3c185..3fc9b0d111d30c4544fe0f6d03f65d31d032ba0e 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java
+++ b/opendaylight/sal/yang-prototype/sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/toaster/provider/impl/ToastConsumerImpl.java
@@ -64,6 +64,12 @@ public class ToastConsumerImpl extends AbstractBindingAwareConsumer implements B
         return false;
 
     }
+    
+    @Override
+    @Deprecated
+    protected void startImpl(BundleContext context) {
+        context.registerService(ToastConsumer.class, this, new Hashtable<String,String>());
+    }
 
     @Override
     public void onSessionInitialized(ConsumerContext session) {

diff --git a/opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterProvider.java b/opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterProvider.java
index c776f363ddaa5e312d1f8bd31159f6143845e69c..7b5af8f89db2e2c1514daa5bbcc4ac99e3d61059 100644 (file)
--- a/opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterProvider.java
+++ b/opendaylight/sal/yang-prototype/sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/ToasterProvider.java
@@ -56,4 +56,11 @@ public class ToasterProvider extends AbstractBindingAwareProvider {
        public Collection<? extends ProviderFunctionality> getFunctionality() {
                return Collections.emptySet();
        }
+       
+       @Override
+       @Deprecated
+       protected void startImpl(BundleContext context) {
+           // TODO Auto-generated method stub
+           
+       }
 }