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 <david.suarez.fuentes@gmail.com>

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 d03f7fdeff8d096181c8fb134bf6af2888a7b609..261024f36f55304e686a4cf92a961e3ae595d835 100644 (file)
--- 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<DOMDataBr
         if (path.isWildcarded()) {
             return Optional.absent();
         }
-        return (Optional<DataObject>) getCodec().deserializeFunction(path).apply(
-                Optional.<NormalizedNode<?, ?>>of(data));
+        return (Optional<DataObject>) 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 7263fafb24289c51edec08561c30d5a9acf01269..b125acad121d9bb25be3b8bf1b8920c32cc64da1 100644 (file)
--- 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<T,D> implements Builder<T> {
     @Override
     public final  T build() {
         checkAllRequiredServices();
-        return createInstance(ImmutableClassToInstanceMap.<D,D>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 d1505f476cd7edbbaf5eb82ac6b1341ab9d77769..3e9d12836052dcaf734e1272989f31c0f7c72a50 100644 (file)
--- 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<T, D> extends CacheLoader<Class<? extends T>
         for (final Class<? extends D> 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.<T>of(builder.build());
+        return Optional.of(builder.build());
     }
 
     @Nullable
@@ -34,5 +34,4 @@ public abstract class AdapterLoader<T, D> extends CacheLoader<Class<? extends T>
 
     @Nonnull
     protected abstract AdapterBuilder<? extends T, D> createBuilder(Class<? extends T> 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 31c5971d0f191b47d0e5df8be915228ac03f8802..6db45f2c0e7380ed6f77a63242048c3db1bfc40f 100644 (file)
--- 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<T extends DOMDataTreeCursorAwareTransaction>
         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 29c034984bfe2801711cd51891f2ba4841c70a68..3de2def40c739266eb95762fa18831e05bb88124 100644 (file)
--- 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 2f09f365b41d9aaa279995c3e3fa93de32e60929..0f5d2582fb3ce09b5dcf0f8a72d0f7e391412597 100644 (file)
--- 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<? extends Object> 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<Class<? extends DOMService>> getRequiredDelegates() {
-            return ImmutableSet.<Class<? extends DOMService>>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 069bf773b1bf162072d745279444f3bdf59b583a..c39196de35433a5d8db9fd7f64c2607d0a00c4c0 100644 (file)
--- 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<Class<? extends BindingService>, Optional<BindingService>> services;
+    private final LoadingCache<Class<? extends BindingService>, Optional<BindingService>> 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 5e5905ec47238d8db2403929d4555911775728bd..bc060f2c788ba82b2b97e49a9b6d7b1d357a22b7 100644 (file)
--- 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 52d649876325dbfde1e615df1acadb4f78d4ade8..c5869c248392cac39af6387763bb26690149ac3d 100644 (file)
--- 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<T extends DataObject> implements DataTreeModifica
             final Collection<DataTreeCandidate> domChanges, final LogicalDatastoreType datastoreType) {
         final List<DataTreeModification<T>> result = new ArrayList<>(domChanges.size());
         for (final DataTreeCandidate domChange : domChanges) {
-            result.add(LazyDataTreeModification.<T>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 7e25af70a4be78defe67353cf885671cb593acd5..ff3199ce71ac24f24d83accfdb68782efc01325e 100644 (file)
--- 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.<DataContainerChild<? extends PathArgument, ?>>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 8492a04630219966d08a3252e97a118a6eaeb2c1..c85622dcb09ad9797080daaf811962824e686d21 100644 (file)
--- 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 98c0738c0dbf10fc0cb5ea38418547e410be3d10..12ed0d3ed33700b0c8a153d392deeb8153a4510a 100644 (file)
--- 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<SchemaContextListener> listeners = ListenerRegistry.create();
+    final ListenerRegistry<SchemaContextListener> listeners = ListenerRegistry.create();
 
     @Override
     public synchronized SchemaContext getGlobalContext() {