Improve BridgeConfigReconciliationTask type safety

We really want InstanceIdentifier<Node>, make sure we require that
in the constructor.

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

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 19c970fed443e7a2662c5ee3073ce821fe8c2587..6a5c0e527e7a440b30dda0149d12fbb9e92f5a8f 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
@@ -400,7 +400,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         reconciliationManager.dequeue(task);
     }
 
-    public void stopBridgeConfigReconciliationIfActive(final InstanceIdentifier<?> iid) {
+    public void stopBridgeConfigReconciliationIfActive(final InstanceIdentifier<Node> iid) {
         final ReconciliationTask task =
                 new BridgeConfigReconciliationTask(reconciliationManager, this, iid, null, instanceIdentifierCodec);
         reconciliationManager.dequeue(task);

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java
index ec524d0f050dc456fdea47ab344924900f448920..8a518b26d2e9e2405a3b6d4fbd406834de91f99d 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java
@@ -56,20 +56,19 @@ import org.slf4j.LoggerFactory;
  * Created by Vinh Nguyen (vinh.nguyen@hcl.com) on 3/21/16.
  */
 public class BridgeConfigReconciliationTask extends ReconciliationTask {
-
     private static final Logger LOG = LoggerFactory.getLogger(BridgeConfigReconciliationTask.class);
+
     private final OvsdbConnectionInstance connectionInstance;
     private final InstanceIdentifierCodec instanceIdentifierCodec;
 
     public BridgeConfigReconciliationTask(final ReconciliationManager reconciliationManager,
-            final OvsdbConnectionManager connectionManager, final InstanceIdentifier<?> nodeIid,
+            final OvsdbConnectionManager connectionManager, final InstanceIdentifier<Node> nodeIid,
             final OvsdbConnectionInstance connectionInstance, final InstanceIdentifierCodec instanceIdentifierCodec) {
         super(reconciliationManager, connectionManager, nodeIid, null);
         this.connectionInstance = connectionInstance;
         this.instanceIdentifierCodec = instanceIdentifierCodec;
     }
 
-
     @Override
     public boolean reconcileConfiguration(final OvsdbConnectionManager connectionManagerOfDevice) {
 
@@ -212,7 +211,7 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask {
         return true;
     }
 
-    private Map<InstanceIdentifier<?>, DataObject> extractBridgeConfigurationChanges(
+    private static Map<InstanceIdentifier<?>, DataObject> extractBridgeConfigurationChanges(
             final Node bridgeNode, final OvsdbBridgeAugmentation ovsdbBridge) {
         Map<InstanceIdentifier<?>, DataObject> changes = new HashMap<>();
         final InstanceIdentifier<Node> bridgeNodeIid =
@@ -290,7 +289,7 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask {
         return 0;
     }
 
-    private List<String> getNodeIdForBridges(final String nodeIdVal, final List<String> bridgeList) {
+    private static List<String> getNodeIdForBridges(final String nodeIdVal, final List<String> bridgeList) {
         List<String> nodeIdBridgeList = new ArrayList<>();
         for (String bridge : bridgeList) {
             String bridgeNodeIid = new StringBuilder().append(nodeIdVal)