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%2FCreateTransactionReply.java;h=5bc0c74a2f9bb425664c66841ad79f74bbdb0b4c;hb=50a2f5eb1c94650bc1be1e49d3a5382a1a74a9b3;hp=ec38f749e9657e5c1e633022a7a32ffba08a31e1;hpb=3e80db38f7f579505173c29c42f800983d7ca6c1;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java
index ec38f749e9..5bc0c74a2f 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransactionReply.java
@@ -8,59 +8,50 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
+import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 
 public class CreateTransactionReply extends VersionedExternalizableMessage {
     private static final long serialVersionUID = 1L;
 
     private String transactionPath;
-    private String transactionId;
+    private TransactionIdentifier transactionId;
 
     public CreateTransactionReply() {
     }
 
-    public CreateTransactionReply(final String transactionPath, final String transactionId, final short version) {
+    public CreateTransactionReply(final String transactionPath, final TransactionIdentifier transactionId,
+            final short version) {
         super(version);
-        this.transactionPath = transactionPath;
-        this.transactionId = transactionId;
+        this.transactionPath = Preconditions.checkNotNull(transactionPath);
+        this.transactionId = Preconditions.checkNotNull(transactionId);
     }
 
     public String getTransactionPath() {
         return transactionPath;
     }
 
-    public String getTransactionId() {
+    public TransactionIdentifier getTransactionId() {
         return transactionId;
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);
-        transactionId = in.readUTF();
+        transactionId = TransactionIdentifier.readFrom(in);
         transactionPath = in.readUTF();
     }
 
     @Override
     public void writeExternal(ObjectOutput out) throws IOException {
         super.writeExternal(out);
-        out.writeUTF(transactionId);
+        transactionId.writeTo(out);
         out.writeUTF(transactionPath);
     }
 
-    @Override
-    public Object toSerializable() {
-        if(getVersion() >= DataStoreVersions.BORON_VERSION) {
-            return this;
-        } else {
-            return ShardTransactionMessages.CreateTransactionReply.newBuilder().setTransactionActorPath(transactionPath)
-                    .setTransactionId(transactionId).setMessageVersion(getVersion()).build();
-        }
-    }
-
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
@@ -70,18 +61,11 @@ public class CreateTransactionReply extends VersionedExternalizableMessage {
     }
 
     public static CreateTransactionReply fromSerializable(Object serializable) {
-        if(serializable instanceof CreateTransactionReply) {
-            return (CreateTransactionReply)serializable;
-        } else {
-            ShardTransactionMessages.CreateTransactionReply o =
-                    (ShardTransactionMessages.CreateTransactionReply) serializable;
-            return new CreateTransactionReply(o.getTransactionActorPath(), o.getTransactionId(),
-                    (short)o.getMessageVersion());
-        }
+        Preconditions.checkNotNull(serializable instanceof CreateTransactionReply);
+        return (CreateTransactionReply)serializable;
     }
 
     public static boolean isSerializedType(Object message) {
-        return message instanceof CreateTransactionReply ||
-                message instanceof ShardTransactionMessages.CreateTransactionReply;
+        return message instanceof CreateTransactionReply;
     }
 }