BUG-5626: make CloseTransactionChain implement Identifiable

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

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 bc59c544ca63c3935753435b0c2d49a29f886e76..24c0c5cab100ebb04851bc3be14aac547cf51894 100644 (file)
--- 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,64 +8,49 @@
 
 package org.opendaylight.controller.cluster.datastore.messages;
 
+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;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages;
+import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier;
+import org.opendaylight.yangtools.concepts.Identifiable;
 
-public class CloseTransactionChain extends VersionedExternalizableMessage {
+public class CloseTransactionChain extends VersionedExternalizableMessage implements Identifiable<LocalHistoryIdentifier> {
     private static final long serialVersionUID = 1L;
 
-    private String transactionChainId;
+    private LocalHistoryIdentifier transactionChainId;
 
     public CloseTransactionChain() {
     }
 
-    public CloseTransactionChain(final String transactionChainId, final short version) {
+    public CloseTransactionChain(final LocalHistoryIdentifier transactionChainId, final short version) {
         super(version);
-        this.transactionChainId = transactionChainId;
+        this.transactionChainId = Preconditions.checkNotNull(transactionChainId);
     }
 
-    public String getTransactionChainId() {
+    @Override
+    public LocalHistoryIdentifier getIdentifier() {
         return transactionChainId;
     }
 
     @Override
     public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         super.readExternal(in);
-        transactionChainId = in.readUTF();
+        transactionChainId = LocalHistoryIdentifier.readFrom(in);
     }
 
     @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();
-        }
+        transactionChainId.writeTo(out);
     }
 
     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);
-        }
+        Preconditions.checkArgument(serializable instanceof CloseTransactionChain);
+        return (CloseTransactionChain)serializable;
     }
 
     public static boolean isSerializedType(Object message) {
-        return message instanceof CloseTransactionChain ||
-                message instanceof ShardTransactionChainMessages.CloseTransactionChain;
+        return message instanceof CloseTransactionChain;
     }
 }