Fix findbugs violations in hwvtepsouthbound-impl

[ovsdb.git] / hwvtepsouthbound / hwvtepsouthbound-impl / src / main / java / org / opendaylight / ovsdb / hwvtepsouthbound / reconciliation / connection / ConnectionReconciliationTask.java

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/connection/ConnectionReconciliationTask.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/connection/ConnectionReconciliationTask.java
index 476765ffe4e4cca191f2450054c74967ee0d3f2c..1d4cb55d815301b3d717bb9a0f2df0c8e80367f3 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/connection/ConnectionReconciliationTask.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/connection/ConnectionReconciliationTask.java
@@ -7,10 +7,13 @@
  */
 package org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation.connection;
 
+import java.net.ConnectException;
+import java.net.UnknownHostException;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager;
 import org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation.ReconciliationManager;
 import org.opendaylight.ovsdb.hwvtepsouthbound.reconciliation.ReconciliationTask;
 import org.opendaylight.ovsdb.lib.OvsdbClient;
-import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
 import org.opendaylight.yangtools.yang.binding.DataObject;
@@ -18,23 +21,20 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.net.ConnectException;
-import java.net.UnknownHostException;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
- * Copied from org.opendaylight.ovsdb.southbound.reconciliation.connection.ConnectionReconciliationTask
+ * Copied from org.opendaylight.ovsdb.southbound.reconciliation.connection.ConnectionReconciliationTask.
  *
+ * <p>
  * Created by Anil Vishnoi (avishnoi@Brocade.com) on 3/9/16.
  */
 public class ConnectionReconciliationTask extends ReconciliationTask {
 
     private static final Logger LOG = LoggerFactory.getLogger(ConnectionReconciliationTask.class);
 
-    private static final int RETRY_INTERVAL_FACTOR = 10000;
+    private static final long RETRY_INTERVAL_FACTOR = 10000L;
     private static final int MAX_ATTEMPT = 10;
 
-    private AtomicInteger connectionAttempt = new AtomicInteger(0);
+    private final AtomicInteger connectionAttempt = new AtomicInteger(0);
 
     public ConnectionReconciliationTask(ReconciliationManager reconciliationManager, HwvtepConnectionManager
             connectionManager, InstanceIdentifier<?> nodeIid, DataObject configData) {
@@ -46,13 +46,13 @@ public class ConnectionReconciliationTask extends ReconciliationTask {
     public boolean reconcileConfiguration(HwvtepConnectionManager connectionManager) {
         boolean result = false;
         connectionAttempt.incrementAndGet();
-        InstanceIdentifier<Node> nIid = (InstanceIdentifier<Node>) nodeIid;
-        HwvtepGlobalAugmentation hwvtepNode = (HwvtepGlobalAugmentation)configData;
+        InstanceIdentifier<Node> nodeId = (InstanceIdentifier<Node>) nodeIid;
+        HwvtepGlobalAugmentation hwvtepNode = (HwvtepGlobalAugmentation) configData;
 
         LOG.info("Retry({}) connection to Ovsdb Node {} ", connectionAttempt.get(), hwvtepNode.getConnectionInfo());
         OvsdbClient client = null;
         try {
-            client = connectionManager.connect(nIid, hwvtepNode);
+            client = connectionManager.connect(nodeId, hwvtepNode);
             if (client != null) {
                 LOG.info("Successfully connected to Hwvtep Node {} ", hwvtepNode.getConnectionInfo());
                 result = true;
@@ -61,7 +61,7 @@ public class ConnectionReconciliationTask extends ReconciliationTask {
                         connectionAttempt.get(), hwvtepNode.getConnectionInfo());
             }
         } catch (UnknownHostException | ConnectException e) {
-            LOG.warn("Connection retry({}) failed with exception. ",connectionAttempt.get(), e);
+            LOG.warn("Connection retry({}) failed with exception. ", connectionAttempt.get(), e);
         }
         return result;
     }
@@ -69,7 +69,7 @@ public class ConnectionReconciliationTask extends ReconciliationTask {
     @Override
     public void doRetry(boolean wasLastAttemptSuccessful) {
 
-        if( !wasLastAttemptSuccessful && connectionAttempt.get() <= MAX_ATTEMPT ) {
+        if (!wasLastAttemptSuccessful && connectionAttempt.get() <= MAX_ATTEMPT) {
             reconciliationManager.enqueueForRetry(ConnectionReconciliationTask.this);
         } else {
             reconciliationManager.dequeue(this);