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 / CreateTransaction.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java
index cd9479543efca935cbb4640ef29db9af7c25ab10..3d831a568c849a2c89542a5c8f155873f2ff400f 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CreateTransaction.java
@@ -12,7 +12,6 @@ import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages;
 
 public class CreateTransaction extends VersionedExternalizableMessage {
     private static final long serialVersionUID = 1L;
@@ -60,13 +59,6 @@ public class CreateTransaction extends VersionedExternalizableMessage {
         out.writeUTF(transactionChainId);
     }
 
-    @Override
-    protected Object newLegacySerializedInstance() {
-        return ShardTransactionMessages.CreateTransaction.newBuilder().setTransactionId(transactionId)
-                .setTransactionType(transactionType).setTransactionChainId(transactionChainId)
-                .setMessageVersion(getVersion()).build();
-    }
-
     @Override
     public String toString() {
         return "CreateTransaction [transactionId=" + transactionId + ", transactionType=" + transactionType
@@ -74,18 +66,11 @@ public class CreateTransaction extends VersionedExternalizableMessage {
     }
 
     public static CreateTransaction fromSerializable(Object message) {
-        if(message instanceof CreateTransaction) {
-            return (CreateTransaction)message;
-        } else {
-            ShardTransactionMessages.CreateTransaction createTransaction =
-                    (ShardTransactionMessages.CreateTransaction) message;
-            return new CreateTransaction(createTransaction.getTransactionId(),
-                    createTransaction.getTransactionType(), createTransaction.getTransactionChainId(),
-                    (short)createTransaction.getMessageVersion());
-        }
+        Preconditions.checkArgument(message instanceof CreateTransaction);
+        return (CreateTransaction)message;
     }
 
     public static boolean isSerializedType(Object message) {
-        return message instanceof CreateTransaction || message instanceof ShardTransactionMessages.CreateTransaction;
+        return message instanceof CreateTransaction;
     }
 }