Follow-up to protobuff deprecation

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java
index 565345a44f3d48b321349d97d8d600e992b8946c..e0bf4489b48e9a151313d29617472fb1fbe9e3f1 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransaction.java
@@ -8,29 +8,37 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
+import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
 import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;
 
-public class CanCommitTransaction implements SerializableMessage {
-    public static final Class<?> SERIALIZABLE_CLASS = ThreePhaseCommitCohortMessages.CanCommitTransaction.class;
+public class CanCommitTransaction extends AbstractThreePhaseCommitMessage {
+    private static final long serialVersionUID = 1L;
 
-    private final String transactionID;
-
-    public CanCommitTransaction(String transactionID) {
-        this.transactionID = transactionID;
+    public CanCommitTransaction() {
     }
 
-    public String getTransactionID() {
-        return transactionID;
+    public CanCommitTransaction(String transactionID, final short version) {
+        super(transactionID, version);
     }
 
+    @Deprecated
     @Override
-    public Object toSerializable() {
+    protected Object newLegacySerializedInstance() {
         return ThreePhaseCommitCohortMessages.CanCommitTransaction.newBuilder().
-                setTransactionId(transactionID).build();
+                setTransactionId(getTransactionID()).build();
+    }
+
+    public static CanCommitTransaction fromSerializable(Object serializable) {
+        if(serializable instanceof CanCommitTransaction) {
+            return (CanCommitTransaction)serializable;
+        } else {
+            return new CanCommitTransaction(((ThreePhaseCommitCohortMessages.CanCommitTransaction)serializable).
+                    getTransactionId(), DataStoreVersions.LITHIUM_VERSION);
+        }
     }
 
-    public static CanCommitTransaction fromSerializable(Object message) {
-        return new CanCommitTransaction(((ThreePhaseCommitCohortMessages.CanCommitTransaction)message).
-                getTransactionId());
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CanCommitTransaction ||
+                message instanceof ThreePhaseCommitCohortMessages.CanCommitTransaction;
     }
 }