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%2FCanCommitTransactionReply.java;h=6b88b96ca6ac7f2363647fe8189aa5537bdb2ef7;hb=8ec73bf853a9b6708b455c0321a585992e02b125;hp=9c8909c2dd0f339e00ec64ccda57b098d1fd4567;hpb=b3c034675957f963c5878ce1e5e183ec2de8b5e2;p=controller.git

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java
index 9c8909c2dd..6b88b96ca6 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java
@@ -8,29 +8,83 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
+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.cohort3pc.ThreePhaseCommitCohortMessages;
 
-public class CanCommitTransactionReply implements SerializableMessage {
-    public static Class<ThreePhaseCommitCohortMessages.CanCommitTransactionReply> SERIALIZABLE_CLASS =
-            ThreePhaseCommitCohortMessages.CanCommitTransactionReply.class;
+public class CanCommitTransactionReply extends VersionedExternalizableMessage {
+    private static final CanCommitTransactionReply YES =
+            new CanCommitTransactionReply(true, DataStoreVersions.CURRENT_VERSION);
+    private static final CanCommitTransactionReply NO =
+            new CanCommitTransactionReply(false, DataStoreVersions.CURRENT_VERSION);
 
-    private final Boolean canCommit;
+    @Deprecated
+    private static final ThreePhaseCommitCohortMessages.CanCommitTransactionReply YES_SERIALIZED =
+            ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().setCanCommit(true).build();
 
-    public CanCommitTransactionReply(Boolean canCommit) {
+    @Deprecated
+    private static final ThreePhaseCommitCohortMessages.CanCommitTransactionReply NO_SERIALIZED =
+            ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().setCanCommit(false).build();
+
+    private boolean canCommit;
+
+    public CanCommitTransactionReply() {
+    }
+
+    private CanCommitTransactionReply(final boolean canCommit, final short version) {
+        super(version);
         this.canCommit = canCommit;
     }
 
-    public Boolean getCanCommit() {
+    public boolean getCanCommit() {
         return canCommit;
     }
 
     @Override
-    public Object toSerializable() {
-        return ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().setCanCommit(canCommit).build();
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        super.readExternal(in);
+        canCommit = in.readBoolean();
+    }
+
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+        super.writeExternal(out);
+        out.writeBoolean(canCommit);
+    }
+
+    @Deprecated
+    @Override
+    protected Object newLegacySerializedInstance() {
+        return canCommit ? YES_SERIALIZED : NO_SERIALIZED;
+    }
+
+    @Override
+    public String toString() {
+        return "CanCommitTransactionReply [canCommit=" + canCommit + ", version=" + getVersion() + "]";
+    }
+
+    public static CanCommitTransactionReply yes(short version) {
+        return version == DataStoreVersions.CURRENT_VERSION ? YES : new CanCommitTransactionReply(true, version);
+    }
+
+    public static CanCommitTransactionReply no(short version) {
+        return version == DataStoreVersions.CURRENT_VERSION ? NO : new CanCommitTransactionReply(false, version);
+    }
+
+    public static CanCommitTransactionReply fromSerializable(final Object serializable) {
+        if(serializable instanceof CanCommitTransactionReply) {
+            return (CanCommitTransactionReply)serializable;
+        } else {
+            ThreePhaseCommitCohortMessages.CanCommitTransactionReply serialized =
+                    (ThreePhaseCommitCohortMessages.CanCommitTransactionReply) serializable;
+            return serialized.getCanCommit() ? YES : NO;
+        }
     }
 
-    public static CanCommitTransactionReply fromSerializable(Object message) {
-        return new CanCommitTransactionReply(
-                ((ThreePhaseCommitCohortMessages.CanCommitTransactionReply) message).getCanCommit());
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CanCommitTransactionReply ||
+                message instanceof ThreePhaseCommitCohortMessages.CanCommitTransactionReply;
     }
 }