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=f346cba4334ffce9b93f1ff53e33b9e0401d94fa;hb=7a38f0591bc527178510d749ae361e317dcc9788;hp=7db4846ef4ff69c4c318ab459a07cc09b7943a47;hpb=cad857b425b1a0072681066b2ba37b0b0dc8c111;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 7db4846ef4..f346cba433 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,22 +8,26 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
-import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;
+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;
 
-public class CanCommitTransactionReply implements SerializableMessage {
-    public static final 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);
 
-    public static final CanCommitTransactionReply YES = new CanCommitTransactionReply(true);
-    public static final CanCommitTransactionReply NO = new CanCommitTransactionReply(false);
+    private boolean canCommit;
 
-    private final boolean canCommit;
-    private final Object serializedMessage;
+    public CanCommitTransactionReply() {
+    }
 
-    private CanCommitTransactionReply(final boolean canCommit) {
+    private CanCommitTransactionReply(final boolean canCommit, final short version) {
+        super(version);
         this.canCommit = canCommit;
-        this.serializedMessage = ThreePhaseCommitCohortMessages.CanCommitTransactionReply.newBuilder().
-                setCanCommit(canCommit).build();
     }
 
     public boolean getCanCommit() {
@@ -31,13 +35,36 @@ public class CanCommitTransactionReply implements SerializableMessage {
     }
 
     @Override
-    public Object toSerializable() {
-        return serializedMessage;
+    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);
+    }
+
+    @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) {
+        Preconditions.checkArgument(serializable instanceof CanCommitTransactionReply);
+        return (CanCommitTransactionReply)serializable;
     }
 
-    public static CanCommitTransactionReply fromSerializable(final Object message) {
-        ThreePhaseCommitCohortMessages.CanCommitTransactionReply serialized =
-                (ThreePhaseCommitCohortMessages.CanCommitTransactionReply) message;
-        return serialized.getCanCommit() ? YES : NO;
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CanCommitTransactionReply;
     }
 }