Migrate OSGI compendium reference

[controller.git] / opendaylight / md-sal / sal-binding-broker / src / main / java / org / opendaylight / controller / sal / binding / impl / RootBindingAwareBroker.java

diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java
index 5465a95327292b3cf4b2a4cd66b9c9769d981c9a..fbcf2167cdf115c72617dd5d6d8858540ac22e04 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java
+++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/RootBindingAwareBroker.java
@@ -24,8 +24,6 @@ import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
 import org.opendaylight.controller.sal.binding.api.NotificationService;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
-import org.opendaylight.controller.sal.binding.api.mount.MountService;
 import org.opendaylight.controller.sal.binding.api.rpc.RpcContextIdentifier;
 import org.opendaylight.yangtools.concepts.Identifiable;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
@@ -36,10 +34,11 @@ import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+@Deprecated(forRemoval = true)
 public class RootBindingAwareBroker implements Mutable, Identifiable<String>, BindingAwareBroker, AutoCloseable,
         RpcProviderRegistry {
 
-    private final static Logger LOG = LoggerFactory.getLogger(RootBindingAwareBroker.class);
+    private static final Logger LOG = LoggerFactory.getLogger(RootBindingAwareBroker.class);
 
     RootSalInstance controllerRoot;
 
@@ -53,18 +52,12 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
 
     private DataBroker dataBroker;
 
-    private MountProviderService legacyMount;
-
     private ImmutableClassToInstanceMap<BindingAwareService> supportedConsumerServices;
 
     private ImmutableClassToInstanceMap<BindingAwareService> supportedProviderServices;
 
     private MountPointService mountService;
 
-    public void setLegacyMountManager(final MountProviderService legacyMount) {
-        this.legacyMount = legacyMount;
-    }
-
     public RootBindingAwareBroker(final String instanceName) {
         this.identifier = instanceName;
     }
@@ -98,10 +91,6 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
         return mountService;
     }
 
-    public MountProviderService getLegacyMount() {
-        return legacyMount;
-    }
-
     public void setDataBroker(final DataBroker asyncDataBroker) {
         dataBroker = asyncDataBroker;
     }
@@ -137,17 +126,16 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
             consBuilder.put(DataBroker.class, dataBroker);
         }
         consBuilder.put(MountPointService.class, mountService);
-        consBuilder.put(MountService.class, legacyMount).build();
 
         supportedConsumerServices = consBuilder.build();
         final ImmutableClassToInstanceMap.Builder<BindingAwareService> provBuilder = ImmutableClassToInstanceMap
                 .builder();
         provBuilder.putAll(supportedConsumerServices).put(NotificationProviderService.class, getRoot())
-                .put(RpcProviderRegistry.class, getRoot()) .put(MountProviderService.class, legacyMount);
+                .put(RpcProviderRegistry.class, getRoot());
         if (notificationPublishService != null) {
             provBuilder.put(NotificationPublishService.class, notificationPublishService);
         }
-        supportedConsumerServices = consBuilder.build();
+
         supportedProviderServices = provBuilder.build();
     }
 
@@ -156,17 +144,17 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
         return registerConsumer(consumer);
     }
 
-    @Override
-    public ProviderContext registerProvider(final BindingAwareProvider provider, final BundleContext ctx) {
-        return registerProvider(provider);
-    }
-
     @Override
     public ConsumerContext registerConsumer(final BindingAwareConsumer consumer) {
         checkState(supportedConsumerServices != null, "Broker is not initialized.");
         return BindingContextUtils.createConsumerContextAndInitialize(consumer, supportedConsumerServices);
     }
 
+    @Override
+    public ProviderContext registerProvider(final BindingAwareProvider provider, final BundleContext ctx) {
+        return registerProvider(provider);
+    }
+
     @Override
     public ProviderContext registerProvider(final BindingAwareProvider provider) {
         checkState(supportedProviderServices != null, "Broker is not initialized.");
@@ -174,7 +162,7 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
     }
 
     @Override
-    public void close() throws Exception {
+    public void close() {
         // FIXME: Close all sessions
     }
 
@@ -196,12 +184,12 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
     }
 
     @Override
-    public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L> registerRouteChangeListener(
-            final L arg0) {
-        return getRoot().registerRouteChangeListener(arg0);
+    public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L>
+            registerRouteChangeListener(final L listener) {
+        return getRoot().registerRouteChangeListener(listener);
     }
 
-    public class RootSalInstance extends
+    public static class RootSalInstance extends
             AbstractBindingSalProviderInstance<NotificationProviderService, RpcProviderRegistry> {
 
         public RootSalInstance(final RpcProviderRegistry rpcRegistry,
@@ -209,5 +197,4 @@ public class RootBindingAwareBroker implements Mutable, Identifiable<String>, Bi
             super(rpcRegistry, notificationBroker);
         }
     }
-
 }