X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fmessages%2FCloseTransactionChain.java;h=bc59c544ca63c3935753435b0c2d49a29f886e76;hp=74de6c5aeacd3a39e777512980745d9190d7838c;hb=ae11ac10dfd3579b1b685455ea642bbb08de68f1;hpb=739927d16b298c15accbff118e38293416a3dfa7

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java
index 74de6c5aea..bc59c544ca 100644
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CloseTransactionChain.java
@@ -8,31 +8,64 @@
 
 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.transaction.ShardTransactionChainMessages;
 
-public class CloseTransactionChain implements SerializableMessage {
-    public static final Class SERIALIZABLE_CLASS =
-        ShardTransactionChainMessages.CloseTransactionChain.class;
-    private final String transactionChainId;
+public class CloseTransactionChain extends VersionedExternalizableMessage {
+    private static final long serialVersionUID = 1L;
 
-    public CloseTransactionChain(String transactionChainId){
+    private String transactionChainId;
+
+    public CloseTransactionChain() {
+    }
+
+    public CloseTransactionChain(final String transactionChainId, final short version) {
+        super(version);
         this.transactionChainId = transactionChainId;
     }
 
+    public String getTransactionChainId() {
+        return transactionChainId;
+    }
+
     @Override
-    public Object toSerializable() {
-        return ShardTransactionChainMessages.CloseTransactionChain.newBuilder()
-            .setTransactionChainId(transactionChainId).build();
+    public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        super.readExternal(in);
+        transactionChainId = in.readUTF();
     }
 
-    public static CloseTransactionChain fromSerializable(Object message){
-        ShardTransactionChainMessages.CloseTransactionChain closeTransactionChain
-            = (ShardTransactionChainMessages.CloseTransactionChain) message;
+    @Override
+    public void writeExternal(ObjectOutput out) throws IOException {
+        super.writeExternal(out);
+        out.writeUTF(transactionChainId);
+    }
+
+    @Override
+    public Object toSerializable() {
+        if(getVersion() >= DataStoreVersions.BORON_VERSION) {
+            return this;
+        } else {
+            return ShardTransactionChainMessages.CloseTransactionChain.newBuilder()
+                .setTransactionChainId(transactionChainId).build();
+        }
+    }
 
-        return new CloseTransactionChain(closeTransactionChain.getTransactionChainId());
+    public static CloseTransactionChain fromSerializable(final Object serializable){
+        if(serializable instanceof CloseTransactionChain) {
+            return (CloseTransactionChain)serializable;
+        } else {
+            ShardTransactionChainMessages.CloseTransactionChain closeTransactionChain =
+                    (ShardTransactionChainMessages.CloseTransactionChain) serializable;
+            return new CloseTransactionChain(closeTransactionChain.getTransactionChainId(),
+                    DataStoreVersions.LITHIUM_VERSION);
+        }
     }
 
-    public String getTransactionChainId() {
-        return transactionChainId;
+    public static boolean isSerializedType(Object message) {
+        return message instanceof CloseTransactionChain ||
+                message instanceof ShardTransactionChainMessages.CloseTransactionChain;
     }
 }