Fix logging arguments

[netconf.git] / netconf / sal-netconf-connector / src / main / java / org / opendaylight / netconf / sal / connect / netconf / sal / tx / WriteCandidateTx.java

diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java
index ac24ac8f35acd592e2a855ba671a14b4bc25cda1..1eb47c9775ba9651de88c56556b633f7f3132164 100644 (file)
--- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java
+++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/tx/WriteCandidateTx.java
@@ -8,17 +8,14 @@
 
 package org.opendaylight.netconf.sal.connect.netconf.sal.tx;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.CheckedFuture;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
+import java.util.Optional;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
+import org.opendaylight.mdsal.dom.api.DOMRpcResult;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfBaseOps;
 import org.opendaylight.netconf.sal.connect.netconf.util.NetconfRpcFutureCallback;
 import org.opendaylight.netconf.sal.connect.util.RemoteDeviceId;
@@ -80,7 +77,7 @@ public class WriteCandidateTx extends AbstractWriteTx {
 
             @Override
             public void onFailure(final Throwable throwable) {
-                LOG.warn("Lock candidate operation failed. {}", throwable);
+                LOG.warn("Lock candidate operation failed", throwable);
                 discardChanges();
             }
         };
@@ -93,18 +90,6 @@ public class WriteCandidateTx extends AbstractWriteTx {
         cleanupOnSuccess();
     }
 
-    @Override
-    public synchronized CheckedFuture<Void, TransactionCommitFailedException> submit() {
-        final ListenableFuture<Void> commitFutureAsVoid = Futures.transform(commitConfiguration(), input -> {
-            Preconditions.checkArgument(input.isSuccessful() && input.getErrors().isEmpty(),
-                "Submit failed with errors: %s", input.getErrors());
-            return null;
-        }, MoreExecutors.directExecutor());
-
-        return Futures.makeChecked(commitFutureAsVoid, input -> new TransactionCommitFailedException(
-                "Submit of transaction " + getIdentifier() + " failed", input));
-    }
-
     /**
      * This has to be non blocking since it is called from a callback on commit
      * and its netty threadpool that is really sensitive to blocking calls.