X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-dom-broker%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fdom%2Fbroker%2Fimpl%2FPingPongTransaction.java;h=fad3c1cd1a9842334441f0ca636c9bad24bd1cb1;hp=fdb80ebcbef49bbaf17aa2981f3c322a6a2d47ab;hb=84d6864d26fddddd92da32fd00d57c7224d4213d;hpb=dcf33df6f7666290340163a0f7c71a63430c827b

diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
index fdb80ebcbe..fad3c1cd1a 100644
--- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
+++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/PingPongTransaction.java
@@ -7,36 +7,28 @@
  */
 package org.opendaylight.controller.md.sal.dom.broker.impl;
 
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
 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.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.common.impl.service.AbstractDataTransaction;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataReadWriteTransaction;
-import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.mdsal.common.api.CommitInfo;
 
 /**
  * Transaction context. Tracks the relationship with the backend transaction.
  * We never leak this class to the user and have it implement the {@link FutureCallback}
  * interface so we have a simple way of propagating the result.
  */
-final class PingPongTransaction implements FutureCallback<Void> {
-    private final CheckedFuture<Void, TransactionCommitFailedException> submitFuture;
-    private final ListenableFuture<RpcResult<TransactionStatus>> commitFuture;
+final class PingPongTransaction implements FutureCallback<CommitInfo> {
     private final DOMDataReadWriteTransaction delegate;
-    private final SettableFuture<Void> future;
+    private final SettableFuture<CommitInfo> future;
     private DOMDataReadWriteTransaction frontendTransaction;
 
     PingPongTransaction(final DOMDataReadWriteTransaction delegate) {
         this.delegate = Preconditions.checkNotNull(delegate);
         future = SettableFuture.create();
-        submitFuture = new PingPongFuture(future);
-        commitFuture = AbstractDataTransaction.convertToLegacyCommitFuture(submitFuture);
     }
 
     DOMDataReadWriteTransaction getTransaction() {
@@ -47,22 +39,18 @@ final class PingPongTransaction implements FutureCallback<Void> {
         return frontendTransaction;
     }
 
-    CheckedFuture<Void, TransactionCommitFailedException> getSubmitFuture() {
-        return submitFuture;
-    }
-
-    ListenableFuture<RpcResult<TransactionStatus>> getCommitFuture() {
-        return commitFuture;
+    ListenableFuture<CommitInfo> getSubmitFuture() {
+        return future;
     }
 
     @Override
-    public void onSuccess(final Void result) {
+    public void onSuccess(final CommitInfo result) {
         future.set(result);
     }
 
     @Override
-    public void onFailure(final Throwable t) {
-        future.setException(t);
+    public void onFailure(final Throwable throwable) {
+        future.setException(throwable);
     }
 
     void recordFrontendTransaction(final DOMDataReadWriteTransaction tx) {
@@ -73,10 +61,10 @@ final class PingPongTransaction implements FutureCallback<Void> {
 
     @Override
     public String toString() {
-        return addToStringAttributes(Objects.toStringHelper(this)).toString();
+        return addToStringAttributes(MoreObjects.toStringHelper(this)).toString();
     }
 
     protected ToStringHelper addToStringAttributes(final ToStringHelper toStringHelper) {
         return toStringHelper.add("delegate", delegate);
     }
-}
\ No newline at end of file
+}