Fix checkstyle violations in sal-dom-broker-config and sal-binding-config

[controller.git] / opendaylight / md-sal / sal-binding-config / src / main / java / org / opendaylight / controller / config / yang / md / sal / binding / impl / BindingBrokerImplModule.java

diff --git a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java
index bae95ffb7c39d479fc1ea2dd4a5da4854153c5b6..f9a64ab071d8bd04eb8183b646a39e4d079be14d 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java
+++ b/opendaylight/md-sal/sal-binding-config/src/main/java/org/opendaylight/controller/config/yang/md/sal/binding/impl/BindingBrokerImplModule.java
@@ -18,7 +18,6 @@ package org.opendaylight.controller.config.yang.md.sal.binding.impl;
 
 import org.opendaylight.controller.md.sal.binding.api.MountPointService;
 import org.opendaylight.controller.md.sal.binding.compat.HeliumRpcProviderRegistry;
-import org.opendaylight.controller.md.sal.binding.compat.HydrogenMountProvisionServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMMountPointServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcProviderServiceAdapter;
 import org.opendaylight.controller.md.sal.binding.impl.BindingDOMRpcServiceAdapter;
@@ -27,14 +26,16 @@ import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
 import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.mount.MountProviderService;
 import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker;
 import org.opendaylight.controller.sal.core.api.Broker;
 import org.opendaylight.controller.sal.core.api.Broker.ProviderSession;
 
 /**
-*
-*/
+ * Deprecated.
+ *
+ * @deprecated Replaced by blueprint wiring
+ */
+@Deprecated
 public final class BindingBrokerImplModule extends
         org.opendaylight.controller.config.yang.md.sal.binding.impl.AbstractBindingBrokerImplModule {
 
@@ -65,10 +66,7 @@ public final class BindingBrokerImplModule extends
         final BindingDOMRpcProviderServiceAdapter rpcProvider = createRpcProvider(codec,session);
         final RootBindingAwareBroker broker = new RootBindingAwareBroker(getIdentifier().getInstanceName());
         final RpcProviderRegistry heliumRpcBroker = new HeliumRpcProviderRegistry(rpcConsumer, rpcProvider);
-        final MountProviderService legacyMount = createLegacyMountPointService(mount);
-
 
-        broker.setLegacyDataBroker(getDataBrokerDependency());
         broker.setNotificationBroker(getNotificationServiceDependency());
         if (getNotificationPublishServiceDependency() != null) {
             broker.setNotificationPublishService(getNotificationPublishServiceDependency());
@@ -76,40 +74,32 @@ public final class BindingBrokerImplModule extends
         broker.setRpcBroker(heliumRpcBroker);
         broker.setDataBroker(getRootDataBrokerDependency());
         broker.setMountService(mount);
-        broker.setLegacyMountManager(legacyMount);
         broker.start();
         return broker;
     }
 
-
-    @SuppressWarnings("deprecation")
-    private MountProviderService createLegacyMountPointService(final MountPointService service) {
-        if(service != null) {
-            return new HydrogenMountProvisionServiceAdapter(service);
-        }
-        return null;
-    }
-
     private BindingDOMRpcProviderServiceAdapter createRpcProvider(final BindingToNormalizedNodeCodec codec,
             final ProviderSession session) {
         final DOMRpcProviderService domService = session.getService(DOMRpcProviderService.class);
-        if(domService != null) {
+        if (domService != null) {
             return new BindingDOMRpcProviderServiceAdapter(domService, codec);
         }
         return null;
     }
 
-    private BindingDOMRpcServiceAdapter createRpcConsumer(final BindingToNormalizedNodeCodec codec, final ProviderSession session) {
+    private BindingDOMRpcServiceAdapter createRpcConsumer(final BindingToNormalizedNodeCodec codec,
+            final ProviderSession session) {
         final DOMRpcService domService = session.getService(DOMRpcService.class);
-        if(domService != null) {
+        if (domService != null) {
             return new BindingDOMRpcServiceAdapter(domService, codec);
         }
         return null;
     }
 
-    private MountPointService createMountPointAdapter(final BindingToNormalizedNodeCodec codec, final ProviderSession session) {
+    private MountPointService createMountPointAdapter(final BindingToNormalizedNodeCodec codec,
+            final ProviderSession session) {
         final DOMMountPointService domService = session.getService(DOMMountPointService.class);
-        if(domService != null) {
+        if (domService != null) {
             return new BindingDOMMountPointServiceAdapter(domService, codec);
         }
         return null;