BUG-5280: remove support for talking to pre-Boron clients

[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..212f2bca925f0adb11c6a99ac87bcd6434fd261e 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,11 +8,10 @@
 
 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;
 
 public class CloseTransactionChain extends VersionedExternalizableMessage {
     private static final long serialVersionUID = 1L;
@@ -43,29 +42,12 @@ public class CloseTransactionChain extends VersionedExternalizableMessage {
         out.writeUTF(transactionChainId);
     }
 
-    @Override
-    public Object toSerializable() {
-        if(getVersion() >= DataStoreVersions.BORON_VERSION) {
-            return this;
-        } else {
-            return ShardTransactionChainMessages.CloseTransactionChain.newBuilder()
-                .setTransactionChainId(transactionChainId).build();
-        }
-    }
-
     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;
     }
 }