Convert itm-impl to use mdsal-binding-util

[genius.git] / itm / itm-impl / src / main / java / org / opendaylight / genius / itm / confighelpers / OvsdbTepRemoveWorker.java

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java
index f3c04cb43ecb6845a907538e949563bbe9dd01c8..0d0a62c903db2d74b0fd0b862eba886c5ac132ee 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/confighelpers/OvsdbTepRemoveWorker.java
@@ -8,15 +8,15 @@
 package org.opendaylight.genius.itm.confighelpers;
 
 import com.google.common.util.concurrent.ListenableFuture;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Callable;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunner;
+import org.opendaylight.mdsal.binding.util.ManagedNewTransactionRunnerImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OvsdbTepRemoveWorker implements Callable<List<ListenableFuture<Void>>> {
+public class OvsdbTepRemoveWorker implements Callable<List<? extends ListenableFuture<?>>> {
 
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbTepRemoveWorker.class) ;
 
@@ -24,25 +24,22 @@ public class OvsdbTepRemoveWorker implements Callable<List<ListenableFuture<Void
     private final String strDpid;
     private final String tzName;
     private final DataBroker dataBroker;
+    private final ManagedNewTransactionRunner txRunner;
 
     public OvsdbTepRemoveWorker(String tepIp, String strDpid, String tzName, DataBroker broker) {
         this.tepIp = tepIp;
         this.strDpid = strDpid;
         this.tzName = tzName;
-        this.dataBroker = broker ;
+        this.dataBroker = broker;
+        this.txRunner = new ManagedNewTransactionRunnerImpl(dataBroker);
     }
 
     @Override
-    public List<ListenableFuture<Void>> call() throws Exception {
-        List<ListenableFuture<Void>> futures = new ArrayList<>();
-        WriteTransaction wrTx = dataBroker.newWriteOnlyTransaction();
+    public List<? extends ListenableFuture<?>> call() throws Exception {
 
         LOG.trace("Remove TEP task is picked from DataStoreJobCoordinator for execution.");
 
         // remove TEP received from southbound OVSDB from ITM config DS.
-        OvsdbTepRemoveConfigHelper.removeTepReceivedFromOvsdb(tepIp, strDpid, tzName, dataBroker, wrTx);
-
-        futures.add(wrTx.submit());
-        return futures;
+        return OvsdbTepRemoveConfigHelper.removeTepReceivedFromOvsdb(tepIp, strDpid, tzName, dataBroker, txRunner);
     }
 }