From 30ea4cdba4f2fc009be72e393a5091c837185ab9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 30 Nov 2022 23:07:11 +0100 Subject: [PATCH] Switch identifiers to new proxies We have more efficient serialization proxies defined, use them for writeout and deprecate the old ones. JIRA: CONTROLLER-2051 Change-Id: I1daa83e8fcdd3776951fc1c284c9e6d0d7f64078 Signed-off-by: Robert Varga --- .../controller/cluster/access/concepts/ClientIdentifier.java | 3 ++- .../cluster/access/concepts/FrontendIdentifier.java | 3 ++- .../controller/cluster/access/concepts/FrontendType.java | 5 +++-- .../cluster/access/concepts/LocalHistoryIdentifier.java | 3 ++- .../controller/cluster/access/concepts/MemberName.java | 3 ++- .../cluster/access/concepts/TransactionIdentifier.java | 3 ++- .../cluster/access/concepts/AbstractIdentifierTest.java | 1 - .../cluster/access/concepts/ClientIdentifierTest.java | 2 +- .../cluster/access/concepts/FrontendIdentifierTest.java | 2 +- .../controller/cluster/access/concepts/FrontendTypeTest.java | 2 +- .../cluster/access/concepts/LocalHistoryIdentifierTest.java | 2 +- .../controller/cluster/access/concepts/MemberNameTest.java | 2 +- .../cluster/access/concepts/TransactionIdentifierTest.java | 2 +- 13 files changed, 19 insertions(+), 14 deletions(-) diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java index fc8a2a4954..3468ed6a5d 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifier.java @@ -49,6 +49,7 @@ public final class ClientIdentifier implements WritableIdentifier { } } + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -142,6 +143,6 @@ public final class ClientIdentifier implements WritableIdentifier { @java.io.Serial private Object writeReplace() { - return new Proxy(this); + return new CI(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java index 933aa16c79..10024a206e 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendIdentifier.java @@ -45,6 +45,7 @@ public final class FrontendIdentifier implements WritableIdentifier { } } + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -135,6 +136,6 @@ public final class FrontendIdentifier implements WritableIdentifier { @java.io.Serial private Object writeReplace() { - return new Proxy(this); + return new FI(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendType.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendType.java index 3a25df7dc4..1ccdd69a07 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendType.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FrontendType.java @@ -56,6 +56,7 @@ public final class FrontendType implements Comparable, WritableIde } } + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -179,7 +180,7 @@ public final class FrontendType implements Comparable, WritableIde } @java.io.Serial - Object writeReplace() { - return new Proxy(this); + private Object writeReplace() { + return new FT(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java index 0e70edc76f..334f10291d 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifier.java @@ -64,6 +64,7 @@ public final class LocalHistoryIdentifier implements WritableIdentifier { } } + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -169,6 +170,6 @@ public final class LocalHistoryIdentifier implements WritableIdentifier { @java.io.Serial private Object writeReplace() { - return new Proxy(this); + return new HI(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java index 41a9136075..47af6b3b1e 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/MemberName.java @@ -52,6 +52,7 @@ public final class MemberName implements Comparable, WritableIdentif } } + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -163,6 +164,6 @@ public final class MemberName implements Comparable, WritableIdentif @java.io.Serial Object writeReplace() { - return new Proxy(this); + return new MN(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifier.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifier.java index b03e2cd5c3..b5c652333f 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifier.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifier.java @@ -45,6 +45,7 @@ public final class TransactionIdentifier implements WritableIdentifier { } } + @Deprecated(since = "7.0.0", forRemoval = true) private static final class Proxy implements SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -139,6 +140,6 @@ public final class TransactionIdentifier implements WritableIdentifier { @java.io.Serial private Object writeReplace() { - return new Proxy(this); + return new TI(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractIdentifierTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractIdentifierTest.java index 8fcc9fa1f5..74cd4cf3ba 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractIdentifierTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/AbstractIdentifierTest.java @@ -42,7 +42,6 @@ public abstract class AbstractIdentifierTest { assertEquals(object().hashCode(), equalObject().hashCode()); } - @Test public final void testSerialization() throws Exception { assertTrue(object().equals(copy(object()))); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifierTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifierTest.java index 0908659487..d9bd5c126b 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifierTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/ClientIdentifierTest.java @@ -32,6 +32,6 @@ public class ClientIdentifierTest extends AbstractIdentifierTest { @Override int expectedSize() { - return 104; + return 88; } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifierTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifierTest.java index 161370deff..dc53bb3a76 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifierTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/LocalHistoryIdentifierTest.java @@ -33,6 +33,6 @@ public class LocalHistoryIdentifierTest extends AbstractIdentifierTest { @Override int expectedSize() { - return 101; + return 87; } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifierTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifierTest.java index b33b61c49b..4433c49a6e 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifierTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/TransactionIdentifierTest.java @@ -34,6 +34,6 @@ public class TransactionIdentifierTest extends AbstractIdentifierTest