X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FForwardedReadyTransaction.java;h=08784d11396f8802c07f13bcde8369c681880fd5;hb=50a2f5eb1c94650bc1be1e49d3a5382a1a74a9b3;hp=cdd7859a3019d1dded7d53ae84e8b39d6acfa717;hpb=c6c9b43923bbe8bc6d586ce09649324949e6b092;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java
index cdd7859a30..08784d1139 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/ForwardedReadyTransaction.java
@@ -7,8 +7,9 @@
  */
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import org.opendaylight.controller.cluster.datastore.modification.Modification;
-import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort;
+import com.google.common.base.Preconditions;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
+import org.opendaylight.controller.cluster.datastore.ReadWriteShardDataTreeTransaction;
 
 /**
  * Transaction ReadyTransaction message that is forwarded to the local Shard from the ShardTransaction.
@@ -16,38 +17,25 @@ import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCoh
  * @author Thomas Pantelis
  */
 public class ForwardedReadyTransaction {
-    private final String transactionID;
-    private final DOMStoreThreePhaseCommitCohort cohort;
-    private final Modification modification;
-    private final boolean returnSerialized;
+    private final TransactionIdentifier transactionID;
+    private final ReadWriteShardDataTreeTransaction transaction;
     private final boolean doImmediateCommit;
     private final short txnClientVersion;
 
-    public ForwardedReadyTransaction(String transactionID, short txnClientVersion,
-            DOMStoreThreePhaseCommitCohort cohort, Modification modification,
-            boolean returnSerialized, boolean doImmediateCommit) {
-        this.transactionID = transactionID;
-        this.cohort = cohort;
-        this.modification = modification;
-        this.returnSerialized = returnSerialized;
+    public ForwardedReadyTransaction(TransactionIdentifier transactionID, short txnClientVersion,
+            ReadWriteShardDataTreeTransaction transaction, boolean doImmediateCommit) {
+        this.transactionID = Preconditions.checkNotNull(transactionID);
+        this.transaction = Preconditions.checkNotNull(transaction);
         this.txnClientVersion = txnClientVersion;
         this.doImmediateCommit = doImmediateCommit;
     }
 
-    public String getTransactionID() {
+    public TransactionIdentifier getTransactionID() {
         return transactionID;
     }
 
-    public DOMStoreThreePhaseCommitCohort getCohort() {
-        return cohort;
-    }
-
-    public Modification getModification() {
-        return modification;
-    }
-
-    public boolean isReturnSerialized() {
-        return returnSerialized;
+    public ReadWriteShardDataTreeTransaction getTransaction() {
+        return transaction;
     }
 
     public short getTxnClientVersion() {
@@ -57,4 +45,10 @@ public class ForwardedReadyTransaction {
     public boolean isDoImmediateCommit() {
         return doImmediateCommit;
     }
+
+    @Override
+    public String toString() {
+        return "ForwardedReadyTransaction [transactionID=" + transactionID + ", doImmediateCommit=" + doImmediateCommit
+                + ", txnClientVersion=" + txnClientVersion + "]";
+    }
 }