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%2FCreateTransaction.java;h=3283a55f438a77644fe35ad403436a2bfdac58f2;hb=ccca30bbb1545643c427fc59c23329c5d49f8d4b;hp=bad7cfad91341f8f4e675ff07c940e09c0b5d901;hpb=dd16edd5a758f0e51727de511f9868c72b2a1dd0;p=controller.git

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 bad7cfad91..3283a55f43 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
@@ -5,34 +5,33 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import com.google.common.base.Preconditions;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
+
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 
 public class CreateTransaction extends VersionedExternalizableMessage {
     private static final long serialVersionUID = 1L;
 
-    private String transactionId;
+    private TransactionIdentifier transactionId;
     private int transactionType;
-    private String transactionChainId;
 
     public CreateTransaction() {
     }
 
-    public CreateTransaction(String transactionId, int transactionType, String transactionChainId,
-            short version) {
+    public CreateTransaction(final TransactionIdentifier transactionId, final int transactionType,
+            final short version) {
         super(version);
-        this.transactionId = Preconditions.checkNotNull(transactionId);
+        this.transactionId = requireNonNull(transactionId);
         this.transactionType = transactionType;
-        this.transactionChainId = transactionChainId != null ? transactionChainId : "";
     }
 
-    public String getTransactionId() {
+    public TransactionIdentifier getTransactionId() {
         return transactionId;
     }
 
@@ -40,53 +39,31 @@ public class CreateTransaction extends VersionedExternalizableMessage {
         return transactionType;
     }
 
-    public String getTransactionChainId() {
-        return transactionChainId;
-    }
-
     @Override
-    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+    public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);
-        transactionId = in.readUTF();
+        transactionId = TransactionIdentifier.readFrom(in);
         transactionType = in.readInt();
-        transactionChainId = in.readUTF();
     }
 
     @Override
-    public void writeExternal(ObjectOutput out) throws IOException {
+    public void writeExternal(final ObjectOutput out) throws IOException {
         super.writeExternal(out);
-        out.writeUTF(transactionId);
+        transactionId.writeTo(out);
         out.writeInt(transactionType);
-        out.writeUTF(transactionChainId);
-    }
-
-    @Deprecated
-    @Override
-    protected Object newLegacySerializedInstance() {
-        return ShardTransactionMessages.CreateTransaction.newBuilder().setTransactionId(transactionId)
-                .setTransactionType(transactionType).setTransactionChainId(transactionChainId)
-                .setMessageVersion(getVersion()).build();
     }
 
     @Override
     public String toString() {
-        return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType
-                + ", transactionChainId=" + transactionChainId + "]";
+        return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType + "]";
     }
 
-    public static CreateTransaction fromSerializable(Object message) {
-        if(message instanceof CreateTransaction) {
-            return (CreateTransaction)message;
-        } else {
-            ShardTransactionMessages.CreateTransaction createTransaction =
-                    (ShardTransactionMessages.CreateTransaction) message;
-            return new CreateTransaction(createTransaction.getTransactionId(),
-                    createTransaction.getTransactionType(), createTransaction.getTransactionChainId(),
-                    (short)createTransaction.getMessageVersion());
-        }
+    public static CreateTransaction fromSerializable(final Object message) {
+        checkArgument(message instanceof CreateTransaction);
+        return (CreateTransaction)message;
     }
 
-    public static boolean isSerializedType(Object message) {
-        return message instanceof CreateTransaction || message instanceof ShardTransactionMessages.CreateTransaction;
+    public static boolean isSerializedType(final Object message) {
+        return message instanceof CreateTransaction;
     }
 }