Switch DatastoreSnapshot to new proxy

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DatastoreSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DatastoreSnapshot.java
index 31e4356bbce4816916c17a418c52423c08e427d2..5b026e45569cabe6765585089a49a729a5343092 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DatastoreSnapshot.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DatastoreSnapshot.java
@@ -37,7 +37,7 @@ public final class DatastoreSnapshot implements Serializable {
         void resolveTo(@NonNull DatastoreSnapshot newDatastoreSnapshot);
 
         @Override
-        default void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+        default void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
             final var type = (String)in.readObject();
             final var snapshot = (ShardManagerSnapshot) in.readObject();
 
@@ -51,7 +51,7 @@ public final class DatastoreSnapshot implements Serializable {
         }
 
         @Override
-        default void writeExternal(ObjectOutput out) throws IOException {
+        default void writeExternal(final ObjectOutput out) throws IOException {
             final var datastoreSnapshot = datastoreSnapshot();
             out.writeObject(datastoreSnapshot.type);
             out.writeObject(datastoreSnapshot.shardManagerSnapshot);
@@ -75,17 +75,13 @@ public final class DatastoreSnapshot implements Serializable {
             // For Externalizable
         }
 
-        Proxy(final DatastoreSnapshot datastoreSnapshot) {
-            this.datastoreSnapshot = requireNonNull(datastoreSnapshot);
-        }
-
         @Override
         public DatastoreSnapshot datastoreSnapshot() {
             return datastoreSnapshot;
         }
 
         @Override
-        public void resolveTo(DatastoreSnapshot newDatastoreSnapshot) {
+        public void resolveTo(final DatastoreSnapshot newDatastoreSnapshot) {
             datastoreSnapshot = requireNonNull(newDatastoreSnapshot);
         }
 
@@ -95,14 +91,15 @@ public final class DatastoreSnapshot implements Serializable {
         }
     }
 
+    @java.io.Serial
     private static final long serialVersionUID = 1L;
 
     private final @NonNull String type;
     private final ShardManagerSnapshot shardManagerSnapshot;
     private final @NonNull ImmutableList<ShardSnapshot> shardSnapshots;
 
-    public DatastoreSnapshot(@NonNull String type, @Nullable ShardManagerSnapshot shardManagerSnapshot,
-            @NonNull List<ShardSnapshot> shardSnapshots) {
+    public DatastoreSnapshot(final @NonNull String type, final @Nullable ShardManagerSnapshot shardManagerSnapshot,
+            final @NonNull List<ShardSnapshot> shardSnapshots) {
         this.type = requireNonNull(type);
         this.shardManagerSnapshot = shardManagerSnapshot;
         this.shardSnapshots = ImmutableList.copyOf(shardSnapshots);
@@ -120,8 +117,9 @@ public final class DatastoreSnapshot implements Serializable {
         return shardSnapshots;
     }
 
+    @java.io.Serial
     private Object writeReplace() {
-        return new Proxy(this);
+        return new DS(this);
     }
 
     public static final class ShardSnapshot implements Serializable {
@@ -134,19 +132,20 @@ public final class DatastoreSnapshot implements Serializable {
             void resolveTo(String name, Snapshot snapshot);
 
             @Override
-            default void writeExternal(ObjectOutput out) throws IOException {
+            default void writeExternal(final ObjectOutput out) throws IOException {
                 final var shardSnapshot = shardSnapshot();
                 out.writeObject(shardSnapshot.name);
                 out.writeObject(shardSnapshot.snapshot);
             }
 
             @Override
-            default void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+            default void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
                 resolveTo((String) in.readObject(), (Snapshot) in.readObject());
             }
         }
 
         private static final class Proxy implements SerialForm {
+            @java.io.Serial
             private static final long serialVersionUID = 1L;
 
             private ShardSnapshot shardSnapshot;
@@ -178,12 +177,13 @@ public final class DatastoreSnapshot implements Serializable {
             }
         }
 
+        @java.io.Serial
         private static final long serialVersionUID = 1L;
 
         private final @NonNull String name;
         private final @NonNull Snapshot snapshot;
 
-        public ShardSnapshot(@NonNull String name, @NonNull Snapshot snapshot) {
+        public ShardSnapshot(final @NonNull String name, final @NonNull Snapshot snapshot) {
             this.name = requireNonNull(name);
             this.snapshot = requireNonNull(snapshot);
         }
@@ -196,6 +196,7 @@ public final class DatastoreSnapshot implements Serializable {
             return snapshot;
         }
 
+        @java.io.Serial
         private Object writeReplace() {
             return new Proxy(this);
         }