Fix more Sonar (soon Checkstyle) constant name

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

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java
index a3657c0cbb870cdcaaa905ea373ea425b6bfac5e..2bf2679397689a4204bae7787490003ff3b6bcc6 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/FutureTransformUtils.java
@@ -20,11 +20,11 @@ import org.opendaylight.ovsdb.lib.operations.Operation;
 import org.opendaylight.ovsdb.lib.operations.OperationResult;
 
 public class FutureTransformUtils {
-    private static final ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     public static final ListenableFuture<List<OperationResult>> transformTransactResponse(
             ListenableFuture<List<JsonNode>> transactResponseFuture, final List<Operation> operations) {
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        OBJECT_MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         return Futures.transform(transactResponseFuture, new Function<List<JsonNode>, List<OperationResult>>() {
             @Override
             public List<OperationResult> apply(List<JsonNode> jsonNodes) {
@@ -55,12 +55,12 @@ public class FutureTransformUtils {
                                     break;
 
                                 default:
-                                    or = objectMapper.convertValue(jsonNode, OperationResult.class);
+                                    or = OBJECT_MAPPER.convertValue(jsonNode, OperationResult.class);
 
                                     break;
                             }
                         } else {
-                            or = objectMapper.convertValue(jsonNode, OperationResult.class);
+                            or = OBJECT_MAPPER.convertValue(jsonNode, OperationResult.class);
                         }
                     } else {
                         or = new OperationResult();

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
index e5ab1b0857cb9d1d79e4ba058df2dec10a939a1a..89a7a1ff619af6b6253c8f8411470f3afac22335 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbClientImpl.java
@@ -70,10 +70,10 @@ public class OvsdbClientImpl implements OvsdbClient {
     private Channel channel;
     private boolean isConnectionPublished;
 
-    private static final ThreadFactory threadFactorySSL =
-        new ThreadFactoryBuilder().setNameFormat("OVSDBPassiveConnSSL-%d").build();
-    private static final ThreadFactory threadFactoryNonSSL =
-        new ThreadFactoryBuilder().setNameFormat("OVSDBPassiveConnNonSSL-%d").build();
+    private static final ThreadFactory THREAD_FACTORY_SSL =
+        new ThreadFactoryBuilder().setNameFormat("OVSDB-PassiveConnection-SSL-%d").build();
+    private static final ThreadFactory THREAD_FACTORY_NON_SSL =
+        new ThreadFactoryBuilder().setNameFormat("OVSDB-PassiveConnection-Non-SSL-%d").build();
 
     public OvsdbClientImpl(OvsdbRPC rpc, Channel channel, ConnectionType type,
         SocketConnectionType socketConnType) {
@@ -97,9 +97,9 @@ public class OvsdbClientImpl implements OvsdbClient {
         if (type == ConnectionType.PASSIVE) {
             switch (socketConnType) {
                 case SSL:
-                    return threadFactorySSL;
+                    return THREAD_FACTORY_SSL;
                 case NON_SSL:
-                    return threadFactoryNonSSL;
+                    return THREAD_FACTORY_NON_SSL;
                 default:
                     return Executors.defaultThreadFactory();
             }

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
index 7bda83eb8e36aae627c7fb446a6463d0d492f63b..fc7aacf296949aed72ce6578c91ea94c9d0cf53b 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/impl/OvsdbConnectionService.java
@@ -102,7 +102,7 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
     private static final int IDLE_READER_TIMEOUT = 30;
     private static final int READ_TIMEOUT = 180;
 
-    private static final StalePassiveConnectionService stalePassiveConnectionService =
+    private static final StalePassiveConnectionService STALE_PASSIVE_CONNECTION_SERVICE =
             new StalePassiveConnectionService(executorService);
 
     private static int retryPeriod = 100; // retry after 100 milliseconds
@@ -330,7 +330,7 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
                 if (clientsFromSameNode.size() == 0) {
                     notifyListenerForPassiveConnection(client);
                 } else {
-                    stalePassiveConnectionService.handleNewPassiveConnection(client, clientsFromSameNode);
+                    STALE_PASSIVE_CONNECTION_SERVICE.handleNewPassiveConnection(client, clientsFromSameNode);
                 }
             }
 
@@ -448,7 +448,7 @@ public class OvsdbConnectionService implements AutoCloseable, OvsdbConnection {
                 listener.disconnected(client);
             }
         }
-        stalePassiveConnectionService.clientDisconnected(client);
+        STALE_PASSIVE_CONNECTION_SERVICE.clientDisconnected(client);
     }
 
     @Override

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java
index 087967a070f45f3ad2b3783cd5cfb7f958cfe39f..f4787d31b99d52ee51b433169b71bcef69a4987b 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java
@@ -43,10 +43,10 @@ public class JsonRpcEndpoint {
     private static final Logger LOG = LoggerFactory.getLogger(JsonRpcEndpoint.class);
     private static final int REAPER_INTERVAL = 300;
     private static final int REAPER_THREADS = 3;
-    private static final ThreadFactory futureReaperThreadFactory = new ThreadFactoryBuilder()
+    private static final ThreadFactory FUTURE_REAPER_THREAD_FACTORY = new ThreadFactoryBuilder()
             .setNameFormat("OVSDB-Lib-Future-Reaper-%d").build();
-    private static final ScheduledExecutorService futureReaperService
-            = Executors.newScheduledThreadPool(REAPER_THREADS, futureReaperThreadFactory);
+    private static final ScheduledExecutorService FUTURE_REAPER_SERVICE
+            = Executors.newScheduledThreadPool(REAPER_THREADS, FUTURE_REAPER_THREAD_FACTORY);
 
     public class CallContext {
         Method method;
@@ -120,7 +120,7 @@ public class JsonRpcEndpoint {
 
                 SettableFuture<Object> sf = SettableFuture.create();
                 methodContext.put(request.getId(), new CallContext(request, method, sf));
-                futureReaperService.schedule(new Runnable() {
+                FUTURE_REAPER_SERVICE.schedule(new Runnable() {
                     @Override
                     public void run() {
                         if (sf.isDone() || sf.isCancelled()) {