Fix checkstyle violations in sal-binding-util and sal-schema-service

[controller.git] / opendaylight / md-sal / sal-binding-util / src / main / java / org / opendaylight / controller / md / sal / binding / util / AbstractBindingSalConsumerInstance.java

diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java
index 53abd39cde85d6af6f24b02108cb890ae690491c..61d1ec09683caca29fa63151f84dbfd25ec0fb57 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java
+++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalConsumerInstance.java
@@ -7,29 +7,19 @@
  */
 package org.opendaylight.controller.md.sal.binding.util;
 
+import com.google.common.base.Preconditions;
 import org.opendaylight.controller.sal.binding.api.NotificationListener;
 import org.opendaylight.controller.sal.binding.api.NotificationService;
 import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.binding.api.data.DataChangeListener;
-import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
-import com.google.common.base.Preconditions;
-
-public abstract class AbstractBindingSalConsumerInstance<D extends DataBrokerService, N extends NotificationService, R extends RpcConsumerRegistry> //
-        implements //
-        RpcConsumerRegistry, //
-        NotificationService, //
-        DataBrokerService {
+public abstract class AbstractBindingSalConsumerInstance<N extends NotificationService, R extends RpcConsumerRegistry>
+        implements RpcConsumerRegistry, NotificationService {
 
     private final R rpcRegistry;
     private final N notificationBroker;
-    private final D dataBroker;
 
     protected final R getRpcRegistry() {
         return rpcRegistry;
@@ -39,10 +29,6 @@ public abstract class AbstractBindingSalConsumerInstance<D extends DataBrokerSer
         return notificationBroker;
     }
 
-    protected final D getDataBroker() {
-        return dataBroker;
-    }
-
     protected final R getRpcRegistryChecked() {
         Preconditions.checkState(rpcRegistry != null,"Rpc Registry is not available.");
         return rpcRegistry;
@@ -53,16 +39,9 @@ public abstract class AbstractBindingSalConsumerInstance<D extends DataBrokerSer
         return notificationBroker;
     }
 
-    protected final D getDataBrokerChecked() {
-        Preconditions.checkState(dataBroker != null, "Data Broker is not available");
-        return dataBroker;
-    }
-
-
-    protected AbstractBindingSalConsumerInstance(R rpcRegistry, N notificationBroker, D dataBroker) {
+    protected AbstractBindingSalConsumerInstance(R rpcRegistry, N notificationBroker) {
         this.rpcRegistry = rpcRegistry;
         this.notificationBroker = notificationBroker;
-        this.dataBroker = dataBroker;
     }
 
     @Override
@@ -77,31 +56,8 @@ public abstract class AbstractBindingSalConsumerInstance<D extends DataBrokerSer
     }
 
     @Override
-    public ListenerRegistration<org.opendaylight.yangtools.yang.binding.NotificationListener> registerNotificationListener(
-            org.opendaylight.yangtools.yang.binding.NotificationListener listener) {
+    public ListenerRegistration<org.opendaylight.yangtools.yang.binding.NotificationListener>
+            registerNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener listener) {
         return getNotificationBrokerChecked().registerNotificationListener(listener);
     }
-
-    @Override
-    public DataModificationTransaction beginTransaction() {
-        return getDataBrokerChecked().beginTransaction();
-    }
-
-    @Override
-    @Deprecated
-    public DataObject readConfigurationData(InstanceIdentifier<? extends DataObject> path) {
-        return getDataBrokerChecked().readConfigurationData(path);
-    }
-
-    @Override
-    public DataObject readOperationalData(InstanceIdentifier<? extends DataObject> path) {
-        return getDataBrokerChecked().readOperationalData(path);
-    }
-
-    @Override
-    @Deprecated
-    public ListenerRegistration<DataChangeListener> registerDataChangeListener(
-            InstanceIdentifier<? extends DataObject> path, DataChangeListener listener) {
-        return getDataBrokerChecked().registerDataChangeListener(path, listener);
-    }
 }