Migrate netconf to MD-SAL APIs

[netconf.git] / netconf / netconf-topology-singleton / src / main / java / org / opendaylight / netconf / topology / singleton / impl / tx / FailedProxyTransactionFacade.java

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/FailedProxyTransactionFacade.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/FailedProxyTransactionFacade.java
index 21e9a096f9218e939a8e7aadc85dcea0be9ddcfd..d1bce43e5d885e811e4906d16bec4d8f201bf05e 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/FailedProxyTransactionFacade.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/impl/tx/FailedProxyTransactionFacade.java
@@ -7,18 +7,16 @@
  */
 package org.opendaylight.netconf.topology.singleton.impl.tx;
 
-import com.google.common.base.Optional;
-import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FluentFuture;
-import com.google.common.util.concurrent.Futures;
 import java.util.Objects;
+import java.util.Optional;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncWriteTransaction;
-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.common.api.CommitInfo;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.common.api.ReadFailedException;
+import org.opendaylight.mdsal.common.api.TransactionCommitFailedException;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.slf4j.Logger;
@@ -51,18 +49,23 @@ class FailedProxyTransactionFacade implements ProxyTransactionFacade {
     }
 
     @Override
-    public CheckedFuture<Optional<NormalizedNode<?, ?>>, ReadFailedException> read(final LogicalDatastoreType store,
+    public void close() {
+        // No-op
+    }
+
+    @Override
+    public FluentFuture<Optional<NormalizedNode<?, ?>>> read(final LogicalDatastoreType store,
             final YangInstanceIdentifier path) {
         LOG.debug("{}: Read {} {} - failure", id, store, path, failure);
-        return Futures.immediateFailedCheckedFuture(ReadFailedException.MAPPER.apply(
+        return FluentFutures.immediateFailedFluentFuture(ReadFailedException.MAPPER.apply(
                 failure instanceof Exception ? (Exception)failure : new ReadFailedException("read", failure)));
     }
 
     @Override
-    public CheckedFuture<Boolean, ReadFailedException> exists(final LogicalDatastoreType store,
+    public FluentFuture<Boolean> exists(final LogicalDatastoreType store,
             final YangInstanceIdentifier path) {
         LOG.debug("{}: Exists {} {} - failure", id, store, path, failure);
-        return Futures.immediateFailedCheckedFuture(ReadFailedException.MAPPER.apply(
+        return FluentFutures.immediateFailedFluentFuture(ReadFailedException.MAPPER.apply(
                 failure instanceof Exception ? (Exception)failure : new ReadFailedException("read", failure)));
     }
 
@@ -86,8 +89,12 @@ class FailedProxyTransactionFacade implements ProxyTransactionFacade {
     @Override
     public @NonNull FluentFuture<? extends @NonNull CommitInfo> commit() {
         LOG.debug("{}: Commit - failure", id, failure);
-        return FluentFuture.from(Futures.immediateFailedFuture(failure instanceof Exception
-                ? AsyncWriteTransaction.SUBMIT_EXCEPTION_MAPPER.apply((Exception)failure)
-                        : new TransactionCommitFailedException("commit", failure)));
+        final TransactionCommitFailedException txCommitEx;
+        if (failure instanceof TransactionCommitFailedException) {
+            txCommitEx = (TransactionCommitFailedException) failure;
+        } else {
+            txCommitEx = new TransactionCommitFailedException("commit", failure);
+        }
+        return FluentFutures.immediateFailedFluentFuture(txCommitEx);
     }
 }