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

Change-Id: I96c37055e8f632ab5ea7dd5c6111039a57430887
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

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 861f9f0629390561425c8db2bf083ac9430ebd51..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
@@ -56,8 +56,8 @@ public abstract class AbstractBindingSalConsumerInstance<N extends NotificationS
     }
 
     @Override
     }
 
     @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);
     }
 }
         return getNotificationBrokerChecked().registerNotificationListener(listener);
     }
 }

diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java
index 8fb31d1ac862ea09bf9c95ee5931ac74f0811330..5cc0340f56ad7c1a1615e2244990e3dbc2437e06 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java
+++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/AbstractBindingSalProviderInstance.java
@@ -51,8 +51,8 @@ public abstract class AbstractBindingSalProviderInstance<N extends NotificationP
     }
 
     @Override
     }
 
     @Override

-    public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L> registerRouteChangeListener(
-            final L listener) {
+    public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L>
+            registerRouteChangeListener(final L listener) {

         return getRpcRegistryChecked().registerRouteChangeListener(listener);
     }
 
         return getRpcRegistryChecked().registerRouteChangeListener(listener);
     }
 

diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java
index 26aa27eb15e193d51b766a5ef0369da7ae96ae30..43ed93f7277915798fd5ed3b5fd28579e9b54ed6 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java
+++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/BindingContextUtils.java
@@ -9,6 +9,8 @@ package org.opendaylight.controller.md.sal.binding.util;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

+import com.google.common.collect.ClassToInstanceMap;
+import com.google.common.collect.MutableClassToInstanceMap;

 import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
 import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;


@@ -24,10 +26,9 @@ import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 

-import com.google.common.collect.ClassToInstanceMap;
-import com.google.common.collect.MutableClassToInstanceMap;
-
-public class BindingContextUtils {
+public final class BindingContextUtils {
+    private BindingContextUtils() {
+    }

 
     public static ConsumerContext createConsumerContext(BindingAwareConsumer consumer,
             ClassToInstanceMap<BindingAwareService> serviceProvider) {
 
     public static ConsumerContext createConsumerContext(BindingAwareConsumer consumer,
             ClassToInstanceMap<BindingAwareService> serviceProvider) {


@@ -67,7 +68,7 @@ public class BindingContextUtils {
         private ClassToInstanceMap<BindingAwareService> alreadyRetrievedServices;
         private ClassToInstanceMap<BindingAwareService> serviceProvider;
 
         private ClassToInstanceMap<BindingAwareService> alreadyRetrievedServices;
         private ClassToInstanceMap<BindingAwareService> serviceProvider;
 

-        public SingleConsumerContextImpl(ClassToInstanceMap<BindingAwareService> serviceProvider) {
+        SingleConsumerContextImpl(ClassToInstanceMap<BindingAwareService> serviceProvider) {

             this.alreadyRetrievedServices = MutableClassToInstanceMap.create();
             this.serviceProvider = serviceProvider;
         }
             this.alreadyRetrievedServices = MutableClassToInstanceMap.create();
             this.serviceProvider = serviceProvider;
         }


@@ -81,7 +82,7 @@ public class BindingContextUtils {
         public final <T extends BindingAwareService> T getSALService(Class<T> service) {
             checkNotNull(service,"Service class should not be null.");
             T potential = alreadyRetrievedServices.getInstance(service);
         public final <T extends BindingAwareService> T getSALService(Class<T> service) {
             checkNotNull(service,"Service class should not be null.");
             T potential = alreadyRetrievedServices.getInstance(service);

-            if(potential != null) {
+            if (potential != null) {

                 return potential;
             }
             return tryToRetrieveSalService(service);
                 return potential;
             }
             return tryToRetrieveSalService(service);


@@ -89,12 +90,12 @@ public class BindingContextUtils {
 
         private synchronized <T extends BindingAwareService> T tryToRetrieveSalService(Class<T> service) {
             final T potential = alreadyRetrievedServices.getInstance(service);
 
         private synchronized <T extends BindingAwareService> T tryToRetrieveSalService(Class<T> service) {
             final T potential = alreadyRetrievedServices.getInstance(service);

-            if(potential != null) {
+            if (potential != null) {

                 return potential;
             }
             final T requested = serviceProvider.getInstance(service);
                 return potential;
             }
             final T requested = serviceProvider.getInstance(service);

-            if(requested == null) {
-                throw new IllegalArgumentException("Requested service "+service.getName() +" is not available.");
+            if (requested == null) {
+                throw new IllegalArgumentException("Requested service " + service.getName() + " is not available.");

             }
             final T retrieved = BindingContextUtils.createContextProxyOrReturnService(service,requested);
             alreadyRetrievedServices.put(service, retrieved);
             }
             final T retrieved = BindingContextUtils.createContextProxyOrReturnService(service,requested);
             alreadyRetrievedServices.put(service, retrieved);


@@ -110,13 +111,13 @@ public class BindingContextUtils {
 
     private static class SingleProviderContextImpl extends SingleConsumerContextImpl implements ProviderContext {
 
 
     private static class SingleProviderContextImpl extends SingleConsumerContextImpl implements ProviderContext {
 

-        public SingleProviderContextImpl(ClassToInstanceMap<BindingAwareService> serviceProvider) {
+        SingleProviderContextImpl(ClassToInstanceMap<BindingAwareService> serviceProvider) {

             super(serviceProvider);
         }
 
         @Override
             super(serviceProvider);
         }
 
         @Override

-        public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L> registerRouteChangeListener(
-                L listener) {
+        public <L extends RouteChangeListener<RpcContextIdentifier, InstanceIdentifier<?>>> ListenerRegistration<L>
+                registerRouteChangeListener(L listener) {

             return getSALService(RpcProviderRegistry.class).registerRouteChangeListener(listener);
         }
 
             return getSALService(RpcProviderRegistry.class).registerRouteChangeListener(listener);
         }
 

diff --git a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/TypeSafeDataReader.java b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/TypeSafeDataReader.java
index 49ac59fe95da5071aa7f9b59332ae2aef0b97113..e71f646f2e2cc4748994ae64b3d98270c1adf811 100644 (file)
--- a/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/TypeSafeDataReader.java
+++ b/opendaylight/md-sal/sal-binding-util/src/main/java/org/opendaylight/controller/md/sal/binding/util/TypeSafeDataReader.java
@@ -12,11 +12,10 @@ import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**

+ * Deprecated.

  *
  *

- *
- * @deprecated Use
- *             {@link org.opendaylight.controller.md.sal.binding.api.ReadTransaction#read(org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType, InstanceIdentifier)}
- *             instead.
+ * @deprecated Use {@link org.opendaylight.controller.md.sal.binding.api.ReadTransaction#read(
+ *     org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType, InstanceIdentifier)} instead.

  */
 @Deprecated
 public final class TypeSafeDataReader {
  */
 @Deprecated
 public final class TypeSafeDataReader {

diff --git a/opendaylight/md-sal/sal-schema-service/src/main/java/org/opendaylight/controller/sal/schema/service/impl/GlobalBundleScanningSchemaServiceImpl.java b/opendaylight/md-sal/sal-schema-service/src/main/java/org/opendaylight/controller/sal/schema/service/impl/GlobalBundleScanningSchemaServiceImpl.java
index 6d2eacbaf5ff50df232ce3a8edba13674b4d82b9..7a91cdf7be628944663bc1188f6b43a32afb5a80 100644 (file)
--- a/opendaylight/md-sal/sal-schema-service/src/main/java/org/opendaylight/controller/sal/schema/service/impl/GlobalBundleScanningSchemaServiceImpl.java
+++ b/opendaylight/md-sal/sal-schema-service/src/main/java/org/opendaylight/controller/sal/schema/service/impl/GlobalBundleScanningSchemaServiceImpl.java
@@ -117,6 +117,6 @@ public final class GlobalBundleScanningSchemaServiceImpl implements SchemaContex
         }
 
         return Futures.makeChecked((ListenableFuture<YangTextSchemaSource>) yangProvider.getSource(sourceIdentifier),
         }
 
         return Futures.makeChecked((ListenableFuture<YangTextSchemaSource>) yangProvider.getSource(sourceIdentifier),

-                e -> new SchemaSourceException("Error retrieving source", e));
+            e -> new SchemaSourceException("Error retrieving source", e));

     }
 }
     }
 }