Fixup Augmentable and Identifiable methods changing

[openflowplugin.git] / applications / southbound-cli / src / main / java / org / opendaylight / openflowplugin / applications / southboundcli / AdminReconciliationServiceImpl.java

diff --git a/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/AdminReconciliationServiceImpl.java b/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/AdminReconciliationServiceImpl.java
index 932a9d71858217e1961b2629284ba24ee437953b..d381c396084280fb0a38dd4597fc74eb7e9dddfa 100644 (file)
--- a/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/AdminReconciliationServiceImpl.java
+++ b/applications/southbound-cli/src/main/java/org/opendaylight/openflowplugin/applications/southboundcli/AdminReconciliationServiceImpl.java
@@ -22,7 +22,6 @@ import java.util.stream.Collectors;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
 import org.opendaylight.openflowplugin.applications.southboundcli.alarm.AlarmAgent;
 import org.opendaylight.openflowplugin.applications.southboundcli.util.OFNode;
 import org.opendaylight.openflowplugin.applications.southboundcli.util.ShellUtil;
@@ -142,7 +141,7 @@ public class AdminReconciliationServiceImpl implements AdminReconciliationServic
         ReadWriteTransaction tx = broker.newReadWriteTransaction();
         Optional<ReconcileCounter> optional = readReconcileCounterFromDS(tx, instanceIdentifier, nodeId);
         ReconcileCounterBuilder counterBuilder = new ReconcileCounterBuilder()
-                .setKey(new ReconcileCounterKey(nodeId)).setNodeId(nodeId)
+                .withKey(new ReconcileCounterKey(nodeId)).setNodeId(nodeId)
                 .setLastRequestTime(LocalDateTime.now().toString());
         if (reconcileState) {
             counterBuilder.setSuccessCount(startCount);
@@ -163,8 +162,8 @@ public class AdminReconciliationServiceImpl implements AdminReconciliationServic
         }
         try {
             tx.merge(LogicalDatastoreType.OPERATIONAL, instanceIdentifier, counterBuilder.build(), true);
-            tx.submit().checkedGet();
-        } catch (TransactionCommitFailedException e) {
+            tx.submit().get();
+        } catch (InterruptedException | ExecutionException e) {
             LOG.error("Exception while submitting counter {}", nodeId, e);
         }
     }