Improve ConnectionReconciliationTask type safety

We require InstanceIdentifier<Node> and OvsdbNodeAugmentation
config data, make sure to reflect that in the API.

JIRA: OVSDB-413
Change-Id: I8d6a86cf455e3ff05f0851def22d6520adabf5d2
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 6a5c0e527e7a440b30dda0149d12fbb9e92f5a8f..424cc6315e7a8d2016ea3a1700cbdc9e3c4090f2 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
@@ -390,7 +390,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
 
     }
 
-    public void stopConnectionReconciliationIfActive(final InstanceIdentifier<?> iid,
+    public void stopConnectionReconciliationIfActive(final InstanceIdentifier<Node> iid,
             final OvsdbNodeAugmentation ovsdbNode) {
         final ReconciliationTask task = new ConnectionReconciliationTask(
                 reconciliationManager,

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/connection/ConnectionReconciliationTask.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/connection/ConnectionReconciliationTask.java
index 3d8f98447d1aa4ace4b84a002bc34fef8ee33889..d2c364fa7228951f6cc316d940d0eca8b02a7a2f 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/connection/ConnectionReconciliationTask.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/connection/ConnectionReconciliationTask.java
@@ -16,7 +16,6 @@ import org.opendaylight.ovsdb.southbound.reconciliation.ReconciliationManager;
 import org.opendaylight.ovsdb.southbound.reconciliation.ReconciliationTask;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
 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;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -30,14 +29,14 @@ public class ConnectionReconciliationTask extends ReconciliationTask {
 
     private final AtomicInteger connectionAttempt = new AtomicInteger(0);
 
-    public ConnectionReconciliationTask(ReconciliationManager reconciliationManager, OvsdbConnectionManager
-            connectionManager, InstanceIdentifier<?> nodeIid, DataObject configData) {
+    public ConnectionReconciliationTask(final ReconciliationManager reconciliationManager,
+            final OvsdbConnectionManager connectionManager, final InstanceIdentifier<Node> nodeIid,
+            final OvsdbNodeAugmentation configData) {
         super(reconciliationManager, connectionManager, nodeIid, configData);
-
     }
 
     @Override
-    public boolean reconcileConfiguration(OvsdbConnectionManager connectionManagerOfDevice) {
+    public boolean reconcileConfiguration(final OvsdbConnectionManager connectionManagerOfDevice) {
         boolean result = false;
         connectionAttempt.incrementAndGet();
         InstanceIdentifier<Node> ndIid = (InstanceIdentifier<Node>) nodeIid;
@@ -61,7 +60,7 @@ public class ConnectionReconciliationTask extends ReconciliationTask {
     }
 
     @Override
-    public void doRetry(boolean wasLastAttemptSuccessful) {
+    public void doRetry(final boolean wasLastAttemptSuccessful) {
 
         if (!wasLastAttemptSuccessful && connectionAttempt.get() <= MAX_ATTEMPT) {
             reconciliationManager.enqueueForRetry(ConnectionReconciliationTask.this);