From 6ad8bd1a14635edb22f67115bb100168d2d8ce73 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 11 May 2023 18:48:28 +0200 Subject: [PATCH] Switch DatastoreSnapshot to new proxy We have defined DS as the new proxy, but failed to switch to it. This patch makes that switch. JIRA: CONTROLLER-2077 Change-Id: I5de4514b2297ca39caadb02d0c30ab7b3dc8fc5c Signed-off-by: Robert Varga --- .../datastore/persisted/DatastoreSnapshot.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 ec32091809..5b026e4556 100644 --- 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 @@ -75,10 +75,6 @@ public final class DatastoreSnapshot implements Serializable { // For Externalizable } - Proxy(final DatastoreSnapshot datastoreSnapshot) { - this.datastoreSnapshot = requireNonNull(datastoreSnapshot); - } - @Override public DatastoreSnapshot datastoreSnapshot() { return datastoreSnapshot; @@ -95,6 +91,7 @@ public final class DatastoreSnapshot implements Serializable { } } + @java.io.Serial private static final long serialVersionUID = 1L; private final @NonNull String type; @@ -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 { @@ -147,6 +145,7 @@ public final class DatastoreSnapshot implements Serializable { } private static final class Proxy implements SerialForm { + @java.io.Serial private static final long serialVersionUID = 1L; private ShardSnapshot shardSnapshot; @@ -178,6 +177,7 @@ public final class DatastoreSnapshot implements Serializable { } } + @java.io.Serial private static final long serialVersionUID = 1L; private final @NonNull String name; @@ -196,6 +196,7 @@ public final class DatastoreSnapshot implements Serializable { return snapshot; } + @java.io.Serial private Object writeReplace() { return new Proxy(this); } -- 2.36.6