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=529b7e2153cb63888387b9a86dee36fd85aa3c95;hb=7a38f0591bc527178510d749ae361e317dcc9788;hp=180108f2186b6efbab2977f1d54cf33811a4c638;hpb=26ead80b71a367f8dac348905d440d7e203e0b4f;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 180108f218..529b7e2153 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,13 @@
  */
 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 static java.util.Objects.requireNonNull;
+
+import java.util.Optional;
+import java.util.SortedSet;
+import javax.annotation.Nullable;
+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,33 +21,47 @@ 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;
-
-    public ForwardedReadyTransaction(String transactionID, DOMStoreThreePhaseCommitCohort cohort,
-            Modification modification, boolean returnSerialized) {
-        this.transactionID = transactionID;
-        this.cohort = cohort;
-        this.modification = modification;
-        this.returnSerialized = returnSerialized;
+    private final TransactionIdentifier transactionId;
+    private final ReadWriteShardDataTreeTransaction transaction;
+    private final boolean doImmediateCommit;
+    private final short txnClientVersion;
+    @Nullable
+    private final SortedSet<String> participatingShardNames;
+
+    public ForwardedReadyTransaction(TransactionIdentifier transactionId, short txnClientVersion,
+            ReadWriteShardDataTreeTransaction transaction, boolean doImmediateCommit,
+            Optional<SortedSet<String>> participatingShardNames) {
+        this.transactionId = requireNonNull(transactionId);
+        this.transaction = requireNonNull(transaction);
+        this.txnClientVersion = txnClientVersion;
+        this.doImmediateCommit = doImmediateCommit;
+        this.participatingShardNames = requireNonNull(participatingShardNames).orElse(null);
+    }
+
+    public TransactionIdentifier getTransactionId() {
+        return transactionId;
+    }
 
+    public ReadWriteShardDataTreeTransaction getTransaction() {
+        return transaction;
     }
 
-    public String getTransactionID() {
-        return transactionID;
+    public short getTxnClientVersion() {
+        return txnClientVersion;
     }
 
-    public DOMStoreThreePhaseCommitCohort getCohort() {
-        return cohort;
+    public boolean isDoImmediateCommit() {
+        return doImmediateCommit;
     }
 
-    public Modification getModification() {
-        return modification;
+    public Optional<SortedSet<String>> getParticipatingShardNames() {
+        return Optional.ofNullable(participatingShardNames);
     }
 
-    public boolean isReturnSerialized() {
-        return returnSerialized;
+    @Override
+    public String toString() {
+        return "ForwardedReadyTransaction [transactionId=" + transactionId + ", transaction=" + transaction
+                + ", doImmediateCommit=" + doImmediateCommit + ", participatingShardNames=" + participatingShardNames
+                + ", txnClientVersion=" + txnClientVersion + "]";
     }
 }