Fix 2 Checkstyle problems (red in Eclipse, missed in build)

This show up as red in Eclipse, but the CLI mvn build misses these; I
suspect that this is because the exact Checkstyle version used in the
Eclipse plugin likely is a little newer, and thus stricter, than the one
we currently use in the CLI mvn build.  (I have double checked that
other Checkstyle violations do still fail the build, these appear to be
corner cases.)

We should probably upgrade the CS version we have in odlparent.

Change-Id: Ib169df06b8d96dd2b8980ed33e59fcc9f1820d81
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
index f304837594db1d0aa5d2f86c7999cdec60bbb2be..88a50297ddcd64e49abd3e9508b471773372361e 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/test/java/org/opendaylight/genius/interfacemanager/test/InterfaceManagerTestUtil.java
@@ -263,8 +263,7 @@ public class InterfaceManagerTestUtil {
     }
 
     static void updateFlowCapableNodeConnectorState(DataBroker dataBroker, String interfaceName,
-                                                    Class<? extends InterfaceType> ifType, boolean isLive)
-    throws TransactionCommitFailedException {
+            Class<? extends InterfaceType> ifType, boolean isLive) throws TransactionCommitFailedException {
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         BigInteger dpnId = Tunnel.class.equals(ifType) ? DPN_ID_2 : DPN_ID_1;
         long portNo = Tunnel.class.equals(ifType) ? PORT_NO_1 : PORT_NO_1;
@@ -275,7 +274,7 @@ public class InterfaceManagerTestUtil {
     }
 
     static void removeFlowCapableNodeConnectorState(DataBroker dataBroker, Class<? extends InterfaceType> ifType)
-    throws TransactionCommitFailedException {
+            throws TransactionCommitFailedException {
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         BigInteger dpnId = Tunnel.class.equals(ifType) ? DPN_ID_2 : DPN_ID_1;
         long portNo = Tunnel.class.equals(ifType) ? PORT_NO_1 : PORT_NO_1;
@@ -284,8 +283,7 @@ public class InterfaceManagerTestUtil {
     }
 
 
-    static void removeNode(DataBroker dataBroker)
-    throws TransactionCommitFailedException {
+    static void removeNode(DataBroker dataBroker) throws TransactionCommitFailedException {
         WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
         InstanceIdentifier<Node> nodeInstanceIdentifier = InstanceIdentifier.builder(Nodes.class)
             .child(Node.class, new NodeKey(IfmUtil.buildDpnNodeId(DPN_ID_2))).build();

diff --git a/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/DumpIfmCache.java b/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/DumpIfmCache.java
index 033768aa340f63573a192d71eac48978e29af726..1723ab1482bade7c185be8fbab183c3af18cc1c2 100644 (file)
--- a/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/DumpIfmCache.java
+++ b/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/DumpIfmCache.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.genius.interfacemanager.shell;
 
-
 import java.util.Map;
 import java.util.Map.Entry;
 import org.apache.karaf.shell.commands.Command;

diff --git a/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/ShowVxlan.java b/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/ShowVxlan.java
index 2767594fd78ff65dc21167adea73c0b1f54476ba..1b24aec32820e040cc6548c226eb49989b2568e7 100644 (file)
--- a/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/ShowVxlan.java
+++ b/interfacemanager/interfacemanager-shell/src/main/java/org/opendaylight/genius/interfacemanager/shell/ShowVxlan.java
@@ -7,9 +7,7 @@
  */
 package org.opendaylight.genius.interfacemanager.shell;
 
-
 import java.util.List;
-
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.console.OsgiCommandSupport;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;