Remove deprecated CheckedFuture

Remove deprecated CheckedFuture.

Change-Id: Ide74b976dcf4868f7dc9b4734e1cc468dac0ee37
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
index 1a54ad91204ee094a7bde33491e7d66465f1e533..3639f264bffdb40475941f5036f0e1187df24e7c 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/InterfacemgrProvider.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.genius.interfacemanager;
 
-import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -27,7 +26,6 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
 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.genius.datastoreutils.DataStoreJobCoordinator;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.genius.interfacemanager.commons.InterfaceManagerCommonUtils;
@@ -356,9 +354,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
 
     @Override
     public Interface getInterfaceInfoFromConfigDataStore(String interfaceName) {
-        Interface intf = InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(interfaceName),
-                dataBroker);
-        return intf;
+        return InterfaceManagerCommonUtils.getInterfaceFromConfigDS(new InterfaceKey(interfaceName), dataBroker);
     }
 
     @Override
@@ -705,10 +701,7 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
             }
             WriteTransaction writeTransaction = dataBroker.newWriteOnlyTransaction();
             IfmUtil.updateInterfaceParentRef(writeTransaction, interfaceName, parentInterfaceName);
-            CheckedFuture<Void, TransactionCommitFailedException> submitFuture = writeTransaction.submit();
-            List<ListenableFuture<Void>> futures = new ArrayList<>();
-            futures.add(submitFuture);
-            return futures;
+            return Collections.singletonList(writeTransaction.submit());
         }
     }
 
@@ -801,7 +794,6 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
                 }
             }
         }
-
         return portMap;
     }
 
@@ -809,5 +801,4 @@ public class InterfacemgrProvider implements AutoCloseable, IInterfaceManager {
     public long getLogicalTunnelSelectGroupId(int lportTag) {
         return IfmUtil.getLogicalTunnelSelectGroupId(lportTag);
     }
-
 }