Remove old payload proxies

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
index b211d1a54f77d95398bcef2d927bc6035ff75762..86d293528a9dab2bdecf7c2b30800dd707b271a7 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardManagerSnapshot.java
@@ -7,113 +7,17 @@
  */
 package org.opendaylight.controller.cluster.datastore.persisted;
 
-import static java.util.Objects.requireNonNull;
-
 import com.google.common.collect.ImmutableList;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.controller.cluster.raft.persisted.MigratedSerializable;
 
 /**
  * Represents the persisted snapshot state for the ShardManager.
  *
  * @author Thomas Pantelis
  */
-public sealed class ShardManagerSnapshot implements Serializable {
-    interface SerializedForm extends Externalizable {
-        /**
-         * Return the serial form of this object contents, corresponding to {@link ShardManagerSnapshot#shardList}.
-         *
-         * @return List of shards names.
-         */
-        List<String> shardNames();
-
-        /**
-         * Resolve this proxy to an actual {@link ShardManagerSnapshot}. Implementations can rely on the object to be
-         * set via {@link #resolveTo(ShardManagerSnapshot)}.
-         *
-         * @return A snapshot
-         */
-        Object readResolve();
-
-        /**
-         * Set this proxy to return {@code snapshot} on next {@link #readResolve()}.
-         *
-         * @param newSnapshot Snapshot to set
-         */
-        void resolveTo(@NonNull ShardManagerSnapshot newSnapshot);
-
-        @Override
-        default void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-            final int size = in.readInt();
-            final var shardList = new ArrayList<String>(size);
-            for (int i = 0; i < size; i++) {
-                shardList.add((String) in.readObject());
-            }
-            resolveTo(new ShardManagerSnapshot(shardList));
-        }
-
-        @Override
-        default void writeExternal(final ObjectOutput out) throws IOException {
-            final var shardList = shardNames();
-            out.writeInt(shardList.size());
-            for (var shardName : shardList) {
-                out.writeObject(shardName);
-            }
-        }
-    }
-
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static final class Magnesium extends ShardManagerSnapshot implements MigratedSerializable {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        Magnesium(final List<String> shardList) {
-            super(shardList);
-        }
-
-        @Override
-        public boolean isMigrated() {
-            return true;
-        }
-    }
-
-    @Deprecated(since = "7.0.0", forRemoval = true)
-    private static final class Proxy implements SerializedForm {
-        @java.io.Serial
-        private static final long serialVersionUID = 1L;
-
-        private ShardManagerSnapshot snapshot = null;
-
-        // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't
-        // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection.
-        @SuppressWarnings("checkstyle:RedundantModifier")
-        public Proxy() {
-            // For Externalizable
-        }
-
-        @Override
-        public List<String> shardNames() {
-            return snapshot.getShardList();
-        }
-
-        @Override
-        public void resolveTo(final ShardManagerSnapshot newSnapshot) {
-            snapshot = requireNonNull(newSnapshot);
-        }
-
-        @Override
-        public Object readResolve() {
-            return new Magnesium(snapshot.getShardList());
-        }
-    }
-
+public final class ShardManagerSnapshot implements Serializable {
     @java.io.Serial
     private static final long serialVersionUID = 1L;
 
@@ -123,17 +27,17 @@ public sealed class ShardManagerSnapshot implements Serializable {
         this.shardList = ImmutableList.copyOf(shardList);
     }
 
-    public final List<String> getShardList() {
+    public List<String> getShardList() {
         return shardList;
     }
 
     @java.io.Serial
-    public final Object writeReplace() {
+    private Object writeReplace() {
         return new SM(this);
     }
 
     @Override
-    public final String toString() {
+    public String toString() {
         return "ShardManagerSnapshot [ShardList = " + shardList + " ]";
     }
 }