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=e8d9b199947eddf70a423dd5073c52f87622a5eb;hb=refs%2Fchanges%2F54%2F57354%2F8;hp=73b33d7fe27b0c4336be0bc79b63c6296cd4b211;hpb=dd16edd5a758f0e51727de511f9868c72b2a1dd0;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 73b33d7fe2..e8d9b19994 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,76 +8,63 @@
 
 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.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);
     }
 
-    @Deprecated
-    @Override
-    protected Object newLegacySerializedInstance() {
-        return ShardTransactionMessages.CreateTransactionReply.newBuilder().setTransactionActorPath(transactionPath)
-                .setTransactionId(transactionId).setMessageVersion(getVersion()).build();
-    }
-
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("CreateTransactionReply [transactionPath=").append(transactionPath).append(", transactionId=")
-                .append(transactionId).append(", version=").append(getVersion()).append("]");
-        return builder.toString();
+        return "CreateTransactionReply [transactionPath=" + transactionPath
+                + ", transactionId=" + transactionId
+                + ", version=" + getVersion() + "]";
     }
 
     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;
     }
 }