Fix illegal check in CreateTransactionReply

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / messages / CreateTransactionReply.java

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 83e68c9cb41882c2b7c377f96aaecb5f5a07f328..87dd7c57fb5d8c64cea1d950bc75ec976ab989ab 100644 (file)
--- 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
@@ -5,56 +5,67 @@
  * 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 org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.Objects.requireNonNull;
 
-public class CreateTransactionReply implements SerializableMessage {
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 
-    public static final Class<ShardTransactionMessages.CreateTransactionReply> SERIALIZABLE_CLASS =
-            ShardTransactionMessages.CreateTransactionReply.class;
-    private final String transactionPath;
-    private final String transactionId;
-    private final int version;
+public class CreateTransactionReply extends VersionedExternalizableMessage {
+    private static final long serialVersionUID = 1L;
 
-    public CreateTransactionReply(final String transactionPath,
-        final String transactionId) {
-        this(transactionPath, transactionId, CreateTransaction.CURRENT_VERSION);
-    }
+    private String transactionPath;
+    private TransactionIdentifier transactionId;
 
-    public CreateTransactionReply(final String transactionPath,
-                                  final String transactionId, final int version) {
-        this.transactionPath = transactionPath;
-        this.transactionId = transactionId;
-        this.version = version;
+    public CreateTransactionReply() {
     }
 
+    public CreateTransactionReply(final String transactionPath, final TransactionIdentifier transactionId,
+            final short version) {
+        super(version);
+        this.transactionPath = requireNonNull(transactionPath);
+        this.transactionId = requireNonNull(transactionId);
+    }
 
     public String getTransactionPath() {
         return transactionPath;
     }
 
-    public String getTransactionId() {
+    public TransactionIdentifier getTransactionId() {
         return transactionId;
     }
 
-    public int getVersion() {
-        return version;
+    @Override
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        super.readExternal(in);
+        transactionId = TransactionIdentifier.readFrom(in);
+        transactionPath = in.readUTF();
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+        super.writeExternal(out);
+        transactionId.writeTo(out);
+        out.writeUTF(transactionPath);
     }
 
     @Override
-    public Object toSerializable(){
-        return ShardTransactionMessages.CreateTransactionReply.newBuilder()
-            .setTransactionActorPath(transactionPath)
-            .setTransactionId(transactionId)
-            .setMessageVersion(version)
-            .build();
+    public String toString() {
+        return "CreateTransactionReply [transactionPath=" + transactionPath
+                + ", transactionId=" + transactionId
+                + ", version=" + getVersion() + "]";
     }
 
-    public static CreateTransactionReply fromSerializable(final Object serializable){
-        ShardTransactionMessages.CreateTransactionReply o = (ShardTransactionMessages.CreateTransactionReply) serializable;
-        return new CreateTransactionReply(o.getTransactionActorPath(), o.getTransactionId(), o.getMessageVersion());
+    public static CreateTransactionReply fromSerializable(Object serializable) {
+        checkArgument(serializable instanceof CreateTransactionReply);
+        return (CreateTransactionReply)serializable;
     }
 
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CreateTransactionReply;
+    }
 }