Merge "Fix for Bug 2290."

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / messages / CreateTransaction.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java
index b27ad86be987097b9bb9c37713a50116bfa5116e..bf82e660369c8d4f89e5cf48b22f6555f89bb65e 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java
@@ -13,30 +13,63 @@ import org.opendaylight.controller.protobuff.messages.transaction.ShardTransacti
 
 
 public class CreateTransaction implements SerializableMessage {
-  public static Class SERIALIZABLE_CLASS = ShardTransactionMessages.CreateTransaction.class;
-  private final String transactionId;
-  private final int transactionType;
+    public static final Class<ShardTransactionMessages.CreateTransaction> SERIALIZABLE_CLASS =
+            ShardTransactionMessages.CreateTransaction.class;
 
-  public CreateTransaction(String transactionId, int transactionType){
+    public static final int HELIUM_1_VERSION = 1;
+    public static final int CURRENT_VERSION = HELIUM_1_VERSION;
 
-    this.transactionId = transactionId;
-    this.transactionType = transactionType;
-  }
+    private final String transactionId;
+    private final int transactionType;
+    private final String transactionChainId;
+    private final int version;
 
-  public String getTransactionId() {
-    return transactionId;
-  }
+    public CreateTransaction(String transactionId, int transactionType) {
+        this(transactionId, transactionType, "");
+    }
 
-  public int getTransactionType() { return transactionType;}
+    public CreateTransaction(String transactionId, int transactionType, String transactionChainId) {
+        this(transactionId, transactionType, transactionChainId, CURRENT_VERSION);
+    }
 
-  @Override
-  public Object toSerializable() {
-    return  ShardTransactionMessages.CreateTransaction.newBuilder().setTransactionId(transactionId).setTransactionType(transactionType).build();
-  }
+    private CreateTransaction(String transactionId, int transactionType, String transactionChainId,
+            int version) {
+        this.transactionId = transactionId;
+        this.transactionType = transactionType;
+        this.transactionChainId = transactionChainId;
+        this.version = version;
+    }
 
-  public static CreateTransaction fromSerializable(Object message){
-    ShardTransactionMessages.CreateTransaction createTransaction = (ShardTransactionMessages.CreateTransaction)message;
-    return new CreateTransaction(createTransaction.getTransactionId(),createTransaction.getTransactionType() );
-  }
+    public String getTransactionId() {
+        return transactionId;
+    }
 
+    public int getTransactionType() {
+        return transactionType;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    @Override
+    public Object toSerializable() {
+        return ShardTransactionMessages.CreateTransaction.newBuilder()
+            .setTransactionId(transactionId)
+            .setTransactionType(transactionType)
+            .setTransactionChainId(transactionChainId)
+            .setMessageVersion(version).build();
+    }
+
+    public static CreateTransaction fromSerializable(Object message) {
+        ShardTransactionMessages.CreateTransaction createTransaction =
+            (ShardTransactionMessages.CreateTransaction) message;
+        return new CreateTransaction(createTransaction.getTransactionId(),
+            createTransaction.getTransactionType(), createTransaction.getTransactionChainId(),
+            createTransaction.getMessageVersion());
+    }
+
+    public String getTransactionChainId() {
+        return transactionChainId;
+    }
 }