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%2FCloseTransactionChain.java;h=2fe96cbe67eddf945dbb41e5bca1eae6aad554b1;hb=bdce894fa73714aa9f68eadad3524cfc94dc71d2;hp=b93f94e77c95f651768e0285aa63ff9a76b81725;hpb=dd16edd5a758f0e51727de511f9868c72b2a1dd0;p=controller.git

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 b93f94e77c..2fe96cbe67 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,61 +8,50 @@
 
 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);
-    }
-
-    @Deprecated
-    @Override
-    protected Object newLegacySerializedInstance() {
-        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);
-        }
+    public static CloseTransactionChain fromSerializable(final Object serializable) {
+        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;
     }
 }