Migrate off deprecated APIs, to mdsal.binding.api.DataBroker

[unimgr.git] / impl / src / main / java / org / opendaylight / unimgr / mef / nrp / impl / connectivityservice / DeleteConnectivityAction.java

diff --git a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java
index ca112441e0b7d5812b274fc2e1b87cd30964b3db..c12fb3a2aa9fa0ac943f2bdbf236d81bfd1c3a7e 100644 (file)
--- a/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java
+++ b/impl/src/main/java/org/opendaylight/unimgr/mef/nrp/impl/connectivityservice/DeleteConnectivityAction.java
@@ -19,10 +19,8 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Collectors;
 
-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.ReadFailedException;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.unimgr.mef.nrp.api.ActivationDriver;
 import org.opendaylight.unimgr.mef.nrp.api.EndPoint;
 import org.opendaylight.unimgr.mef.nrp.common.NrpDao;
@@ -127,7 +125,7 @@ public class DeleteConnectivityAction implements Callable<RpcResult<DeleteConnec
     }
 
     private void removeConnectivity()
-            throws TransactionCommitFailedException, InterruptedException, ExecutionException {
+            throws InterruptedException, ExecutionException {
 
         ReadWriteTransaction tx = service.getBroker().newReadWriteTransaction();
         NrpDao nrpDao = new NrpDao(tx);
@@ -150,7 +148,7 @@ public class DeleteConnectivityAction implements Callable<RpcResult<DeleteConnec
             Optional<ActivationDriver> driver = Optional.empty();
             try {
                 driver = service.getDriverRepo().getDriver(nrpDao.getActivationDriverId(e.getKey()));
-            } catch (ReadFailedException e1) {
+            } catch (InterruptedException | ExecutionException e1) {
                 LOG.warn("Unable to get activationDriverId for node {}",e.getKey(),e1);
             }
             if (!driver.isPresent()) {