Bug 8568: Remove deprecated MountProviderService from RootBindingAwareBroker

[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..d91737154754750a1e3a2aa309c9c8953ee63854 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;
@@ -53,18 +51,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 +90,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 +125,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();
     }