Add @NonNull annotation to OvsdbConnectionListener.connected()

Eclipse warns about users overriding unconstrained parameter here,
and we know the instance will not be null. Propagate @NonNull to
the API specification, fixing warnings.

This also fixes similar warnings in other places.

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

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
index 000a0189eeada386037cb08753cff04cb3a9b4a4..dfdfc1cac2180e4c7b33c7bd4364c45996a2af9a 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java
@@ -115,7 +115,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
     }
 
     @Override
-    public void connected(@NonNull final OvsdbClient externalClient) {
+    public void connected(final OvsdbClient externalClient) {
         LOG.info("Library connected {} from {}:{} to {}:{}",
                 externalClient.getConnectionInfo().getType(),
                 externalClient.getConnectionInfo().getRemoteAddress(),
@@ -508,7 +508,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo
 
                 Futures.addCallback(readNodeFuture, new FutureCallback<Optional<Node>>() {
                     @Override
-                    public void onSuccess(@NonNull final Optional<Node> node) {
+                    public void onSuccess(final Optional<Node> node) {
                         if (node.isPresent()) {
                             HwvtepGlobalAugmentation augmentation = node.get()
                                     .augmentation(HwvtepGlobalAugmentation.class);

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java
index 3919932e5910cddb012530075725b3912bf613cb..df6240737dd62dc770a0ca279c6ad8400ffda405 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md;
 
 import com.google.common.base.Optional;
@@ -21,7 +20,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionInstance;
@@ -73,8 +71,8 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
     private final Map<UUID, PhysicalSwitch> switchUpdatedRows;
     private final Set<UUID> skipReconciliationPorts;
 
-    public HwvtepPhysicalPortUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates,
-            DatabaseSchema dbSchema) {
+    public HwvtepPhysicalPortUpdateCommand(final HwvtepConnectionInstance key, final TableUpdates updates,
+            final DatabaseSchema dbSchema) {
         super(key, updates, dbSchema);
         updatedPPRows = TyperUtils.extractRowsUpdated(PhysicalPort.class, getUpdates(), getDbSchema());
         oldPPRows = TyperUtils.extractRowsOld(PhysicalPort.class, getUpdates(), getDbSchema());
@@ -94,7 +92,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
     }
 
     @Override
-    public void execute(ReadWriteTransaction transaction) {
+    public void execute(final ReadWriteTransaction transaction) {
         final InstanceIdentifier<Node> connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier();
         if (updatedPPRows.isEmpty()) {
             return;
@@ -107,7 +105,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         }
     }
 
-    private void updateTerminationPoints(ReadWriteTransaction transaction, Node node) {
+    private void updateTerminationPoints(final ReadWriteTransaction transaction, final Node node) {
         for (Entry<UUID, PhysicalPort> portUpdateEntry : updatedPPRows.entrySet()) {
             PhysicalPort portUpdate = portUpdateEntry.getValue();
             String portName = portUpdate.getNameColumn().getData();
@@ -186,7 +184,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         Futures.addCallback(transaction.read(LogicalDatastoreType.CONFIGURATION, tpPath),
                 new FutureCallback<Optional<TerminationPoint>>() {
                     @Override
-                    public void onSuccess(@NonNull Optional<TerminationPoint> optionalConfigTp) {
+                    public void onSuccess(final Optional<TerminationPoint> optionalConfigTp) {
                         if (!optionalConfigTp.isPresent() || optionalConfigTp.get().augmentation(
                                 HwvtepPhysicalPortAugmentation.class) == null) {
                             //TODO port came with some vlan bindings clean them up use PortRemovedCommand
@@ -208,49 +206,50 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
                     }
 
                     @Override
-                    public void onFailure(Throwable throwable) {
+                    public void onFailure(final Throwable throwable) {
                     }
                 }, MoreExecutors.directExecutor());
     }
 
-    private <T extends DataObject> void deleteEntries(ReadWriteTransaction transaction,
-            List<InstanceIdentifier<T>> entryIids) {
+    private static <T extends DataObject> void deleteEntries(final ReadWriteTransaction transaction,
+            final List<InstanceIdentifier<T>> entryIids) {
         for (InstanceIdentifier<T> entryIid : entryIids) {
             transaction.delete(LogicalDatastoreType.OPERATIONAL, entryIid);
         }
     }
 
-    private InstanceIdentifier<VlanBindings> getInstanceIdentifier(InstanceIdentifier<TerminationPoint> tpPath,
-            VlanBindings vlanBindings) {
+    private InstanceIdentifier<VlanBindings> getInstanceIdentifier(final InstanceIdentifier<TerminationPoint> tpPath,
+            final VlanBindings vlanBindings) {
         return HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), tpPath, vlanBindings);
     }
 
-    private InstanceIdentifier<TerminationPoint> getInstanceIdentifier(InstanceIdentifier<Node> switchIid,
-            PhysicalPort port) {
+    private static InstanceIdentifier<TerminationPoint> getInstanceIdentifier(final InstanceIdentifier<Node> switchIid,
+            final PhysicalPort port) {
         return switchIid.child(TerminationPoint.class, new TerminationPointKey(new TpId(port.getName())));
     }
 
-    private void buildTerminationPoint(HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder,
-            PhysicalPort portUpdate) {
+    private void buildTerminationPoint(final HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder,
+            final PhysicalPort portUpdate) {
         updatePhysicalPortId(portUpdate, tpAugmentationBuilder);
         updatePort(portUpdate, tpAugmentationBuilder);
     }
 
-    private void updatePort(PhysicalPort portUpdate, HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) {
+    private void updatePort(final PhysicalPort portUpdate,
+            final HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) {
         updateVlanBindings(portUpdate, tpAugmentationBuilder);
         tpAugmentationBuilder.setPhysicalPortUuid(new Uuid(portUpdate.getUuid().toString()));
     }
 
-    private void updatePhysicalPortId(PhysicalPort portUpdate,
-            HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) {
+    private static void updatePhysicalPortId(final PhysicalPort portUpdate,
+            final HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) {
         tpAugmentationBuilder.setHwvtepNodeName(new HwvtepNodeName(portUpdate.getName()));
         if (portUpdate.getDescription() != null) {
             tpAugmentationBuilder.setHwvtepNodeDescription(portUpdate.getDescription());
         }
     }
 
-    private void updateVlanBindings(PhysicalPort portUpdate,
-            HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) {
+    private void updateVlanBindings(final PhysicalPort portUpdate,
+            final HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) {
         Map<Long, UUID> vlanBindings = portUpdate.getVlanBindingsColumn().getData();
         if (vlanBindings != null && !vlanBindings.isEmpty()) {
             List<VlanBindings> vlanBindingsList = new ArrayList<>();
@@ -265,7 +264,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         }
     }
 
-    private VlanBindings createVlanBinding(Long key, UUID value) {
+    private VlanBindings createVlanBinding(final Long key, final UUID value) {
         VlanBindingsBuilder vbBuilder = new VlanBindingsBuilder();
         VlanBindingsKey vbKey = new VlanBindingsKey(new VlanId(key.intValue()));
         vbBuilder.withKey(vbKey);
@@ -275,7 +274,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         return vbBuilder.build();
     }
 
-    private HwvtepLogicalSwitchRef getLogicalSwitchRef(UUID switchUUID) {
+    private HwvtepLogicalSwitchRef getLogicalSwitchRef(final UUID switchUUID) {
         LogicalSwitch logicalSwitch = getOvsdbConnectionInstance().getDeviceInfo().getLogicalSwitch(switchUUID);
         if (logicalSwitch != null) {
             InstanceIdentifier<LogicalSwitches> switchIid =
@@ -288,7 +287,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         return null;
     }
 
-    private Optional<InstanceIdentifier<Node>> getTerminationPointSwitch(UUID portUUID) {
+    private Optional<InstanceIdentifier<Node>> getTerminationPointSwitch(final UUID portUUID) {
         for (PhysicalSwitch updatedPhysicalSwitch : switchUpdatedRows.values()) {
             if (updatedPhysicalSwitch.getPortsColumn().getData().contains(portUUID)) {
                 return Optional.of(HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(),
@@ -298,8 +297,8 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         return Optional.absent();
     }
 
-    private Optional<InstanceIdentifier<Node>> getTerminationPointSwitch(final ReadWriteTransaction transaction,
-            Node node, String tpName) {
+    private static Optional<InstanceIdentifier<Node>> getTerminationPointSwitch(final ReadWriteTransaction transaction,
+            final Node node, final String tpName) {
         HwvtepGlobalAugmentation hwvtepNode = node.augmentation(HwvtepGlobalAugmentation.class);
         List<Switches> switchNodes = hwvtepNode.getSwitches();
         if (switchNodes != null && !switchNodes.isEmpty()) {
@@ -323,8 +322,8 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
         return Optional.absent();
     }
 
-    private void setPortFaultStatus(HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder,
-            PhysicalPort portUpdate) {
+    private static void setPortFaultStatus(final HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder,
+            final PhysicalPort portUpdate) {
         if (portUpdate.getPortFaultStatusColumn() != null && portUpdate.getPortFaultStatusColumn().getData() != null
                 && !portUpdate.getPortFaultStatusColumn().getData().isEmpty()) {
             List<PortFaultStatus> portFaultStatusLst = new ArrayList<>();
@@ -337,7 +336,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
     }
 
     private List<InstanceIdentifier<PortFaultStatus>> getPortFaultStatusToRemove(
-            InstanceIdentifier<TerminationPoint> tpPath, PhysicalPort port) {
+            final InstanceIdentifier<TerminationPoint> tpPath, final PhysicalPort port) {
         Preconditions.checkNotNull(tpPath);
         Preconditions.checkNotNull(port);
         List<InstanceIdentifier<PortFaultStatus>> result = new ArrayList<>();
@@ -358,8 +357,8 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand
     private  Optional<InstanceIdentifier<Node>> getFromDeviceOperCache(final UUID uuid) {
 
         InstanceIdentifier<TerminationPoint> terminationPointIid =
-                (InstanceIdentifier<TerminationPoint>)getOvsdbConnectionInstance()
-                        .getDeviceInfo().getDeviceOperKey(TerminationPoint.class, uuid);
+                getOvsdbConnectionInstance()
+                .getDeviceInfo().getDeviceOperKey(TerminationPoint.class, uuid);
         if (terminationPointIid != null) {
             return Optional.of(terminationPointIid.firstIdentifierOf(Node.class));
         }

diff --git a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java
index 137aa9694ee96b26e5007a49a1a2c26c3252ad8e..63aa7c1bbae523f19bd9b8de4772a0ac28391200 100644 (file)
--- a/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java
+++ b/library/impl/src/main/java/org/opendaylight/ovsdb/lib/OvsdbConnectionListener.java
@@ -8,6 +8,8 @@
 
 package org.opendaylight.ovsdb.lib;
 
+import org.eclipse.jdt.annotation.NonNull;
+
 /**
  * Applications interested in Passive ovsdb connection events should implement this interface.
  */
@@ -16,7 +18,7 @@ public interface OvsdbConnectionListener {
      * Event thrown to the connection listener when a new Passive connection is established.
      * @param client OvsdbClient that represents the connection.
      */
-    void connected(OvsdbClient client);
+    void connected(@NonNull OvsdbClient client);
 
     /**
      * Event thrown to the connection listener when an existing connection is terminated.

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
index 30b17a64a2121f1bf074fee97da9e02839b82c25..73d14de44a122f08dd94a4347f28a742604c840f 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
@@ -87,10 +87,10 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     private final ReconciliationManager reconciliationManager;
     private final InstanceIdentifierCodec instanceIdentifierCodec;
 
-    public OvsdbConnectionManager(DataBroker db,TransactionInvoker txInvoker,
-                                  EntityOwnershipService entityOwnershipService,
-                                  OvsdbConnection ovsdbConnection,
-                                  InstanceIdentifierCodec instanceIdentifierCodec) {
+    public OvsdbConnectionManager(final DataBroker db,final TransactionInvoker txInvoker,
+                                  final EntityOwnershipService entityOwnershipService,
+                                  final OvsdbConnection ovsdbConnection,
+                                  final InstanceIdentifierCodec instanceIdentifierCodec) {
         this.db = db;
         this.txInvoker = txInvoker;
         this.entityOwnershipService = entityOwnershipService;
@@ -101,7 +101,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     }
 
     @Override
-    public void connected(@NonNull final OvsdbClient externalClient) {
+    public void connected(final OvsdbClient externalClient) {
         LOG.info("Library connected {} from {}:{} to {}:{}",
                 externalClient.getConnectionInfo().getType(),
                 externalClient.getConnectionInfo().getRemoteAddress(),
@@ -156,7 +156,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     }
 
     @Override
-    public void disconnected(OvsdbClient client) {
+    public void disconnected(final OvsdbClient client) {
         LOG.info("Library disconnected {} from {}:{} to {}:{}. Cleaning up the operational data store",
                 client.getConnectionInfo().getType(),
                 client.getConnectionInfo().getRemoteAddress(),
@@ -209,7 +209,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
             }
 
             @Override
-            public void onFailure(Throwable throwable) {
+            public void onFailure(final Throwable throwable) {
                 LOG.debug("Failed to remove node {} from oper", nodeIid);
                 super.onFailure(throwable);
                 unregisterEntityForOwnership(ovsdbConnectionInstance);
@@ -217,8 +217,8 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         });
     }
 
-    public OvsdbClient connect(InstanceIdentifier<Node> iid,
-            OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException, ConnectException {
+    public OvsdbClient connect(final InstanceIdentifier<Node> iid,
+            final OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException, ConnectException {
         LOG.info("Connecting to {}", SouthboundUtil.connectionInfoToString(ovsdbNode.getConnectionInfo()));
 
         // TODO handle case where we already have a connection
@@ -242,7 +242,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         return client;
     }
 
-    public void disconnect(OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException {
+    public void disconnect(final OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException {
         LOG.info("Disconnecting from {}", SouthboundUtil.connectionInfoToString(ovsdbNode.getConnectionInfo()));
         OvsdbConnectionInstance client = getConnectionInstance(ovsdbNode.getConnectionInfo());
         if (client != null) {
@@ -285,38 +285,38 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     }
 
     @VisibleForTesting
-    void putConnectionInstance(ConnectionInfo key,OvsdbConnectionInstance instance) {
+    void putConnectionInstance(final ConnectionInfo key,final OvsdbConnectionInstance instance) {
         ConnectionInfo connectionInfo = SouthboundMapper.suppressLocalIpPort(key);
         clients.put(connectionInfo, instance);
     }
 
-    private void removeConnectionInstance(ConnectionInfo key) {
+    private void removeConnectionInstance(final ConnectionInfo key) {
         ConnectionInfo connectionInfo = SouthboundMapper.suppressLocalIpPort(key);
         clients.remove(connectionInfo);
     }
 
     @VisibleForTesting
-    void putInstanceIdentifier(ConnectionInfo key, InstanceIdentifier<Node> iid) {
+    void putInstanceIdentifier(final ConnectionInfo key, final InstanceIdentifier<Node> iid) {
         ConnectionInfo connectionInfo = SouthboundMapper.suppressLocalIpPort(key);
         instanceIdentifiers.put(connectionInfo, iid);
     }
 
-    private void removeInstanceIdentifier(ConnectionInfo key) {
+    private void removeInstanceIdentifier(final ConnectionInfo key) {
         ConnectionInfo connectionInfo = SouthboundMapper.suppressLocalIpPort(key);
         instanceIdentifiers.remove(connectionInfo);
     }
 
-    public InstanceIdentifier<Node> getInstanceIdentifier(ConnectionInfo key) {
+    public InstanceIdentifier<Node> getInstanceIdentifier(final ConnectionInfo key) {
         ConnectionInfo connectionInfo = SouthboundMapper.suppressLocalIpPort(key);
         return instanceIdentifiers.get(connectionInfo);
     }
 
-    public OvsdbConnectionInstance getConnectionInstance(ConnectionInfo key) {
+    public OvsdbConnectionInstance getConnectionInstance(final ConnectionInfo key) {
         ConnectionInfo connectionInfo = SouthboundMapper.suppressLocalIpPort(key);
         return clients.get(connectionInfo);
     }
 
-    public OvsdbConnectionInstance getConnectionInstance(OvsdbBridgeAttributes mn) {
+    public OvsdbConnectionInstance getConnectionInstance(final OvsdbBridgeAttributes mn) {
         Optional<OvsdbNodeAugmentation> optional = SouthboundUtil.getManagingNode(db, mn);
         if (optional.isPresent()) {
             return getConnectionInstance(optional.get().getConnectionInfo());
@@ -325,7 +325,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    public OvsdbConnectionInstance getConnectionInstance(Node node) {
+    public OvsdbConnectionInstance getConnectionInstance(final Node node) {
         Preconditions.checkNotNull(node);
         OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class);
         OvsdbBridgeAugmentation ovsdbManagedNode = node.augmentation(OvsdbBridgeAugmentation.class);
@@ -339,7 +339,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    public OvsdbConnectionInstance getConnectionInstance(InstanceIdentifier<Node> nodePath) {
+    public OvsdbConnectionInstance getConnectionInstance(final InstanceIdentifier<Node> nodePath) {
         if (nodeIdVsConnectionInstance.get(nodePath) != null) {
             return nodeIdVsConnectionInstance.get(nodePath);
         }
@@ -361,7 +361,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    public OvsdbClient getClient(ConnectionInfo connectionInfo) {
+    public OvsdbClient getClient(final ConnectionInfo connectionInfo) {
         OvsdbConnectionInstance connectionInstance = getConnectionInstance(connectionInfo);
         if (connectionInstance != null) {
             return connectionInstance.getOvsdbClient();
@@ -369,15 +369,15 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         return null;
     }
 
-    public OvsdbClient getClient(OvsdbBridgeAttributes mn) {
+    public OvsdbClient getClient(final OvsdbBridgeAttributes mn) {
         return getConnectionInstance(mn).getOvsdbClient();
     }
 
-    public OvsdbClient getClient(Node node) {
+    public OvsdbClient getClient(final Node node) {
         return getConnectionInstance(node).getOvsdbClient();
     }
 
-    public Boolean getHasDeviceOwnership(ConnectionInfo connectionInfo) {
+    public Boolean getHasDeviceOwnership(final ConnectionInfo connectionInfo) {
         OvsdbConnectionInstance ovsdbConnectionInstance = getConnectionInstance(connectionInfo);
         if (ovsdbConnectionInstance == null) {
             return Boolean.FALSE;
@@ -385,13 +385,14 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         return ovsdbConnectionInstance.getHasDeviceOwnership();
     }
 
-    public void reconcileConnection(InstanceIdentifier<Node> iid, OvsdbNodeAugmentation ovsdbNode) {
+    public void reconcileConnection(final InstanceIdentifier<Node> iid, final OvsdbNodeAugmentation ovsdbNode) {
         this.retryConnection(iid, ovsdbNode,
                 ConnectionReconciliationTriggers.ON_CONTROLLER_INITIATED_CONNECTION_FAILURE);
 
     }
 
-    public void stopConnectionReconciliationIfActive(InstanceIdentifier<?> iid, OvsdbNodeAugmentation ovsdbNode) {
+    public void stopConnectionReconciliationIfActive(final InstanceIdentifier<?> iid,
+            final OvsdbNodeAugmentation ovsdbNode) {
         final ReconciliationTask task = new ConnectionReconciliationTask(
                 reconciliationManager,
                 this,
@@ -400,7 +401,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         reconciliationManager.dequeue(task);
     }
 
-    public void stopBridgeConfigReconciliationIfActive(InstanceIdentifier<?> iid) {
+    public void stopBridgeConfigReconciliationIfActive(final InstanceIdentifier<?> iid) {
         final ReconciliationTask task =
                 new BridgeConfigReconciliationTask(reconciliationManager, this, iid, null, instanceIdentifierCodec);
         reconciliationManager.dequeue(task);
@@ -409,7 +410,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
 
     @SuppressFBWarnings(value = "UPM_UNCALLED_PRIVATE_METHOD",
             justification = "https://github.com/spotbugs/spotbugs/issues/811")
-    private void handleOwnershipChanged(EntityOwnershipChange ownershipChange) {
+    private void handleOwnershipChanged(final EntityOwnershipChange ownershipChange) {
         OvsdbConnectionInstance ovsdbConnectionInstance = getConnectionInstanceFromEntity(ownershipChange.getEntity());
         LOG.debug("handleOwnershipChanged: {} event received for device {}",
                 ownershipChange, ovsdbConnectionInstance != null ? ovsdbConnectionInstance.getConnectionInfo()
@@ -472,7 +473,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    private void cleanEntityOperationalData(Entity entity) {
+    private void cleanEntityOperationalData(final Entity entity) {
 
         //Do explicit cleanup rather than using OvsdbNodeRemoveCommand, because there
         // are chances that other controller instance went down abruptly and it does
@@ -502,7 +503,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
 
     }
 
-    private OpenVSwitch getOpenVswitchTableEntry(OvsdbConnectionInstance connectionInstance) {
+    private OpenVSwitch getOpenVswitchTableEntry(final OvsdbConnectionInstance connectionInstance) {
         DatabaseSchema dbSchema = null;
         OpenVSwitch openVSwitchRow = null;
         try {
@@ -538,7 +539,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         return openVSwitchRow;
     }
 
-    private Entity getEntityFromConnectionInstance(@NonNull OvsdbConnectionInstance ovsdbConnectionInstance) {
+    private Entity getEntityFromConnectionInstance(@NonNull final OvsdbConnectionInstance ovsdbConnectionInstance) {
         InstanceIdentifier<Node> iid = ovsdbConnectionInstance.getInstanceIdentifier();
         if (iid == null) {
             /* Switch initiated connection won't have iid, till it gets OpenVSwitch
@@ -557,11 +558,11 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         return deviceEntity;
     }
 
-    private OvsdbConnectionInstance getConnectionInstanceFromEntity(Entity entity) {
+    private OvsdbConnectionInstance getConnectionInstanceFromEntity(final Entity entity) {
         return entityConnectionMap.get(entity);
     }
 
-    private void registerEntityForOwnership(OvsdbConnectionInstance ovsdbConnectionInstance) {
+    private void registerEntityForOwnership(final OvsdbConnectionInstance ovsdbConnectionInstance) {
         putConnectionInstance(ovsdbConnectionInstance.getMDConnectionInfo(), ovsdbConnectionInstance);
 
         Entity candidateEntity = getEntityFromConnectionInstance(ovsdbConnectionInstance);
@@ -597,13 +598,13 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    private void unregisterEntityForOwnership(OvsdbConnectionInstance ovsdbConnectionInstance) {
+    private void unregisterEntityForOwnership(final OvsdbConnectionInstance ovsdbConnectionInstance) {
         ovsdbConnectionInstance.closeDeviceOwnershipCandidateRegistration();
         entityConnectionMap.remove(ovsdbConnectionInstance.getConnectedEntity(), ovsdbConnectionInstance);
     }
 
     private void retryConnection(final InstanceIdentifier<Node> iid, final OvsdbNodeAugmentation ovsdbNode,
-                                 ConnectionReconciliationTriggers trigger) {
+                                 final ConnectionReconciliationTriggers trigger) {
         final ReconciliationTask task = new ConnectionReconciliationTask(
                 reconciliationManager,
                 this,
@@ -624,7 +625,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
                 }
                 Futures.addCallback(readNodeFuture, new FutureCallback<Optional<Node>>() {
                     @Override
-                    public void onSuccess(Optional<Node> node) {
+                    public void onSuccess(final Optional<Node> node) {
                         if (node.isPresent()) {
                             LOG.info("Disconnected/Failed connection {} was controller initiated, attempting "
                                     + "reconnection", ovsdbNode.getConnectionInfo());
@@ -637,7 +638,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
                     }
 
                     @Override
-                    public void onFailure(Throwable throwable) {
+                    public void onFailure(final Throwable throwable) {
                         LOG.warn("Read Config/DS for Node failed! {}", iid, throwable);
                     }
                 }, MoreExecutors.directExecutor());
@@ -660,7 +661,8 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         private final OvsdbConnectionManager cm;
         private final EntityOwnershipListenerRegistration listenerRegistration;
 
-        OvsdbDeviceEntityOwnershipListener(OvsdbConnectionManager cm, EntityOwnershipService entityOwnershipService) {
+        OvsdbDeviceEntityOwnershipListener(final OvsdbConnectionManager cm,
+                final EntityOwnershipService entityOwnershipService) {
             this.cm = cm;
             listenerRegistration = entityOwnershipService.registerListener(ENTITY_TYPE, this);
         }
@@ -670,7 +672,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
 
         @Override
-        public void ownershipChanged(EntityOwnershipChange ownershipChange) {
+        public void ownershipChanged(final EntityOwnershipChange ownershipChange) {
             cm.handleOwnershipChanged(ownershipChange);
         }
     }