Switch to use PayloadVersion.CHLORINE_SR2

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java
index 9bc5a319da2da9bde6385398f2f74329985ba723..3f142f569e3ca042cdc0ba97a7db61fc408a84e7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractIdentifiablePayload.java
@@ -50,6 +50,7 @@ public abstract class AbstractIdentifiablePayload<T extends Identifier> extends
          *
          * @return A payload.
          */
+        @java.io.Serial
         Object readResolve();
 
         /**
@@ -87,7 +88,9 @@ public abstract class AbstractIdentifiablePayload<T extends Identifier> extends
         }
     }
 
+    @Deprecated(since = "7.0.0", forRemoval = true)
     protected abstract static class AbstractProxy<T extends Identifier> implements SerialForm {
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         private byte[] serialized;
@@ -162,15 +165,15 @@ public abstract class AbstractIdentifiablePayload<T extends Identifier> extends
     }
 
     @Override
-    protected final Object writeReplace() {
+    public final Object writeReplace() {
         return verifyNotNull(externalizableProxy(serialized));
     }
 
-    protected abstract @NonNull AbstractProxy<T> externalizableProxy(byte @NonNull[] serialized);
+    protected abstract @NonNull SerialForm externalizableProxy(byte @NonNull[] serialized);
 
     protected abstract int externalizableProxySize();
 
-    protected static final int externalizableProxySize(final Function<byte[], ? extends AbstractProxy<?>> constructor) {
+    protected static final int externalizableProxySize(final Function<byte[], ? extends SerialForm> constructor) {
         return SerializationUtils.serialize(constructor.apply(new byte[0])).length;
     }
 }