From d97430282ae6a1fc03a3e8e80db8666c29dd8284 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 1 Dec 2019 12:30:18 +0100 Subject: [PATCH] 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 (cherry picked from commit fa1a9e6b5f2f67d1bb30b2313e83ab49f1fb60f8) --- .../HwvtepConnectionManager.java | 4 +- .../md/HwvtepPhysicalPortUpdateCommand.java | 61 +++++++-------- .../ovsdb/lib/OvsdbConnectionListener.java | 4 +- .../southbound/OvsdbConnectionManager.java | 78 ++++++++++--------- 4 files changed, 75 insertions(+), 72 deletions(-) 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 15135a722..35d3a5004 100644 --- 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>() { @Override - public void onSuccess(@NonNull final Optional node) { + public void onSuccess(final Optional 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 3919932e5..df6240737 100644 --- 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 switchUpdatedRows; private final Set 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 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 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>() { @Override - public void onSuccess(@NonNull Optional optionalConfigTp) { + public void onSuccess(final Optional 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 void deleteEntries(ReadWriteTransaction transaction, - List> entryIids) { + private static void deleteEntries(final ReadWriteTransaction transaction, + final List> entryIids) { for (InstanceIdentifier entryIid : entryIids) { transaction.delete(LogicalDatastoreType.OPERATIONAL, entryIid); } } - private InstanceIdentifier getInstanceIdentifier(InstanceIdentifier tpPath, - VlanBindings vlanBindings) { + private InstanceIdentifier getInstanceIdentifier(final InstanceIdentifier tpPath, + final VlanBindings vlanBindings) { return HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), tpPath, vlanBindings); } - private InstanceIdentifier getInstanceIdentifier(InstanceIdentifier switchIid, - PhysicalPort port) { + private static InstanceIdentifier getInstanceIdentifier(final InstanceIdentifier 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 vlanBindings = portUpdate.getVlanBindingsColumn().getData(); if (vlanBindings != null && !vlanBindings.isEmpty()) { List 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 switchIid = @@ -288,7 +287,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand return null; } - private Optional> getTerminationPointSwitch(UUID portUUID) { + private Optional> 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> getTerminationPointSwitch(final ReadWriteTransaction transaction, - Node node, String tpName) { + private static Optional> getTerminationPointSwitch(final ReadWriteTransaction transaction, + final Node node, final String tpName) { HwvtepGlobalAugmentation hwvtepNode = node.augmentation(HwvtepGlobalAugmentation.class); List 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 portFaultStatusLst = new ArrayList<>(); @@ -337,7 +336,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand } private List> getPortFaultStatusToRemove( - InstanceIdentifier tpPath, PhysicalPort port) { + final InstanceIdentifier tpPath, final PhysicalPort port) { Preconditions.checkNotNull(tpPath); Preconditions.checkNotNull(port); List> result = new ArrayList<>(); @@ -358,8 +357,8 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand private Optional> getFromDeviceOperCache(final UUID uuid) { InstanceIdentifier terminationPointIid = - (InstanceIdentifier)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 137aa9694..63aa7c1bb 100644 --- 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 f6c963aa5..b512ce250 100644 --- 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 @@ -86,10 +86,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; @@ -100,7 +100,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(), @@ -155,7 +155,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(), @@ -208,7 +208,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); @@ -216,8 +216,8 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos }); } - public OvsdbClient connect(InstanceIdentifier iid, - OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException, ConnectException { + public OvsdbClient connect(final InstanceIdentifier iid, + final OvsdbNodeAugmentation ovsdbNode) throws UnknownHostException, ConnectException { LOG.info("Connecting to {}", SouthboundUtil.connectionInfoToString(ovsdbNode.getConnectionInfo())); // TODO handle case where we already have a connection @@ -241,7 +241,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) { @@ -284,38 +284,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 iid) { + void putInstanceIdentifier(final ConnectionInfo key, final InstanceIdentifier 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 getInstanceIdentifier(ConnectionInfo key) { + public InstanceIdentifier 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 optional = SouthboundUtil.getManagingNode(db, mn); if (optional.isPresent()) { return getConnectionInstance(optional.get().getConnectionInfo()); @@ -324,7 +324,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); @@ -338,7 +338,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos } } - public OvsdbConnectionInstance getConnectionInstance(InstanceIdentifier nodePath) { + public OvsdbConnectionInstance getConnectionInstance(final InstanceIdentifier nodePath) { if (nodeIdVsConnectionInstance.get(nodePath) != null) { return nodeIdVsConnectionInstance.get(nodePath); } @@ -360,7 +360,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(); @@ -368,15 +368,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; @@ -384,13 +384,14 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos return ovsdbConnectionInstance.getHasDeviceOwnership(); } - public void reconcileConnection(InstanceIdentifier iid, OvsdbNodeAugmentation ovsdbNode) { + public void reconcileConnection(final InstanceIdentifier 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, @@ -399,14 +400,14 @@ 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); reconciliationManager.cancelTerminationPointReconciliation(); } - 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() @@ -469,7 +470,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 @@ -499,7 +500,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 { @@ -535,7 +536,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos return openVSwitchRow; } - private Entity getEntityFromConnectionInstance(@NonNull OvsdbConnectionInstance ovsdbConnectionInstance) { + private Entity getEntityFromConnectionInstance(@NonNull final OvsdbConnectionInstance ovsdbConnectionInstance) { InstanceIdentifier iid = ovsdbConnectionInstance.getInstanceIdentifier(); if (iid == null) { /* Switch initiated connection won't have iid, till it gets OpenVSwitch @@ -554,11 +555,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); @@ -594,13 +595,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 iid, final OvsdbNodeAugmentation ovsdbNode, - ConnectionReconciliationTriggers trigger) { + final ConnectionReconciliationTriggers trigger) { final ReconciliationTask task = new ConnectionReconciliationTask( reconciliationManager, this, @@ -621,7 +622,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos } Futures.addCallback(readNodeFuture, new FutureCallback>() { @Override - public void onSuccess(@NonNull Optional node) { + public void onSuccess(final Optional node) { if (node.isPresent()) { LOG.info("Disconnected/Failed connection {} was controller initiated, attempting " + "reconnection", ovsdbNode.getConnectionInfo()); @@ -634,7 +635,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()); @@ -657,7 +658,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); } @@ -667,7 +669,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos } @Override - public void ownershipChanged(EntityOwnershipChange ownershipChange) { + public void ownershipChanged(final EntityOwnershipChange ownershipChange) { cm.handleOwnershipChanged(ownershipChange); } } -- 2.36.6