Cleanup imports/whitespace in MD-SAL

[controller.git] / opendaylight / md-sal / sal-binding-api / src / main / java / org / opendaylight / controller / sal / binding / api / BindingAwareBroker.java

diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java
index 84e0561b9fa9c36b33fad20569ffa55b56ea84d6..db20a13991f8356acf88b3212c4722356aa70fc1 100644 (file)
--- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java
+++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareBroker.java
@@ -126,7 +126,7 @@ public interface BindingAwareBroker {
      * 
      * 
      */
-    public interface ConsumerContext {
+    public interface ConsumerContext extends RpcConsumerRegistry {
 
         /**
          * Returns a session specific instance (implementation) of requested
@@ -138,15 +138,7 @@ public interface BindingAwareBroker {
          */
         <T extends BindingAwareService> T getSALService(Class<T> service);
 
-        /**
-         * Returns a session specific instance (implementation) of requested
-         * YANG module implentation / service provided by consumer.
-         * 
-         * @param service
-         *            Broker service
-         * @return Session specific implementation of service
-         */
-        <T extends RpcService> T getRpcService(Class<T> module);
+
     }
 
     /**
@@ -165,36 +157,18 @@ public interface BindingAwareBroker {
      * functionality provided by other {@link BindingAwareConsumer}s.
      * 
      */
-    public interface ProviderContext extends ConsumerContext {
-        /**
-         * Registers an global RpcService implementation.
-         * 
-         * @param type
-         * @param implementation
-         * @return
-         */
-        <T extends RpcService> RpcRegistration<T> addRpcImplementation(Class<T> type, T implementation)
-                throws IllegalStateException;
-
-        <T extends RpcService> RpcRegistration<T> addMountRpcImplementation(Class<T> type, InstanceIdentifier<?> mount,
-                T implementation) throws IllegalStateException;
-
-        <T extends RpcService> RoutedRpcRegistration<T> addRoutedRpcImplementation(Class<T> type, T implementation)
-                throws IllegalStateException;
+    public interface ProviderContext extends ConsumerContext, RpcProviderRegistry {
 
+        @Deprecated
         void registerFunctionality(ProviderFunctionality functionality);
 
+        @Deprecated
         void unregisterFunctionality(ProviderFunctionality functionality);
     }
 
     public interface RpcRegistration<T extends RpcService> extends Registration<T> {
 
-        /**
-         * 
-         * @return instance for which registration does exists.
-         */
-        @Deprecated
-        T getService();
+        Class<T> getServiceType();
     }
 
     public interface RoutedRpcRegistration<T extends RpcService> extends RpcRegistration<T>,
@@ -212,6 +186,15 @@ public interface BindingAwareBroker {
         @Deprecated
         void registerInstance(Class<? extends BaseIdentity> context, InstanceIdentifier<?> instance);
 
+        /**
+         * Unregister particular instance identifier to be processed by this
+         * RpcService
+         * 
+         * Deprecated in favor of {@link RoutedRegistration#unregisterPath(Object, Object)}. 
+         * 
+         * @param context
+         * @param instance
+         */
         @Deprecated
         void unregisterInstance(Class<? extends BaseIdentity> context, InstanceIdentifier<?> instance);
     }