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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java
index 398f25336f0e0c423861f655052859601f7927fa..3b58458e1a3dca93fd37ba97d01a05a64c26cc65 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java
@@ -9,13 +9,8 @@
 package org.opendaylight.controller.cluster.datastore.messages;
 
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;
 package org.opendaylight.controller.cluster.datastore.messages;
 
 import org.opendaylight.controller.cluster.datastore.DataStoreVersions;

-import org.opendaylight.controller.protobuff.messages.cohort3pc.ThreePhaseCommitCohortMessages;

 
 public class AbortTransactionReply extends VersionedExternalizableMessage {
 
 public class AbortTransactionReply extends VersionedExternalizableMessage {

-    @Deprecated
-    private static final Object SERIALIZED_INSTANCE =
-            ThreePhaseCommitCohortMessages.AbortTransactionReply.newBuilder().build();
-

     private static final AbortTransactionReply INSTANCE = new AbortTransactionReply();
 
     public AbortTransactionReply() {
     private static final AbortTransactionReply INSTANCE = new AbortTransactionReply();
 
     public AbortTransactionReply() {


@@ -25,18 +20,11 @@ public class AbortTransactionReply extends VersionedExternalizableMessage {
         super(version);
     }
 
         super(version);
     }
 

-    @Deprecated
-    @Override
-    protected Object newLegacySerializedInstance() {
-        return SERIALIZED_INSTANCE;
-    }
-

     public static AbortTransactionReply instance(short version) {
         return version == DataStoreVersions.CURRENT_VERSION ? INSTANCE : new AbortTransactionReply(version);
     }
 
     public static boolean isSerializedType(Object message) {
     public static AbortTransactionReply instance(short version) {
         return version == DataStoreVersions.CURRENT_VERSION ? INSTANCE : new AbortTransactionReply(version);
     }
 
     public static boolean isSerializedType(Object message) {

-        return message instanceof AbortTransactionReply ||
-                message instanceof ThreePhaseCommitCohortMessages.AbortTransactionReply;
+        return message instanceof AbortTransactionReply;

     }
 }
     }
 }