From 6c03b50df7b25f63a6d605e71a867ab4ea60eee9 Mon Sep 17 00:00:00 2001 From: David Suarez Date: Thu, 5 Oct 2017 19:52:43 +0200 Subject: [PATCH] Fix some checkstyle and other issues - Make some classes final - Remove redundant "extends Object" - Remove types that can be inferred by the compiler - Make some variables final - Avoid potential NPEs Change-Id: I6ab30e3015e00f8e7e1df3e33b6aae0cf57dbede Signed-off-by: David Suarez --- .../binding/dom/adapter/AbstractForwardedDataBroker.java | 3 +-- .../mdsal/binding/dom/adapter/AdapterBuilder.java | 2 +- .../mdsal/binding/dom/adapter/AdapterLoader.java | 5 ++--- .../BindingDOMCursorAwareWriteTransactionAdapter.java | 4 ++-- .../dom/adapter/BindingDOMDataTreeServiceAdapter.java | 2 +- .../BindingDOMNotificationPublishServiceAdapter.java | 4 ++-- .../mdsal/binding/dom/adapter/BindingMountPointAdapter.java | 2 +- .../binding/dom/adapter/BindingToNormalizedNodeCodec.java | 6 +++++- .../mdsal/binding/dom/adapter/LazyDataTreeModification.java | 2 +- .../binding/dom/adapter/LazySerializedContainerNode.java | 2 +- .../mdsal/binding/dom/adapter/test/AssertCollections.java | 5 ++++- .../binding/dom/adapter/test/util/MockSchemaService.java | 2 +- 12 files changed, 22 insertions(+), 17 deletions(-) diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java index d03f7fdeff..261024f36f 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractForwardedDataBroker.java @@ -89,8 +89,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator) getCodec().deserializeFunction(path).apply( - Optional.>of(data)); + return (Optional) getCodec().deserializeFunction(path).apply(Optional.of(data)); } @Override diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java index 7263fafb24..b125acad12 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterBuilder.java @@ -35,7 +35,7 @@ public abstract class AdapterBuilder implements Builder { @Override public final T build() { checkAllRequiredServices(); - return createInstance(ImmutableClassToInstanceMap.copyOf(delegates)); + return createInstance(ImmutableClassToInstanceMap.copyOf(delegates)); } } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java index d1505f476c..3e9d128360 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AdapterLoader.java @@ -21,12 +21,12 @@ public abstract class AdapterLoader extends CacheLoader for (final Class reqDeleg : builder.getRequiredDelegates()) { final D deleg = getDelegate(reqDeleg); if (deleg != null) { - builder.addDelegate(reqDeleg,deleg); + builder.addDelegate(reqDeleg, deleg); } else { return Optional.absent(); } } - return Optional.of(builder.build()); + return Optional.of(builder.build()); } @Nullable @@ -34,5 +34,4 @@ public abstract class AdapterLoader extends CacheLoader @Nonnull protected abstract AdapterBuilder createBuilder(Class key); - } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMCursorAwareWriteTransactionAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMCursorAwareWriteTransactionAdapter.java index 31c5971d0f..6db45f2c0e 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMCursorAwareWriteTransactionAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMCursorAwareWriteTransactionAdapter.java @@ -23,8 +23,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; public class BindingDOMCursorAwareWriteTransactionAdapter implements CursorAwareWriteTransaction { - private T delegate; - private BindingToNormalizedNodeCodec codec; + private final T delegate; + private final BindingToNormalizedNodeCodec codec; public BindingDOMCursorAwareWriteTransactionAdapter(final T delegate, final BindingToNormalizedNodeCodec codec) { diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java index 29c034984b..3de2def40c 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMDataTreeServiceAdapter.java @@ -19,7 +19,7 @@ import org.opendaylight.mdsal.dom.api.DOMDataTreeProducer; import org.opendaylight.mdsal.dom.api.DOMDataTreeService; import org.opendaylight.yangtools.concepts.ListenerRegistration; -class BindingDOMDataTreeServiceAdapter implements DataTreeService { +final class BindingDOMDataTreeServiceAdapter implements DataTreeService { private final DOMDataTreeService delegate; private final BindingToNormalizedNodeCodec codec; diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java index 2f09f365b4..0f5d2582fb 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingDOMNotificationPublishServiceAdapter.java @@ -63,7 +63,7 @@ public class BindingDOMNotificationPublishServiceAdapter implements Notification @Override public ListenableFuture offerNotification(final Notification notification, - final int timeout, final TimeUnit unit) throws InterruptedException { + final int timeout, final TimeUnit unit) throws InterruptedException { ListenableFuture offerResult = domPublishService.offerNotification( toDomNotification(notification), timeout, unit); return DOMNotificationPublishService.REJECTED.equals(offerResult) @@ -84,7 +84,7 @@ public class BindingDOMNotificationPublishServiceAdapter implements Notification @Override public Set> getRequiredDelegates() { - return ImmutableSet.>of(DOMNotificationPublishService.class); + return ImmutableSet.of(DOMNotificationPublishService.class); } @Override diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java index 069bf773b1..c39196de35 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingMountPointAdapter.java @@ -20,7 +20,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class BindingMountPointAdapter implements MountPoint { private final InstanceIdentifier identifier; - private LoadingCache, Optional> services; + private final LoadingCache, Optional> services; public BindingMountPointAdapter(final BindingToNormalizedNodeCodec codec, final DOMMountPoint domMountPoint) { identifier = codec.getCodecRegistry().fromYangInstanceIdentifier(domMountPoint.getIdentifier()); diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java index 5e5905ec47..bc060f2c78 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/BindingToNormalizedNodeCodec.java @@ -7,6 +7,8 @@ */ package org.opendaylight.mdsal.binding.dom.adapter; +import static java.util.Objects.requireNonNull; + import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -379,7 +381,9 @@ public final class BindingToNormalizedNodeCodec implements BindingCodecTreeFacto } public NormalizedNode getDefaultNodeFor(final YangInstanceIdentifier parentMapPath) { - final BindingCodecTreeNode mapCodec = codecRegistry.getCodecContext().getSubtreeCodec(parentMapPath); + final BindingCodecTreeNode mapCodec = requireNonNull( + codecRegistry.getCodecContext().getSubtreeCodec(parentMapPath), + "Codec not found for yang instance identifier: " + parentMapPath); final Object schema = mapCodec.getSchema(); if (schema instanceof ListSchemaNode) { final ListSchemaNode castedSchema = (ListSchemaNode) schema; diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java index 52d6498763..c5869c2483 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazyDataTreeModification.java @@ -78,7 +78,7 @@ class LazyDataTreeModification implements DataTreeModifica final Collection domChanges, final LogicalDatastoreType datastoreType) { final List> result = new ArrayList<>(domChanges.size()); for (final DataTreeCandidate domChange : domChanges) { - result.add(LazyDataTreeModification.create(codec, domChange, datastoreType)); + result.add(LazyDataTreeModification.create(codec, domChange, datastoreType)); } return result; } diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNode.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNode.java index 7e25af70a4..ff3199ce71 100644 --- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNode.java +++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/LazySerializedContainerNode.java @@ -114,7 +114,7 @@ class LazySerializedContainerNode implements ContainerNode { * accessing it. */ if (contextRef.getIdentifier().equals(child)) { - return Optional.>of(contextRef); + return Optional.of(contextRef); } return super.getChild(child); } diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java index 8492a04630..c85622dcb0 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AssertCollections.java @@ -13,7 +13,10 @@ import java.util.Map; import org.junit.Assert; -public class AssertCollections { +public final class AssertCollections { + + private AssertCollections() { + } public static void assertEmpty(final Collection set) { Assert.assertTrue(set.isEmpty()); diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java index 98c0738c0d..12ed0d3ed3 100644 --- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java +++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/util/MockSchemaService.java @@ -18,7 +18,7 @@ public final class MockSchemaService implements DOMSchemaService, SchemaContextP private SchemaContext schemaContext; - ListenerRegistry listeners = ListenerRegistry.create(); + final ListenerRegistry listeners = ListenerRegistry.create(); @Override public synchronized SchemaContext getGlobalContext() { -- 2.36.6