Switch to use PayloadVersion.CHLORINE_SR2

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayload.java
index 793f2ea0628cdf967551eb90e6c87519dd62dd01..5f398853fe7a5561e2ce69bb8b60f360d8c14377 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayload.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbortTransactionPayload.java
@@ -12,6 +12,7 @@ import com.google.common.io.ByteStreams;
 import java.io.DataInput;
 import java.io.IOException;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;
 import java.io.DataInput;
 import java.io.IOException;
 import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier;

+import org.opendaylight.controller.cluster.raft.persisted.LegacySerializable;

 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 


@@ -20,8 +21,20 @@ import org.slf4j.LoggerFactory;
  *
  * @author Robert Varga
  */
  *
  * @author Robert Varga
  */

-public final class AbortTransactionPayload extends AbstractIdentifiablePayload<TransactionIdentifier> {
+public sealed class AbortTransactionPayload extends AbstractIdentifiablePayload<TransactionIdentifier> {
+    @Deprecated(since = "7.0.0", forRemoval = true)
+    private static final class Magnesium extends AbortTransactionPayload implements LegacySerializable {
+        @java.io.Serial
+        private static final long serialVersionUID = 1L;
+
+        Magnesium(final TransactionIdentifier transactionId, final byte[] serialized) {
+            super(transactionId, serialized);
+        }
+    }
+
+    @Deprecated(since = "7.0.0", forRemoval = true)

     private static final class Proxy extends AbstractProxy<TransactionIdentifier> {
     private static final class Proxy extends AbstractProxy<TransactionIdentifier> {

+        @java.io.Serial

         private static final long serialVersionUID = 1L;
 
         // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
         private static final long serialVersionUID = 1L;
 
         // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't


@@ -31,10 +44,6 @@ public final class AbortTransactionPayload extends AbstractIdentifiablePayload<T
             // For Externalizable
         }
 
             // For Externalizable
         }
 

-        Proxy(final byte[] serialized) {
-            super(serialized);
-        }
-

         @Override
         protected TransactionIdentifier readIdentifier(final DataInput in) throws IOException {
             return TransactionIdentifier.readFrom(in);
         @Override
         protected TransactionIdentifier readIdentifier(final DataInput in) throws IOException {
             return TransactionIdentifier.readFrom(in);


@@ -43,13 +52,14 @@ public final class AbortTransactionPayload extends AbstractIdentifiablePayload<T
         @Override
         protected AbortTransactionPayload createObject(final TransactionIdentifier identifier,
                 final byte[] serialized) {
         @Override
         protected AbortTransactionPayload createObject(final TransactionIdentifier identifier,
                 final byte[] serialized) {

-            return new AbortTransactionPayload(identifier, serialized);
+            return new Magnesium(identifier, serialized);

         }
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(AbortTransactionPayload.class);
         }
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(AbortTransactionPayload.class);

+    @java.io.Serial

     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;

-    private static final int PROXY_SIZE = externalizableProxySize(Proxy::new);
+    private static final int PROXY_SIZE = externalizableProxySize(AT::new);

 
     AbortTransactionPayload(final TransactionIdentifier transactionId, final byte[] serialized) {
         super(transactionId, serialized);
 
     AbortTransactionPayload(final TransactionIdentifier transactionId, final byte[] serialized) {
         super(transactionId, serialized);


@@ -69,8 +79,8 @@ public final class AbortTransactionPayload extends AbstractIdentifiablePayload<T
     }
 
     @Override
     }
 
     @Override

-    protected Proxy externalizableProxy(final byte[] serialized) {
-        return new Proxy(serialized);
+    protected AT externalizableProxy(final byte[] serialized) {
+        return new AT(serialized);

     }
 
     @Override
     }
 
     @Override