From deaaa394466f2140b7148470b4b83581f136de4e Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 6 Mar 2018 09:05:40 -0500 Subject: [PATCH] Fix checkstyle violations in sal-binding-util and sal-schema-service Change-Id: I96c37055e8f632ab5ea7dd5c6111039a57430887 Signed-off-by: Tom Pantelis --- .../AbstractBindingSalConsumerInstance.java | 4 +-- .../AbstractBindingSalProviderInstance.java | 4 +-- .../sal/binding/util/BindingContextUtils.java | 25 ++++++++++--------- .../sal/binding/util/TypeSafeDataReader.java | 7 +++--- ...GlobalBundleScanningSchemaServiceImpl.java | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) 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 861f9f0629..61d1ec0968 100644 --- 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 registerNotificationListener( - org.opendaylight.yangtools.yang.binding.NotificationListener listener) { + public ListenerRegistration + registerNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener 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 8fb31d1ac8..5cc0340f56 100644 --- 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>> ListenerRegistration registerRouteChangeListener( - final L listener) { + public >> ListenerRegistration + registerRouteChangeListener(final L 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 26aa27eb15..43ed93f727 100644 --- 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 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; @@ -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 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 serviceProvider) { @@ -67,7 +68,7 @@ public class BindingContextUtils { private ClassToInstanceMap alreadyRetrievedServices; private ClassToInstanceMap serviceProvider; - public SingleConsumerContextImpl(ClassToInstanceMap serviceProvider) { + SingleConsumerContextImpl(ClassToInstanceMap serviceProvider) { this.alreadyRetrievedServices = MutableClassToInstanceMap.create(); this.serviceProvider = serviceProvider; } @@ -81,7 +82,7 @@ public class BindingContextUtils { public final T getSALService(Class 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); @@ -89,12 +90,12 @@ public class BindingContextUtils { private synchronized T tryToRetrieveSalService(Class service) { final T potential = alreadyRetrievedServices.getInstance(service); - if(potential != null) { + if (potential != null) { 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); @@ -110,13 +111,13 @@ public class BindingContextUtils { private static class SingleProviderContextImpl extends SingleConsumerContextImpl implements ProviderContext { - public SingleProviderContextImpl(ClassToInstanceMap serviceProvider) { + SingleProviderContextImpl(ClassToInstanceMap serviceProvider) { super(serviceProvider); } @Override - public >> ListenerRegistration registerRouteChangeListener( - L listener) { + public >> ListenerRegistration + registerRouteChangeListener(L 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 49ac59fe95..e71f646f2e 100644 --- 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; /** + * 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 { 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 6d2eacbaf5..7a91cdf7be 100644 --- 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) yangProvider.getSource(sourceIdentifier), - e -> new SchemaSourceException("Error retrieving source", e)); + e -> new SchemaSourceException("Error retrieving source", e)); } } -- 2.36.6