BUG 1712 - Distributed DataStore does not work properly with Transaction Chains

[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 611064169655185fe0423bfc879b751d625a538b..361d406ac80dda74fe33950ace971ece600b3d7a 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
@@ -8,15 +8,53 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
-public class CreateTransaction {
+
+import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
+
+
+public class CreateTransaction implements SerializableMessage {
+    public static final Class SERIALIZABLE_CLASS = ShardTransactionMessages.CreateTransaction.class;
     private final String transactionId;
+    private final int transactionType;
+    private final String transactionChainId;
+
+    public CreateTransaction(String transactionId, int transactionType) {
+        this(transactionId, transactionType, "");
+    }
 
-    public CreateTransaction(String transactionId){
+    public CreateTransaction(String transactionId, int transactionType, String transactionChainId) {
 
         this.transactionId = transactionId;
+        this.transactionType = transactionType;
+        this.transactionChainId = transactionChainId;
+
     }
 
+
     public String getTransactionId() {
         return transactionId;
     }
+
+    public int getTransactionType() {
+        return transactionType;
+    }
+
+    @Override
+    public Object toSerializable() {
+        return ShardTransactionMessages.CreateTransaction.newBuilder()
+            .setTransactionId(transactionId)
+            .setTransactionType(transactionType)
+            .setTransactionChainId(transactionChainId).build();
+    }
+
+    public static CreateTransaction fromSerializable(Object message) {
+        ShardTransactionMessages.CreateTransaction createTransaction =
+            (ShardTransactionMessages.CreateTransaction) message;
+        return new CreateTransaction(createTransaction.getTransactionId(),
+            createTransaction.getTransactionType(), createTransaction.getTransactionChainId());
+    }
+
+    public String getTransactionChainId() {
+        return transactionChainId;
+    }
 }