Fix checkstyle

Upgraded checkstyle is finding new violations, fix them up.

Change-Id: Ib95acc8bc7d738b620ce69ad6b54a9a539ff4b9d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java b/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java
index 5860a2485d7f40750c88a9dec16a0bb73dbf684e..9596e012c31bcb7458c10e02f05885578891c1fe 100644 (file)
--- a/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java
+++ b/library/impl/src/test/java/org/opendaylight/ovsdb/lib/schema/typed/TyperUtilsTest.java
@@ -24,11 +24,11 @@ import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
  */
 public class TyperUtilsTest {
     @TypedTable(name = "TestTypedTable", database = "Open_vSwitch")
-    private class TestTypedTable {
+    private static final class TestTypedTable {
 
     }
 
-    private class TestUntypedTable {
+    private static final class TestUntypedTable {
 
     }
 

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java
index 431ae62f98248c21981beb3db1785808dbc900bf..e72fee3daccde369c8b95b834e9066a89148af79 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestBase.java
@@ -305,7 +305,7 @@ public abstract class LibraryIntegrationTestBase extends AbstractMdsalTestBase {
         setSetup(true);
     }
 
-    private class UpdateMonitor implements MonitorCallBack {
+    private final class UpdateMonitor implements MonitorCallBack {
         @Override
         public void update(TableUpdates result, DatabaseSchema unused) {
             updateTableCache(result);

diff --git a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestUtils.java b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestUtils.java
index ad29c5f21e234cb825ea093bb3ecf4fc4c575d26..6ee6682414b8b13038689274f087f6e29b9f6dee 100644 (file)
--- a/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestUtils.java
+++ b/library/it/src/test/java/org/opendaylight/ovsdb/lib/it/LibraryIntegrationTestUtils.java
@@ -96,7 +96,7 @@ public final class LibraryIntegrationTestUtils {
                 + "passive connection : mvn -Pintegrationtest -Dovsdbserver.connection=passive verify\n";
     }
 
-    private static class PassiveListener implements Callable<OvsdbClient>, OvsdbConnectionListener {
+    private static final class PassiveListener implements Callable<OvsdbClient>, OvsdbConnectionListener {
         OvsdbClient client = null;
 
         @Override

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
index 1819e9a707ee8e5ac248e4978c86e807433d0643..7e4f02c6315fdc4e6e62146278abd838b3af4657 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
@@ -2144,7 +2144,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         assertNull(operQueue);
     }
 
-    private static class SouthboundQueuesExternalIdsHelper
+    private static final class SouthboundQueuesExternalIdsHelper
             implements SouthboundQueueHelper<QueuesExternalIdsKey, QueuesExternalIds> {
         @Override
         public void writeValues(final QueuesBuilder builder,
@@ -2158,7 +2158,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class SouthboundQueuesOtherConfigHelper
+    private static final class SouthboundQueuesOtherConfigHelper
             implements SouthboundQueueHelper<QueuesOtherConfigKey, QueuesOtherConfig> {
         @Override
         public void writeValues(final QueuesBuilder builder,
@@ -2187,7 +2187,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         return null;
     }
 
-    private static class SouthboundQosExternalIdsHelper
+    private static final class SouthboundQosExternalIdsHelper
             implements SouthboundQosHelper<QosExternalIdsKey, QosExternalIds> {
         @Override
         public void writeValues(final QosEntriesBuilder builder, final Map<QosExternalIdsKey, QosExternalIds> values) {
@@ -2200,7 +2200,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class SouthboundQosOtherConfigHelper
+    private static final class SouthboundQosOtherConfigHelper
             implements SouthboundQosHelper<QosOtherConfigKey, QosOtherConfig> {
         @Override
         public void writeValues(final QosEntriesBuilder builder, final Map<QosOtherConfigKey, QosOtherConfig> values) {
@@ -2940,7 +2940,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         return testCases;
     }
 
-    private static class PortExternalIdsSouthboundHelper
+    private static final class PortExternalIdsSouthboundHelper
             implements SouthboundTerminationPointHelper<PortExternalIdsKey, PortExternalIds> {
         @Override
         public void writeValues(final OvsdbTerminationPointAugmentationBuilder builder,
@@ -2955,7 +2955,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class InterfaceExternalIdsSouthboundHelper
+    private static final class InterfaceExternalIdsSouthboundHelper
             implements SouthboundTerminationPointHelper<InterfaceExternalIdsKey, InterfaceExternalIds> {
         @Override
         public void writeValues(final OvsdbTerminationPointAugmentationBuilder builder,
@@ -2970,7 +2970,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class InterfaceLldpSouthboundHelper
+    private static final class InterfaceLldpSouthboundHelper
             implements SouthboundTerminationPointHelper<InterfaceLldpKey, InterfaceLldp> {
         @Override
         public void writeValues(final OvsdbTerminationPointAugmentationBuilder builder,
@@ -2984,7 +2984,8 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class OptionsSouthboundHelper implements SouthboundTerminationPointHelper<OptionsKey, Options> {
+    private static final class OptionsSouthboundHelper
+            implements SouthboundTerminationPointHelper<OptionsKey, Options> {
         @Override
         public void writeValues(final OvsdbTerminationPointAugmentationBuilder builder,
                 final Map<OptionsKey, Options> values) {
@@ -2997,7 +2998,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class InterfaceOtherConfigsSouthboundHelper
+    private static final class InterfaceOtherConfigsSouthboundHelper
             implements SouthboundTerminationPointHelper<InterfaceOtherConfigsKey, InterfaceOtherConfigs> {
         @Override
         public void writeValues(final OvsdbTerminationPointAugmentationBuilder builder,
@@ -3012,7 +3013,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class PortOtherConfigsSouthboundHelper implements
+    private static final class PortOtherConfigsSouthboundHelper implements
             SouthboundTerminationPointHelper<PortOtherConfigsKey, PortOtherConfigs> {
         @Override
         public void writeValues(final OvsdbTerminationPointAugmentationBuilder builder,
@@ -3027,7 +3028,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class BridgeExternalIdsSouthboundHelper
+    private static final class BridgeExternalIdsSouthboundHelper
             implements SouthboundBridgeHelper<BridgeExternalIdsKey, BridgeExternalIds> {
         @Override
         public void writeValues(final OvsdbBridgeAugmentationBuilder builder,
@@ -3041,7 +3042,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         }
     }
 
-    private static class BridgeOtherConfigsSouthboundHelper
+    private static final class BridgeOtherConfigsSouthboundHelper
             implements SouthboundBridgeHelper<BridgeOtherConfigsKey, BridgeOtherConfigs> {
         @Override
         public void writeValues(final OvsdbBridgeAugmentationBuilder builder,

diff --git a/utils/config/src/test/java/org/opendaylight/ovsdb/utils/config/ConfigPropertiesTest.java b/utils/config/src/test/java/org/opendaylight/ovsdb/utils/config/ConfigPropertiesTest.java
index 3e3e0c07946f6a551efcb43400f72401027664b0..25fe26534489df6ec06f4c074745961c77cd68b7 100644 (file)
--- a/utils/config/src/test/java/org/opendaylight/ovsdb/utils/config/ConfigPropertiesTest.java
+++ b/utils/config/src/test/java/org/opendaylight/ovsdb/utils/config/ConfigPropertiesTest.java
@@ -93,9 +93,9 @@ public class ConfigPropertiesTest {
     }
 
     // Helper classes used to de-mux mock behaviors
-    private static class ConfigPropertiesTestMockingBundleNoContext {
+    private static final class ConfigPropertiesTestMockingBundleNoContext {
     }
 
-    private static class ConfigPropertiesTestMocking {
+    private static final class ConfigPropertiesTestMocking {
     }
 }

diff --git a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java
index 37ac42db65544ebfe2e32f93eb068dd013986597..825dc42720a4182642012282ff23e88314ed4341 100644 (file)
--- a/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java
+++ b/utils/ovsdb-it-utils/src/main/java/org/opendaylight/ovsdb/utils/ovsdb/it/utils/DockerOvs.java
@@ -142,7 +142,7 @@ public final class DockerOvs implements AutoCloseable {
     private boolean runDocker;
     private boolean createOdlNetwork;
 
-    private static class DockerComposeServiceInfo {
+    private static final class DockerComposeServiceInfo {
         String name;
         String port;
     }