X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FCreateTransaction.java;h=3d831a568c849a2c89542a5c8f155873f2ff400f;hp=21f16e7bfeef07bf1c64ec97baa33b683420a216;hb=24c074a4b32ac97980a652b78824b7c2f97ffb78;hpb=bea73749199179ffc19184c717dd4c585185ccb7

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 21f16e7bfe..3d831a568c 100644
--- 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,35 +8,27 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
-
 import com.google.common.base.Preconditions;
-import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
-
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
 
-public class CreateTransaction implements SerializableMessage {
-    public static final Class<ShardTransactionMessages.CreateTransaction> SERIALIZABLE_CLASS =
-            ShardTransactionMessages.CreateTransaction.class;
+public class CreateTransaction extends VersionedExternalizableMessage {
+    private static final long serialVersionUID = 1L;
 
-    private final String transactionId;
-    private final int transactionType;
-    private final String transactionChainId;
-    private final short version;
-
-    public CreateTransaction(String transactionId, int transactionType) {
-        this(transactionId, transactionType, "");
-    }
+    private String transactionId;
+    private int transactionType;
+    private String transactionChainId;
 
-    public CreateTransaction(String transactionId, int transactionType, String transactionChainId) {
-        this(transactionId, transactionType, transactionChainId, DataStoreVersions.CURRENT_VERSION);
+    public CreateTransaction() {
     }
 
-    private CreateTransaction(String transactionId, int transactionType, String transactionChainId,
+    public CreateTransaction(String transactionId, int transactionType, String transactionChainId,
             short version) {
+        super(version);
         this.transactionId = Preconditions.checkNotNull(transactionId);
         this.transactionType = transactionType;
-        this.transactionChainId = transactionChainId;
-        this.version = version;
+        this.transactionChainId = transactionChainId != null ? transactionChainId : "";
     }
 
     public String getTransactionId() {
@@ -47,28 +39,38 @@ public class CreateTransaction implements SerializableMessage {
         return transactionType;
     }
 
-    public short getVersion() {
-        return version;
+    public String getTransactionChainId() {
+        return transactionChainId;
+    }
+
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        super.readExternal(in);
+        transactionId = in.readUTF();
+        transactionType = in.readInt();
+        transactionChainId = in.readUTF();
     }
 
     @Override
-    public Object toSerializable() {
-        return ShardTransactionMessages.CreateTransaction.newBuilder()
-            .setTransactionId(transactionId)
-            .setTransactionType(transactionType)
-            .setTransactionChainId(transactionChainId)
-            .setMessageVersion(version).build();
+    public void writeExternal(ObjectOutput out) throws IOException {
+        super.writeExternal(out);
+        out.writeUTF(transactionId);
+        out.writeInt(transactionType);
+        out.writeUTF(transactionChainId);
+    }
+
+    @Override
+    public String toString() {
+        return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType
+                + ", transactionChainId=" + transactionChainId + "]";
     }
 
     public static CreateTransaction fromSerializable(Object message) {
-        ShardTransactionMessages.CreateTransaction createTransaction =
-            (ShardTransactionMessages.CreateTransaction) message;
-        return new CreateTransaction(createTransaction.getTransactionId(),
-            createTransaction.getTransactionType(), createTransaction.getTransactionChainId(),
-            (short)createTransaction.getMessageVersion());
+        Preconditions.checkArgument(message instanceof CreateTransaction);
+        return (CreateTransaction)message;
     }
 
-    public String getTransactionChainId() {
-        return transactionChainId;
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CreateTransaction;
     }
 }