Fix checkstyle under Concepts module

Change-Id: If5ed38841ea0013f3e5b721f59c48d7cb778fedf
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java
index 48ff6ec01a4bd0d3c3cdd7da4f919828c9e892b1..47328b2c355b7c5f4d61f7f9e8252f5c7aacd1bc 100644 (file)
--- a/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java
+++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/DefaultInstanceReference.java
@@ -12,9 +12,6 @@ import static java.util.Objects.requireNonNull;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
-/**
- *
- */
 public class DefaultInstanceReference<T extends DataObject> implements InstanceReference<T> {
     private final InstanceIdentifier<T> instanceIdentifier;
 

diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java
index e24957b8528573365be02eff579c7194b62b7126..62ea49e07eace32f8ac8f41535015a03d7193145 100644 (file)
--- a/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java
+++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/KeyMapping.java
@@ -22,7 +22,7 @@ public final class KeyMapping extends HashMap<InetAddress, byte[]> {
         super();
     }
 
-    public static KeyMapping getKeyMapping(@Nonnull final InetAddress inetAddress, @Nullable final String password){
+    public static KeyMapping getKeyMapping(@Nonnull final InetAddress inetAddress, @Nullable final String password) {
         final KeyMapping keyMapping = new KeyMapping();
         if (!isNullOrEmpty(password)) {
             keyMapping.put(inetAddress, password.getBytes(StandardCharsets.US_ASCII));
@@ -30,7 +30,7 @@ public final class KeyMapping extends HashMap<InetAddress, byte[]> {
         return keyMapping;
     }
 
-    public static KeyMapping getKeyMapping(){
+    public static KeyMapping getKeyMapping() {
         return new KeyMapping();
     }
 }

diff --git a/concepts/src/main/java/org/opendaylight/protocol/concepts/MultiRegistry.java b/concepts/src/main/java/org/opendaylight/protocol/concepts/MultiRegistry.java
index 7ccb54e5d460a097170d955bb79538947d6008de..17da9ab2f7404253e037d5ddd12ab35f0c1b8285 100644 (file)
--- a/concepts/src/main/java/org/opendaylight/protocol/concepts/MultiRegistry.java
+++ b/concepts/src/main/java/org/opendaylight/protocol/concepts/MultiRegistry.java
@@ -10,21 +10,17 @@ package org.opendaylight.protocol.concepts;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.ListMultimap;
-
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
 import javax.annotation.concurrent.GuardedBy;
 import javax.annotation.concurrent.ThreadSafe;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * A registry which allows multiple values for a particular key. One of those is considered the best and returned as the
  * representative.
- *
  * When selecting the candidate, we evaluate the order of insertion, picking the value inserted first, but then we look
  * at all the other candidates and if there is one which is a subclass of the first one, we select that one.
  *

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
index dee993b5e0e2bdd1b1eb7c504a57cb7253a418dd..bd5975eb6ab60519bec4c9cbed8a458091bf8691 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/ASNumberTest.java
@@ -16,13 +16,14 @@ import static org.junit.Assert.assertThat;
 
 import java.util.HashSet;
 import java.util.Set;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 
 public class ASNumberTest {
-    private AsNumber asn1, asn3, asn4;
+    private AsNumber asn1;
+    private AsNumber asn3;
+    private AsNumber asn4;
 
     @Before
     public void setUp() {

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
index 220c559e7c9f6a56215e2541dc964bc7521ad157..ef8b30a24a80ce7d53b95021690f3324642d7975 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/BandwidthTest.java
@@ -22,7 +22,10 @@ import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.network.concepts.rev131125.Bandwidth;
 
 public class BandwidthTest {
-    private Bandwidth b1, b2, b3, b4;
+    private Bandwidth b1;
+    private Bandwidth b2;
+    private Bandwidth b3;
+    private Bandwidth b4;
 
     @Before
     public void setUp() {

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/DefaultInstanceReferenceTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/DefaultInstanceReferenceTest.java
index 1f258530470e84f10777a2ba4566e9c29851bcec..f247297a261e937e273627e7f3117f69c23660b1 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/DefaultInstanceReferenceTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/DefaultInstanceReferenceTest.java
@@ -15,7 +15,8 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class DefaultInstanceReferenceTest {
 
-    private static final InstanceIdentifier<NetworkTopology> IID = InstanceIdentifier.builder(NetworkTopology.class).build();
+    private static final InstanceIdentifier<NetworkTopology> IID
+            = InstanceIdentifier.builder(NetworkTopology.class).build();
 
     @Test
     public void testDefaultInstanceReference() {

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
index 020688999ddd1954f0ff33a8780df4c228b84519..5d1cff4c5f576fe68c48eaeea410179f2d530afa 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
@@ -9,6 +9,7 @@ package org.opendaylight.protocol.concepts;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+
 import org.junit.Test;
 
 public class MultiRegistryTest {