From f7833ed068d6fc7e5a38ede8c4edd6f371a5acfd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 1 Dec 2022 16:13:17 +0100 Subject: [PATCH] Remove ABIVersion.MAGNESIUM This ABI versions is quite inefficient in its serialization and has been deprecated in the previous release. This patch completes its removal. JIRA: CONTROLLER-2062 Change-Id: I03be0d6561c4db2893e6eb0fd95e3a35e655b76e Signed-off-by: Robert Varga --- .../controller/cluster/access/ABIVersion.java | 22 ++------ .../AbstractLocalHistoryRequestProxy.java | 31 ----------- ...ractReadPathTransactionRequestProxyV1.java | 29 ----------- ...AbstractReadTransactionRequestProxyV1.java | 29 ----------- .../AbstractTransactionRequestProxy.java | 31 ----------- .../AbstractTransactionSuccessProxy.java | 31 ----------- .../access/commands/ConnectClientFailure.java | 2 +- .../commands/ConnectClientFailureProxyV1.java | 33 ------------ .../access/commands/ConnectClientRequest.java | 2 +- .../commands/ConnectClientRequestProxyV1.java | 33 ------------ .../access/commands/ConnectClientSuccess.java | 2 +- .../commands/ConnectClientSuccessProxyV1.java | 33 ------------ .../commands/CreateLocalHistoryRequest.java | 2 +- .../CreateLocalHistoryRequestProxyV1.java | 30 ----------- .../commands/DestroyLocalHistoryRequest.java | 2 +- .../DestroyLocalHistoryRequestProxyV1.java | 30 ----------- .../cluster/access/commands/ETS.java | 18 ++++++- .../commands/ExistsTransactionRequest.java | 2 +- .../ExistsTransactionRequestProxyV1.java | 30 ----------- .../commands/ExistsTransactionSuccess.java | 20 +------ .../ExistsTransactionSuccessProxyV1.java | 30 ----------- .../cluster/access/commands/ITSS.java | 11 +++- .../IncrementTransactionSequenceRequest.java | 2 +- ...mentTransactionSequenceRequestProxyV1.java | 27 ---------- .../IncrementTransactionSequenceSuccess.java | 13 +---- ...mentTransactionSequenceSuccessProxyV1.java | 31 ----------- .../access/commands/LocalHistoryFailure.java | 2 +- .../commands/LocalHistoryFailureProxyV1.java | 34 ------------ .../access/commands/LocalHistorySuccess.java | 2 +- .../commands/LocalHistorySuccessProxyV1.java | 32 ------------ .../cluster/access/commands/MTS.java | 12 ++++- .../commands/ModifyTransactionRequest.java | 2 +- .../ModifyTransactionRequestProxyV1.java | 30 ----------- .../commands/ModifyTransactionSuccess.java | 14 +---- .../ModifyTransactionSuccessProxyV1.java | 30 ----------- .../commands/PurgeLocalHistoryRequest.java | 2 +- .../PurgeLocalHistoryRequestProxyV1.java | 30 ----------- .../cluster/access/commands/RTS.java | 37 ++++++++++++- .../commands/ReadTransactionRequest.java | 2 +- .../ReadTransactionRequestProxyV1.java | 30 ----------- .../commands/ReadTransactionSuccess.java | 37 +------------ .../ReadTransactionSuccessProxyV1.java | 30 ----------- .../cluster/access/commands/STS.java | 11 +++- .../commands/SkipTransactionsRequest.java | 2 +- .../commands/SkipTransactionsRequestV1.java | 30 ----------- .../commands/SkipTransactionsResponse.java | 13 +---- .../SkipTransactionsResponseProxyV1.java | 30 ----------- .../cluster/access/commands/TAS.java | 11 +++- .../cluster/access/commands/TCCS.java | 11 +++- .../cluster/access/commands/TCS.java | 11 +++- .../cluster/access/commands/TPCS.java | 12 ++++- .../cluster/access/commands/TPS.java | 11 +++- .../commands/TransactionAbortRequest.java | 2 +- .../TransactionAbortRequestProxyV1.java | 30 ----------- .../commands/TransactionAbortSuccess.java | 13 +---- .../TransactionAbortSuccessProxyV1.java | 32 ------------ .../commands/TransactionCanCommitSuccess.java | 13 +---- .../TransactionCanCommitSuccessProxyV1.java | 30 ----------- .../commands/TransactionCommitSuccess.java | 13 +---- .../TransactionCommitSuccessProxyV1.java | 30 ----------- .../commands/TransactionDoCommitRequest.java | 2 +- .../TransactionDoCommitRequestProxyV1.java | 30 ----------- .../access/commands/TransactionFailure.java | 2 +- .../commands/TransactionFailureProxyV1.java | 33 ------------ .../commands/TransactionPreCommitRequest.java | 2 +- .../TransactionPreCommitRequestProxyV1.java | 30 ----------- .../commands/TransactionPreCommitSuccess.java | 14 +---- .../TransactionPreCommitSuccessProxyV1.java | 30 ----------- .../commands/TransactionPurgeRequest.java | 2 +- .../TransactionPurgeRequestProxyV1.java | 30 ----------- .../commands/TransactionPurgeResponse.java | 13 +---- .../TransactionPurgeResponseProxyV1.java | 30 ----------- .../concepts/AbstractEnvelopeProxy.java | 43 --------------- .../access/concepts/AbstractMessageProxy.java | 52 ------------------- .../concepts/AbstractRequestFailureProxy.java | 31 ----------- .../access/concepts/AbstractRequestProxy.java | 31 ----------- .../AbstractResponseEnvelopeProxy.java | 23 -------- .../concepts/AbstractResponseProxy.java | 34 ------------ .../access/concepts/AbstractSuccessProxy.java | 31 ----------- .../cluster/access/concepts/Envelope.java | 6 +-- .../access/concepts/FailureEnvelope.java | 15 ------ .../access/concepts/FailureEnvelopeProxy.java | 26 ---------- .../cluster/access/concepts/Message.java | 2 +- .../cluster/access/concepts/RE.java | 10 +++- .../access/concepts/RequestEnvelope.java | 14 ----- .../access/concepts/RequestEnvelopeProxy.java | 26 ---------- .../cluster/access/concepts/SE.java | 2 +- .../access/concepts/SuccessEnvelope.java | 16 ------ .../access/concepts/SuccessEnvelopeProxy.java | 26 ---------- .../cluster/access/ABIVersionTest.java | 12 ++--- .../AbortLocalTransactionRequestTest.java | 2 +- .../AbstractLocalTransactionRequestTest.java | 6 +-- .../AbstractReadTransactionRequestTest.java | 4 +- .../commands/AbstractRequestFailureTest.java | 6 +-- .../commands/AbstractRequestSuccessTest.java | 6 +-- .../AbstractTransactionRequestTest.java | 4 +- .../AbstractTransactionSuccessTest.java | 4 +- .../CommitLocalTransactionRequestTest.java | 2 +- .../commands/ConnectClientFailureTest.java | 2 +- .../commands/ConnectClientRequestTest.java | 6 +-- .../commands/ConnectClientSuccessTest.java | 5 +- .../ExistsTransactionRequestTest.java | 2 +- .../ExistsTransactionSuccessTest.java | 4 +- .../commands/LocalHistoryFailureTest.java | 4 +- .../commands/LocalHistorySuccessTest.java | 6 +-- .../ModifyTransactionRequestEmptyTest.java | 4 +- .../ModifyTransactionRequestTest.java | 4 +- .../ModifyTransactionSuccessTest.java | 6 +-- .../commands/ReadTransactionRequestTest.java | 2 +- .../ReadTransactionSuccessNoDataTest.java | 4 +- .../commands/ReadTransactionSuccessTest.java | 4 +- .../commands/SkipTransactionsRequestTest.java | 4 +- .../SkipTransactionsResponseTest.java | 4 +- .../commands/TransactionAbortRequestTest.java | 4 +- .../commands/TransactionAbortSuccessTest.java | 4 +- .../TransactionCanCommitSuccessTest.java | 4 +- .../TransactionCommitSuccessTest.java | 4 +- .../TransactionDoCommitRequestTest.java | 4 +- .../commands/TransactionFailureTest.java | 4 +- .../TransactionPreCommitRequestTest.java | 4 +- .../TransactionPreCommitSuccessTest.java | 4 +- .../commands/TransactionPurgeRequestTest.java | 4 +- .../TransactionPurgeResponseTest.java | 4 +- .../access/concepts/AbstractRequestTest.java | 7 +-- .../access/concepts/FailureEnvelopeTest.java | 27 ++++++++-- .../ConnectingClientConnectionTest.java | 7 +-- .../access/client/ConnectionEntryTest.java | 7 +-- .../dds/AbstractShardBackendResolver.java | 4 +- 128 files changed, 289 insertions(+), 1673 deletions(-) delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalHistoryRequestProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/CreateLocalHistoryRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/DestroyLocalHistoryRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailureProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/PurgeLocalHistoryRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponseProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionFailureProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccessProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequestProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponseProxyV1.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestFailureProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseEnvelopeProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractSuccessProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeProxy.java delete mode 100644 opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeProxy.java diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java index 365af8ce0f..119d477cc6 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/ABIVersion.java @@ -39,22 +39,11 @@ public enum ABIVersion implements WritableObject { // BORON was 5 // NEON_SR2 was 6 // SODIUM_SR1 was 7 + // MAGNESIUM was 8 + /** - * Oldest ABI version we support. The messages remain the same as {@code BORON}, but messages bearing QNames in any - * shape are using {@link NormalizedNodeStreamVersion#MAGNESIUM}, which improves encoding. - * - * @deprecated Support for this version is going to be removed in the next major version. - */ - @Deprecated(since = "7.0.0", forRemoval = true) - MAGNESIUM(8) { - @Override - public NormalizedNodeStreamVersion getStreamVersion() { - return NormalizedNodeStreamVersion.MAGNESIUM; - } - }, - /** - * Revised ABI version. The messages remain the same as {@link #MAGNESIUM}, the serialization proxies in use are - * flat objects without any superclasses. + * Oldest ABI version we support. The messages remain the same as {@code MAGNESIUM}, the serialization proxies in + * use are flat objects without any superclasses. */ CHLORINE_SR2(9) { @Override @@ -113,8 +102,7 @@ public enum ABIVersion implements WritableObject { */ public static @NonNull ABIVersion valueOf(final short value) throws FutureVersionException, PastVersionException { return switch (Short.toUnsignedInt(value)) { - case 0, 1, 2, 3, 4, 6, 7 -> throw new PastVersionException(value, MAGNESIUM); - case 8 -> MAGNESIUM; + case 0, 1, 2, 3, 4, 6, 7, 8 -> throw new PastVersionException(value, CHLORINE_SR2); case 9 -> CHLORINE_SR2; default -> throw new FutureVersionException(value, CHLORINE_SR2); }; diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalHistoryRequestProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalHistoryRequestProxy.java deleted file mode 100644 index 0033e16c84..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalHistoryRequestProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy; -import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; - -/** - * Abstract base class for serialization proxies associated with {@link LocalHistoryRequest}s. - * - * @param Message type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractLocalHistoryRequestProxy> - extends AbstractRequestProxy implements LocalHistoryRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractLocalHistoryRequestProxy() { - // For Externalizable - } - - AbstractLocalHistoryRequestProxy(final T request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java deleted file mode 100644 index 2df22ff2f1..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadPathTransactionRequestProxyV1.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2017 Pantheon Technologies, s.r.o. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -/** - * Abstract base class for serialization proxies associated with {@link AbstractReadTransactionRequest}s. It implements - * the initial (Boron) serialization format. - * - * @param Message type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractReadPathTransactionRequestProxyV1> - extends AbstractReadTransactionRequestProxyV1 implements AbstractReadPathTransactionRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractReadPathTransactionRequestProxyV1() { - // For Externalizable - } - - AbstractReadPathTransactionRequestProxyV1(final T request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestProxyV1.java deleted file mode 100644 index 5986482f83..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestProxyV1.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -/** - * Abstract base class for serialization proxies associated with {@link AbstractReadTransactionRequest}s. It implements - * the initial (Boron) serialization format. - * - * @param Message type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractReadTransactionRequestProxyV1> - extends AbstractTransactionRequestProxy implements AbstractReadTransactionRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractReadTransactionRequestProxyV1() { - // For Externalizable - } - - AbstractReadTransactionRequestProxyV1(final T request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestProxy.java deleted file mode 100644 index df14a37c63..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy; -import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; - -/** - * Abstract base class for serialization proxies associated with {@link TransactionRequest}s. - * - * @param Message type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractTransactionRequestProxy> - extends AbstractRequestProxy implements TransactionRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - AbstractTransactionRequestProxy() { - // For Externalizable - } - - AbstractTransactionRequestProxy(final T request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessProxy.java deleted file mode 100644 index 65405b53fe..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionSuccessProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -import org.opendaylight.controller.cluster.access.concepts.AbstractSuccessProxy; -import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; - -/** - * Abstract base class for serialization proxies associated with {@link TransactionSuccess}es. - * - * @param Message type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractTransactionSuccessProxy> - extends AbstractSuccessProxy implements TransactionSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - AbstractTransactionSuccessProxy() { - // For Externalizable - } - - AbstractTransactionSuccessProxy(final T request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailure.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailure.java index aa93708cd4..1157d1b6f8 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailure.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailure.java @@ -44,7 +44,7 @@ public final class ConnectClientFailure extends RequestFailure - implements ConnectClientFailure.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 2688639416324657256L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ConnectClientFailureProxyV1() { - // For Externalizable - } - - ConnectClientFailureProxyV1(final ConnectClientFailure failure) { - super(failure); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java index 12fb0181d5..953fafefa8 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequest.java @@ -90,7 +90,7 @@ public final class ConnectClientRequest extends Request - implements ConnectClientRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 8439729661327852159L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ConnectClientRequestProxyV1() { - // for Externalizable - } - - ConnectClientRequestProxyV1(final ConnectClientRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccess.java index 72dd51d616..a96404511e 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientSuccess.java @@ -129,7 +129,7 @@ public final class ConnectClientSuccess extends RequestSuccess - implements ConnectClientSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ConnectClientSuccessProxyV1() { - // For Externalizable - } - - ConnectClientSuccessProxyV1(final ConnectClientSuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/CreateLocalHistoryRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/CreateLocalHistoryRequest.java index 2520aeefd4..b627bafa43 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/CreateLocalHistoryRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/CreateLocalHistoryRequest.java @@ -41,7 +41,7 @@ public final class CreateLocalHistoryRequest extends LocalHistoryRequest - implements CreateLocalHistoryRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public CreateLocalHistoryRequestProxyV1() { - // For Externalizable - } - - CreateLocalHistoryRequestProxyV1(final CreateLocalHistoryRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/DestroyLocalHistoryRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/DestroyLocalHistoryRequest.java index e70bd53654..5add5eb054 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/DestroyLocalHistoryRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/DestroyLocalHistoryRequest.java @@ -38,7 +38,7 @@ public final class DestroyLocalHistoryRequest extends LocalHistoryRequest - implements DestroyLocalHistoryRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public DestroyLocalHistoryRequestProxyV1() { - // For Externalizable - } - - DestroyLocalHistoryRequestProxyV1(final DestroyLocalHistoryRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ETS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ETS.java index 8cfc5e29d8..ad8564b33a 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ETS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ETS.java @@ -10,11 +10,16 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link ExistsTransactionSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class ETS implements ExistsTransactionSuccess.SerialForm { +final class ETS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +44,17 @@ final class ETS implements ExistsTransactionSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public void writeExternal(final ObjectOutput out, final ExistsTransactionSuccess msg) throws IOException { + out.writeBoolean(msg.getExists()); + } + + @Override + public ExistsTransactionSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) throws IOException { + return new ExistsTransactionSuccess(target, sequence, in.readBoolean()); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequest.java index 1d16186af0..06c2797ca4 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequest.java @@ -47,6 +47,6 @@ public final class ExistsTransactionRequest extends AbstractReadPathTransactionR @Override protected SerialForm externalizableProxy(final ABIVersion version) { - return ABIVersion.MAGNESIUM.lt(version) ? new ETR(this) : new ExistsTransactionRequestProxyV1(this); + return new ETR(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestProxyV1.java deleted file mode 100644 index 09c1e0a1eb..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionRequestProxyV1.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -/** - * Externalizable proxy for use with {@link ExistsTransactionRequest}. It implements the initial (Boron) serialization - * format. - */ -@Deprecated(since = "7.0.0", forRemoval = true) -final class ExistsTransactionRequestProxyV1 extends AbstractReadPathTransactionRequestProxyV1 - implements ExistsTransactionRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ExistsTransactionRequestProxyV1() { - // For Externalizable - } - - ExistsTransactionRequestProxyV1(final ExistsTransactionRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccess.java index ca5377051a..72dee3aefa 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ExistsTransactionSuccess.java @@ -8,9 +8,6 @@ package org.opendaylight.controller.cluster.access.commands; import com.google.common.base.MoreObjects.ToStringHelper; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -19,19 +16,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * {@link #getExists()}. */ public final class ExistsTransactionSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default ExistsTransactionSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) throws IOException { - return new ExistsTransactionSuccess(target, sequence, in.readBoolean()); - } - - @Override - default void writeExternal(final ObjectOutput out, final ExistsTransactionSuccess msg) throws IOException { - out.writeBoolean(msg.getExists()); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -52,8 +36,8 @@ public final class ExistsTransactionSuccess extends TransactionSuccess - implements ExistsTransactionSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ExistsTransactionSuccessProxyV1() { - // For Externalizable - } - - ExistsTransactionSuccessProxyV1(final ExistsTransactionSuccess request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ITSS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ITSS.java index 178992ab81..7252d58a61 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ITSS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ITSS.java @@ -10,11 +10,14 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link IncrementTransactionSequenceSuccess}. It implements the Chlorine SR2 * serialization format. */ -final class ITSS implements IncrementTransactionSequenceSuccess.SerialForm { +final class ITSS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +42,12 @@ final class ITSS implements IncrementTransactionSequenceSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public IncrementTransactionSequenceSuccess readExternal(final ObjectInput it, final TransactionIdentifier target, + final long sequence) { + return new IncrementTransactionSequenceSuccess(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequest.java index 55a435beee..5695860e17 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequest.java @@ -70,7 +70,7 @@ public final class IncrementTransactionSequenceRequest extends @Override protected SerialForm externalizableProxy(final ABIVersion version) { - return ABIVersion.MAGNESIUM.lt(version) ? new ITSR(this) : new IncrementTransactionSequenceRequestProxyV1(this); + return new ITSR(this); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequestProxyV1.java deleted file mode 100644 index d021c424ba..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceRequestProxyV1.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2017 Pantheon Technologies, s.r.o. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -@Deprecated(since = "7.0.0", forRemoval = true) -final class IncrementTransactionSequenceRequestProxyV1 - extends AbstractReadTransactionRequestProxyV1 - implements IncrementTransactionSequenceRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = -7345885599575376005L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public IncrementTransactionSequenceRequestProxyV1() { - // For Externalizable - } - - IncrementTransactionSequenceRequestProxyV1(final IncrementTransactionSequenceRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccess.java index e462edc4d8..4f27f76563 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccess.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -15,14 +14,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * Successful reply to an {@link IncrementTransactionSequenceRequest}. */ public final class IncrementTransactionSequenceSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default IncrementTransactionSequenceSuccess readExternal(final ObjectInput it, - final TransactionIdentifier target, final long sequence) { - return new IncrementTransactionSequenceSuccess(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -36,8 +27,8 @@ public final class IncrementTransactionSequenceSuccess extends TransactionSucces } @Override - protected SerialForm externalizableProxy(final ABIVersion version) { - return ABIVersion.MAGNESIUM.lt(version) ? new ITSS(this) : new IncrementTransactionSequenceSuccessProxyV1(this); + protected ITSS externalizableProxy(final ABIVersion version) { + return new ITSS(this); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccessProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccessProxyV1.java deleted file mode 100644 index a4e7ad31ee..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/IncrementTransactionSequenceSuccessProxyV1.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -/** - * Externalizable proxy for use with {@link IncrementTransactionSequenceSuccess}. It implements the initial (Boron) - * serialization format. - */ -@Deprecated(since = "7.0.0", forRemoval = true) -final class IncrementTransactionSequenceSuccessProxyV1 - extends AbstractTransactionSuccessProxy - implements IncrementTransactionSequenceSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public IncrementTransactionSequenceSuccessProxyV1() { - // For Externalizable - } - - IncrementTransactionSequenceSuccessProxyV1(final IncrementTransactionSequenceSuccess request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailure.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailure.java index 6f2eda8ba6..fc24d8aeda 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailure.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistoryFailure.java @@ -49,6 +49,6 @@ public final class LocalHistoryFailure extends RequestFailure - implements LocalHistoryFailure.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public LocalHistoryFailureProxyV1() { - // For Externalizable - } - - LocalHistoryFailureProxyV1(final LocalHistoryFailure failure) { - super(failure); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccess.java index a36994937b..7c0e1865c1 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/LocalHistorySuccess.java @@ -49,6 +49,6 @@ public final class LocalHistorySuccess extends RequestSuccess - implements LocalHistorySuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public LocalHistorySuccessProxyV1() { - // For Externalizable - } - - LocalHistorySuccessProxyV1(final LocalHistorySuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/MTS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/MTS.java index 3a46a8a943..ee7e8768ea 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/MTS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/MTS.java @@ -10,11 +10,15 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.IOException; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link ModifyTransactionSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class MTS implements ModifyTransactionSuccess.SerialForm { +final class MTS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +43,12 @@ final class MTS implements ModifyTransactionSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public ModifyTransactionSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) throws IOException { + return new ModifyTransactionSuccess(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequest.java index efa8a77f3d..c83289570d 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionRequest.java @@ -109,7 +109,7 @@ public final class ModifyTransactionRequest extends TransactionRequest - implements ModifyTransactionRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ModifyTransactionRequestProxyV1() { - // For Externalizable - } - - ModifyTransactionRequestProxyV1(final ModifyTransactionRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionSuccess.java index c1620a8666..38adf787b9 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ModifyTransactionSuccess.java @@ -7,8 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.IOException; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -16,14 +14,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * Response to a {@link ModifyTransactionRequest} which does not have a {@link PersistenceProtocol}. */ public final class ModifyTransactionSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default ModifyTransactionSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) throws IOException { - return new ModifyTransactionSuccess(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -36,8 +26,8 @@ public final class ModifyTransactionSuccess extends TransactionSuccess - implements ModifyTransactionSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ModifyTransactionSuccessProxyV1() { - // For Externalizable - } - - ModifyTransactionSuccessProxyV1(final ModifyTransactionSuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/PurgeLocalHistoryRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/PurgeLocalHistoryRequest.java index 81c632f715..c9dc5dc1e7 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/PurgeLocalHistoryRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/PurgeLocalHistoryRequest.java @@ -38,7 +38,7 @@ public final class PurgeLocalHistoryRequest extends LocalHistoryRequest - implements PurgeLocalHistoryRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public PurgeLocalHistoryRequestProxyV1() { - // For Externalizable - } - - PurgeLocalHistoryRequestProxyV1(final PurgeLocalHistoryRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/RTS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/RTS.java index bcf09f80ba..2c808349ea 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/RTS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/RTS.java @@ -10,11 +10,19 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.Optional; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; +import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput; + /** * Externalizable proxy for use with {@link ReadTransactionSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class RTS implements ReadTransactionSuccess.SerialForm { +final class RTS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +47,33 @@ final class RTS implements ReadTransactionSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public ReadTransactionSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) throws IOException { + final Optional data; + if (in.readBoolean()) { + data = Optional.of(NormalizedNodeDataInput.newDataInput(in).readNormalizedNode()); + } else { + data = Optional.empty(); + } + return new ReadTransactionSuccess(target, sequence, data); + } + + @Override + public void writeExternal(final ObjectOutput out, final ReadTransactionSuccess msg) throws IOException { + TransactionSuccess.SerialForm.super.writeExternal(out, msg); + + final var data = msg.getData(); + if (data.isPresent()) { + out.writeBoolean(true); + try (var nnout = msg.getVersion().getStreamVersion().newDataOutput(out)) { + nnout.writeNormalizedNode(data.orElseThrow()); + } + } else { + out.writeBoolean(false); + } + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequest.java index 00ae65b469..292496b7b4 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequest.java @@ -47,6 +47,6 @@ public final class ReadTransactionRequest extends AbstractReadPathTransactionReq @Override protected SerialForm externalizableProxy(final ABIVersion version) { - return ABIVersion.MAGNESIUM.lt(version) ? new RTR(this) : new ReadTransactionRequestProxyV1(this); + return new RTR(this); } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestProxyV1.java deleted file mode 100644 index 8cdbeb0924..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionRequestProxyV1.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.commands; - -/** - * Externalizable proxy for use with {@link ReadTransactionRequest}. It implements the initial (Boron) serialization - * format. - */ -@Deprecated(since = "7.0.0", forRemoval = true) -final class ReadTransactionRequestProxyV1 extends AbstractReadPathTransactionRequestProxyV1 - implements ReadTransactionRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ReadTransactionRequestProxyV1() { - // For Externalizable - } - - ReadTransactionRequestProxyV1(final ReadTransactionRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java index b65473aa38..4f9734f060 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ReadTransactionSuccess.java @@ -10,15 +10,11 @@ package org.opendaylight.controller.cluster.access.commands; import static java.util.Objects.requireNonNull; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; import java.util.Optional; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.SliceableMessage; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; -import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput; /** * Successful reply to an {@link ReadTransactionRequest}. It indicates presence of requested data via @@ -26,35 +22,6 @@ import org.opendaylight.yangtools.yang.data.codec.binfmt.NormalizedNodeDataInput */ public final class ReadTransactionSuccess extends TransactionSuccess implements SliceableMessage { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default ReadTransactionSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) throws IOException { - final Optional data; - if (in.readBoolean()) { - data = Optional.of(NormalizedNodeDataInput.newDataInput(in).readNormalizedNode()); - } else { - data = Optional.empty(); - } - return new ReadTransactionSuccess(target, sequence, data); - } - - @Override - default void writeExternal(final ObjectOutput out, final ReadTransactionSuccess msg) throws IOException { - TransactionSuccess.SerialForm.super.writeExternal(out, msg); - - final var data = msg.getData(); - if (data.isPresent()) { - out.writeBoolean(true); - try (var nnout = msg.getVersion().getStreamVersion().newDataOutput(out)) { - nnout.writeNormalizedNode(data.orElseThrow()); - } - } else { - out.writeBoolean(false); - } - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -77,8 +44,8 @@ public final class ReadTransactionSuccess extends TransactionSuccess - implements ReadTransactionSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public ReadTransactionSuccessProxyV1() { - // For Externalizable - } - - ReadTransactionSuccessProxyV1(final ReadTransactionSuccess request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/STS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/STS.java index c548a4fc45..54897090f5 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/STS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/STS.java @@ -10,11 +10,14 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link SkipTransactionsResponse}. It implements the Chlorine SR2 serialization * format. */ -final class STS implements SkipTransactionsResponse.SerialForm { +final class STS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +42,12 @@ final class STS implements SkipTransactionsResponse.SerialForm { this.message = requireNonNull(message); } + @Override + public SkipTransactionsResponse readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) { + return new SkipTransactionsResponse(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequest.java index 54fdfc581a..a2c037f784 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequest.java @@ -103,7 +103,7 @@ public final class SkipTransactionsRequest extends TransactionRequest - implements SkipTransactionsRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = -7493419007644462643L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public SkipTransactionsRequestV1() { - // For Externalizable - } - - SkipTransactionsRequestV1(final SkipTransactionsRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponse.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponse.java index b2fbc71421..9f3d54d9a6 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponse.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsResponse.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -16,14 +15,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier */ // FIXME: rename to SkipTransactionsSuccess public final class SkipTransactionsResponse extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default SkipTransactionsResponse readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) { - return new SkipTransactionsResponse(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -36,8 +27,8 @@ public final class SkipTransactionsResponse extends TransactionSuccess - implements SkipTransactionsResponse.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public SkipTransactionsResponseProxyV1() { - // For Externalizable - } - - SkipTransactionsResponseProxyV1(final SkipTransactionsResponse success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TAS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TAS.java index c34323bf75..daeee07046 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TAS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TAS.java @@ -10,11 +10,14 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link TransactionAbortSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class TAS implements TransactionAbortSuccess.SerialForm { +final class TAS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +42,12 @@ final class TAS implements TransactionAbortSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public TransactionAbortSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) { + return new TransactionAbortSuccess(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCCS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCCS.java index ab094b3054..22a8a84a3a 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCCS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCCS.java @@ -10,11 +10,14 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link TransactionCanCommitSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class TCCS implements TransactionCanCommitSuccess.SerialForm { +final class TCCS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +42,12 @@ final class TCCS implements TransactionCanCommitSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public TransactionCanCommitSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) { + return new TransactionCanCommitSuccess(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCS.java index 5e0265da33..7f897d82f7 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TCS.java @@ -10,11 +10,14 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link TransactionCommitSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class TCS implements TransactionCommitSuccess.SerialForm { +final class TCS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +42,12 @@ final class TCS implements TransactionCommitSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public TransactionCommitSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) { + return new TransactionCommitSuccess(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPCS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPCS.java index 28c0e95bc3..a64efa1f95 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPCS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPCS.java @@ -10,11 +10,15 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.IOException; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link TransactionPreCommitSuccess}. It implements the Chlorine SR2 serialization * format. */ -final class TPCS implements TransactionPreCommitSuccess.SerialForm { +final class TPCS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +43,12 @@ final class TPCS implements TransactionPreCommitSuccess.SerialForm { this.message = requireNonNull(message); } + @Override + public TransactionPreCommitSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) throws IOException { + return new TransactionPreCommitSuccess(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPS.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPS.java index cff3891a67..1b2f94a74e 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPS.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TPS.java @@ -10,11 +10,14 @@ package org.opendaylight.controller.cluster.access.commands; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; +import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; + /** * Externalizable proxy for use with {@link TransactionPurgeResponse}. It implements the Chlorine SR2 serialization * format. */ -final class TPS implements TransactionPurgeResponse.SerialForm { +final class TPS implements TransactionSuccess.SerialForm { @java.io.Serial private static final long serialVersionUID = 1L; @@ -39,6 +42,12 @@ final class TPS implements TransactionPurgeResponse.SerialForm { this.message = requireNonNull(message); } + @Override + public TransactionPurgeResponse readExternal(final ObjectInput in, final TransactionIdentifier target, + final long sequence) { + return new TransactionPurgeResponse(target, sequence); + } + @Override public Object readResolve() { return message(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequest.java index 6ad73ef427..c9238ab9af 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortRequest.java @@ -37,7 +37,7 @@ public final class TransactionAbortRequest extends TransactionRequest - implements TransactionAbortRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionAbortRequestProxyV1() { - // For Externalizable - } - - TransactionAbortRequestProxyV1(final TransactionAbortRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccess.java index 9f2c4c967b..db92890b1b 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionAbortSuccess.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -18,14 +17,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * @author Robert Varga */ public final class TransactionAbortSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default TransactionAbortSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) { - return new TransactionAbortSuccess(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -38,8 +29,8 @@ public final class TransactionAbortSuccess extends TransactionSuccess - implements TransactionAbortSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionAbortSuccessProxyV1() { - // For Externalizable - } - - TransactionAbortSuccessProxyV1(final TransactionAbortSuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccess.java index 5e9e74f81b..55c5cdb2d6 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCanCommitSuccess.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -18,14 +17,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * @author Robert Varga */ public final class TransactionCanCommitSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default TransactionCanCommitSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) { - return new TransactionCanCommitSuccess(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -38,8 +29,8 @@ public final class TransactionCanCommitSuccess extends TransactionSuccess - implements TransactionCanCommitSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionCanCommitSuccessProxyV1() { - // For Externalizable - } - - TransactionCanCommitSuccessProxyV1(final TransactionCanCommitSuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccess.java index a91fe5c9bf..1fc06da9c9 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionCommitSuccess.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -18,14 +17,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * @author Robert Varga */ public final class TransactionCommitSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default TransactionCommitSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) { - return new TransactionCommitSuccess(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -38,8 +29,8 @@ public final class TransactionCommitSuccess extends TransactionSuccess - implements TransactionCommitSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionCommitSuccessProxyV1() { - // For Externalizable - } - - TransactionCommitSuccessProxyV1(final TransactionCommitSuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequest.java index 9ba1f1d48f..ad7ffad146 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionDoCommitRequest.java @@ -37,7 +37,7 @@ public final class TransactionDoCommitRequest extends TransactionRequest - implements TransactionDoCommitRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionDoCommitRequestProxyV1() { - // For Externalizable - } - - TransactionDoCommitRequestProxyV1(final TransactionDoCommitRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionFailure.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionFailure.java index af8509601a..288a90ee3c 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionFailure.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionFailure.java @@ -49,6 +49,6 @@ public final class TransactionFailure extends RequestFailure - implements TransactionFailure.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionFailureProxyV1() { - // For Externalizable - } - - TransactionFailureProxyV1(final TransactionFailure failure) { - super(failure); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequest.java index 406f659b96..3172842f76 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitRequest.java @@ -38,7 +38,7 @@ public final class TransactionPreCommitRequest extends TransactionRequest - implements TransactionPreCommitRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionPreCommitRequestProxyV1() { - // For Externalizable - } - - TransactionPreCommitRequestProxyV1(final TransactionPreCommitRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccess.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccess.java index 635573ba51..695d261512 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccess.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPreCommitSuccess.java @@ -7,8 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.IOException; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -18,14 +16,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier * @author Robert Varga */ public final class TransactionPreCommitSuccess extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default TransactionPreCommitSuccess readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) throws IOException { - return new TransactionPreCommitSuccess(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -38,8 +28,8 @@ public final class TransactionPreCommitSuccess extends TransactionSuccess - implements TransactionPreCommitSuccess.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionPreCommitSuccessProxyV1() { - // For Externalizable - } - - TransactionPreCommitSuccessProxyV1(final TransactionPreCommitSuccess success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequest.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequest.java index dd26df2529..757c8134a2 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequest.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeRequest.java @@ -39,7 +39,7 @@ public final class TransactionPurgeRequest extends TransactionRequest - implements TransactionPurgeRequest.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionPurgeRequestProxyV1() { - // For Externalizable - } - - TransactionPurgeRequestProxyV1(final TransactionPurgeRequest request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponse.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponse.java index 5b650e60f9..558e414d12 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponse.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/TransactionPurgeResponse.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.cluster.access.commands; -import java.io.ObjectInput; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; @@ -16,14 +15,6 @@ import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier */ // FIXME: rename to TransactionPurgeSuccess public final class TransactionPurgeResponse extends TransactionSuccess { - interface SerialForm extends TransactionSuccess.SerialForm { - @Override - default TransactionPurgeResponse readExternal(final ObjectInput in, final TransactionIdentifier target, - final long sequence) { - return new TransactionPurgeResponse(target, sequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -36,8 +27,8 @@ public final class TransactionPurgeResponse extends TransactionSuccess - implements TransactionPurgeResponse.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public TransactionPurgeResponseProxyV1() { - // For Externalizable - } - - TransactionPurgeResponseProxyV1(final TransactionPurgeResponse success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeProxy.java deleted file mode 100644 index 4de24263b8..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractEnvelopeProxy.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -import static com.google.common.base.Verify.verifyNotNull; -import static java.util.Objects.requireNonNull; - -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractEnvelopeProxy, E extends Envelope> - implements Envelope.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - private E envelope; - - AbstractEnvelopeProxy() { - // for Externalizable - } - - AbstractEnvelopeProxy(final E envelope) { - this.envelope = requireNonNull(envelope); - } - - @Override - public final E envelope() { - return verifyNotNull(envelope); - } - - @Override - public final void setEnvelope(final E envelope) { - this.envelope = requireNonNull(envelope); - } - - @Override - public final Object readResolve() { - return envelope(); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java deleted file mode 100644 index 23deb3b1ee..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractMessageProxy.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -import static com.google.common.base.Verify.verifyNotNull; -import static java.util.Objects.requireNonNull; - -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.WritableIdentifier; - -/** - * Abstract Externalizable proxy for use with {@link Message} subclasses. - * - * @param Target identifier type - * @param Message class - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractMessageProxy> - implements Message.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - private C message; - - protected AbstractMessageProxy() { - // For Externalizable - } - - AbstractMessageProxy(final @NonNull C message) { - this.message = requireNonNull(message); - } - - @Override - public final C message() { - return verifyNotNull(message); - } - - @Override - public final void setMessage(final C message) { - this.message = requireNonNull(message); - } - - @Override - public final Object readResolve() { - return message(); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestFailureProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestFailureProxy.java deleted file mode 100644 index 4cad8a9336..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestFailureProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.WritableIdentifier; - -/** - * Abstract Externalizable proxy for use with {@link RequestFailure} subclasses. - * - * @param Target identifier type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -public abstract class AbstractRequestFailureProxy> - extends AbstractResponseProxy implements RequestFailure.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractRequestFailureProxy() { - // For Externalizable - } - - protected AbstractRequestFailureProxy(final @NonNull C failure) { - super(failure); - } -} \ No newline at end of file diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java deleted file mode 100644 index 4f0e85fc68..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractRequestProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.WritableIdentifier; - -/** - * Abstract Externalizable proxy for use with {@link Request} subclasses. - * - * @param Target identifier type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -public abstract class AbstractRequestProxy> - extends AbstractMessageProxy implements Request.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractRequestProxy() { - // For Externalizable - } - - protected AbstractRequestProxy(final @NonNull C request) { - super(request); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseEnvelopeProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseEnvelopeProxy.java deleted file mode 100644 index 07ea0846e4..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseEnvelopeProxy.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractResponseEnvelopeProxy, E extends ResponseEnvelope> - extends AbstractEnvelopeProxy { - @java.io.Serial - private static final long serialVersionUID = 1L; - - AbstractResponseEnvelopeProxy() { - // for Externalizable - } - - AbstractResponseEnvelopeProxy(final E envelope) { - super(envelope); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseProxy.java deleted file mode 100644 index 22b800023d..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractResponseProxy.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.WritableIdentifier; - -/** - * Abstract Externalizable proxy class to use with {@link Response} subclasses. - * - * @author Robert Varga - * - * @param Target identifier type - * @param Message class - */ -@Deprecated(since = "7.0.0", forRemoval = true) -abstract class AbstractResponseProxy> - extends AbstractMessageProxy { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractResponseProxy() { - // for Externalizable - } - - AbstractResponseProxy(final @NonNull C response) { - super(response); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractSuccessProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractSuccessProxy.java deleted file mode 100644 index 598fa83e93..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/AbstractSuccessProxy.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.yangtools.concepts.WritableIdentifier; - -/** - * Abstract Externalizable proxy for use with {@link RequestSuccess} subclasses. - * - * @param Target identifier type - */ -@Deprecated(since = "7.0.0", forRemoval = true) -public abstract class AbstractSuccessProxy> - extends AbstractResponseProxy { - @java.io.Serial - private static final long serialVersionUID = 1L; - - protected AbstractSuccessProxy() { - // For Externalizable - } - - protected AbstractSuccessProxy(final @NonNull C success) { - super(success); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java index 7524985d4f..eed7b53741 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Envelope.java @@ -16,7 +16,6 @@ import java.io.ObjectInput; import java.io.ObjectOutput; import java.io.Serializable; import org.eclipse.jdt.annotation.NonNull; -import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.concepts.Immutable; import org.opendaylight.yangtools.concepts.WritableObjects; @@ -101,11 +100,8 @@ public abstract class Envelope> implements Immutable, Se @java.io.Serial final Object writeReplace() { - return ABIVersion.MAGNESIUM.lt(message.getVersion()) ? createProxy() : legacyProxy(); + return createProxy(); } abstract @NonNull SerialForm createProxy(); - - @Deprecated(since = "7.0.0", forRemoval = true) - abstract @NonNull AbstractEnvelopeProxy legacyProxy(); } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelope.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelope.java index 4de13ac8f8..5342d05f5e 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelope.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelope.java @@ -7,17 +7,7 @@ */ package org.opendaylight.controller.cluster.access.concepts; -import java.io.ObjectInput; - public final class FailureEnvelope extends ResponseEnvelope> { - interface SerialForm extends ResponseEnvelope.SerialForm, FailureEnvelope> { - @Override - default FailureEnvelope readExternal(final ObjectInput in, final long sessionId, final long txSequence, - final RequestFailure message, final long executionTimeNanos) { - return new FailureEnvelope(message, sessionId, txSequence, executionTimeNanos); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -30,9 +20,4 @@ public final class FailureEnvelope extends ResponseEnvelope FE createProxy() { return new FE(this); } - - @Override - FailureEnvelopeProxy legacyProxy() { - return new FailureEnvelopeProxy(this); - } } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeProxy.java deleted file mode 100644 index a41c10953f..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeProxy.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -@Deprecated(since = "7.0.0", forRemoval = true) -final class FailureEnvelopeProxy extends AbstractResponseEnvelopeProxy, FailureEnvelope> - implements FailureEnvelope.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to be - // able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public FailureEnvelopeProxy() { - // for Externalizable - } - - FailureEnvelopeProxy(final FailureEnvelope envelope) { - super(envelope); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java index 537b391de9..ec10da1c65 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/Message.java @@ -151,7 +151,7 @@ public abstract class Message verifyNotNull(cloneAsVersion(toVersion)); + case CHLORINE_SR2 -> verifyNotNull(cloneAsVersion(toVersion)); default -> throw new IllegalArgumentException("Unhandled ABI version " + toVersion); }; } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RE.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RE.java index 455e00e558..27bf825526 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RE.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RE.java @@ -10,10 +10,12 @@ package org.opendaylight.controller.cluster.access.concepts; import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; +import java.io.ObjectInput; + /** * Serialization proxy for {@link RequestEnvelope}. */ -final class RE implements RequestEnvelope.SerialForm { +final class RE implements Envelope.SerialForm, RequestEnvelope> { @java.io.Serial private static final long serialVersionUID = 1L; @@ -38,6 +40,12 @@ final class RE implements RequestEnvelope.SerialForm { this.envelope = requireNonNull(envelope); } + @Override + public RequestEnvelope readExternal(final ObjectInput in, final long sessionId, final long txSequence, + final Request message) { + return new RequestEnvelope(message, sessionId, txSequence); + } + @Override public Object readResolve() { return envelope(); diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelope.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelope.java index 5648846fd9..e8983697cf 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelope.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelope.java @@ -8,17 +8,8 @@ package org.opendaylight.controller.cluster.access.concepts; import akka.actor.ActorRef; -import java.io.ObjectInput; public final class RequestEnvelope extends Envelope> { - interface SerialForm extends Envelope.SerialForm, RequestEnvelope> { - @Override - default RequestEnvelope readExternal(final ObjectInput in, final long sessionId, final long txSequence, - final Request message) { - return new RequestEnvelope(message, sessionId, txSequence); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -31,11 +22,6 @@ public final class RequestEnvelope extends Envelope> { return new RE(this); } - @Override - RequestEnvelopeProxy legacyProxy() { - return new RequestEnvelopeProxy(this); - } - /** * Respond to this envelope with a {@link RequestFailure} caused by specified {@link RequestException}. * diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeProxy.java deleted file mode 100644 index 486441b532..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/RequestEnvelopeProxy.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -@Deprecated(since = "7.0.0", forRemoval = true) -final class RequestEnvelopeProxy extends AbstractEnvelopeProxy, RequestEnvelope> - implements RequestEnvelope.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public RequestEnvelopeProxy() { - // for Externalizable - } - - RequestEnvelopeProxy(final RequestEnvelope envelope) { - super(envelope); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SE.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SE.java index 59615a474c..3e8ce6f256 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SE.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SE.java @@ -15,7 +15,7 @@ import java.io.ObjectInput; /** * Serialization proxy for {@link SuccessEnvelope}. */ -final class SE implements SuccessEnvelope.SerialForm { +final class SE implements ResponseEnvelope.SerialForm, SuccessEnvelope> { @java.io.Serial private static final long serialVersionUID = 1L; diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelope.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelope.java index 0c6ed7a112..2644c6ff0f 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelope.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelope.java @@ -7,17 +7,7 @@ */ package org.opendaylight.controller.cluster.access.concepts; -import java.io.ObjectInput; - public final class SuccessEnvelope extends ResponseEnvelope> { - interface SerialForm extends ResponseEnvelope.SerialForm, SuccessEnvelope> { - @Override - default SuccessEnvelope readExternal(final ObjectInput in, final long sessionId, final long txSequence, - final RequestSuccess message, final long executionTimeNanos) { - return new SuccessEnvelope(message, sessionId, txSequence, executionTimeNanos); - } - } - @java.io.Serial private static final long serialVersionUID = 1L; @@ -30,10 +20,4 @@ public final class SuccessEnvelope extends ResponseEnvelope SE createProxy() { return new SE(this); } - - @Override - SuccessEnvelopeProxy legacyProxy() { - return new SuccessEnvelopeProxy(this); - } - } diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeProxy.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeProxy.java deleted file mode 100644 index ebaec25d7b..0000000000 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/concepts/SuccessEnvelopeProxy.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.cluster.access.concepts; - -@Deprecated(since = "7.0.0", forRemoval = true) -final class SuccessEnvelopeProxy extends AbstractResponseEnvelopeProxy, SuccessEnvelope> - implements SuccessEnvelope.SerialForm { - @java.io.Serial - private static final long serialVersionUID = 1L; - - // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to - // be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public SuccessEnvelopeProxy() { - // for Externalizable - } - - SuccessEnvelopeProxy(final SuccessEnvelope envelope) { - super(envelope); - } -} diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/ABIVersionTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/ABIVersionTest.java index 8c2ff3bbb7..a48e83d1b7 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/ABIVersionTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/ABIVersionTest.java @@ -10,7 +10,7 @@ package org.opendaylight.controller.cluster.access; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThrows; import static org.junit.Assert.assertTrue; -import static org.opendaylight.controller.cluster.access.ABIVersion.MAGNESIUM; +import static org.opendaylight.controller.cluster.access.ABIVersion.CHLORINE_SR2; import static org.opendaylight.controller.cluster.access.ABIVersion.TEST_FUTURE_VERSION; import static org.opendaylight.controller.cluster.access.ABIVersion.TEST_PAST_VERSION; @@ -23,15 +23,15 @@ public class ABIVersionTest { @Test public void testInvalidVersions() { assertTrue(TEST_PAST_VERSION.compareTo(TEST_FUTURE_VERSION) < 0); - assertTrue(TEST_PAST_VERSION.compareTo(MAGNESIUM) < 0); - assertTrue(TEST_FUTURE_VERSION.compareTo(MAGNESIUM) > 0); + assertTrue(TEST_PAST_VERSION.compareTo(CHLORINE_SR2) < 0); + assertTrue(TEST_FUTURE_VERSION.compareTo(CHLORINE_SR2) > 0); } @Test public void testMagnesiumVersion() throws Exception { - assertEquals((short)8, MAGNESIUM.shortValue()); - assertEquals(MAGNESIUM, ABIVersion.valueOf(MAGNESIUM.shortValue())); - assertEquals(MAGNESIUM, ABIVersion.readFrom(ByteStreams.newDataInput(writeVersion(MAGNESIUM)))); + assertEquals((short)9, CHLORINE_SR2.shortValue()); + assertEquals(CHLORINE_SR2, ABIVersion.valueOf(CHLORINE_SR2.shortValue())); + assertEquals(CHLORINE_SR2, ABIVersion.readFrom(ByteStreams.newDataInput(writeVersion(CHLORINE_SR2)))); } @Test diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java index 5fa55d8062..48465208e2 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbortLocalTransactionRequestTest.java @@ -27,7 +27,7 @@ public class AbortLocalTransactionRequestTest private static final AbortLocalTransactionRequest OBJECT = new AbortLocalTransactionRequest(TRANSACTION, ACTOR_REF); public AbortLocalTransactionRequestTest() { - super(OBJECT, 0, 0); + super(OBJECT); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java index fbd8489a96..1cb9af38a0 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractLocalTransactionRequestTest.java @@ -20,13 +20,13 @@ import org.opendaylight.controller.cluster.access.ABIVersion; public abstract class AbstractLocalTransactionRequestTest> extends AbstractTransactionRequestTest { - protected AbstractLocalTransactionRequestTest(final T object, final int baseSize, final int legacySize) { - super(object, baseSize, legacySize); + protected AbstractLocalTransactionRequestTest(final T object) { + super(object, -1); } @Test public void cloneAsVersionTest() { - assertSame(object(), object().cloneAsVersion(ABIVersion.MAGNESIUM)); + assertSame(object(), object().cloneAsVersion(ABIVersion.TEST_FUTURE_VERSION)); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java index 78d7fabdf7..df8407b3f0 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractReadTransactionRequestTest.java @@ -20,8 +20,8 @@ public abstract class AbstractReadTransactionRequestTest> private final T object; private final int expectedSize; - private final int legacySize; - protected AbstractRequestFailureTest(final T object, final int baseSize, final int legacySize) { + protected AbstractRequestFailureTest(final T object, final int baseSize) { this.object = requireNonNull(object); this.expectedSize = baseSize + CAUSE_SIZE; - this.legacySize = legacySize + CAUSE_SIZE; } @Test @@ -59,7 +56,6 @@ public abstract class AbstractRequestFailureTest> public void serializationTest() { final var bytes = SerializationUtils.serialize(object); assertEquals(expectedSize, bytes.length); - assertEquals(legacySize, SerializationUtils.serialize(object.toVersion(ABIVersion.MAGNESIUM)).length); @SuppressWarnings("unchecked") final var deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java index 771ef213e2..b0038758c7 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractRequestSuccessTest.java @@ -13,7 +13,6 @@ import static org.junit.Assert.assertEquals; import org.apache.commons.lang3.SerializationUtils; import org.eclipse.jdt.annotation.NonNull; import org.junit.Test; -import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendIdentifier; import org.opendaylight.controller.cluster.access.concepts.FrontendType; @@ -29,19 +28,16 @@ public abstract class AbstractRequestSuccessTest> private final @NonNull T object; private final int expectedSize; - private final int legacySize; - protected AbstractRequestSuccessTest(final T object, final int expectedSize, final int legacySize) { + protected AbstractRequestSuccessTest(final T object, final int expectedSize) { this.object = requireNonNull(object); this.expectedSize = expectedSize; - this.legacySize = legacySize; } @Test public void serializationTest() { final var bytes = SerializationUtils.serialize(object); assertEquals(expectedSize, bytes.length); - assertEquals(legacySize, SerializationUtils.serialize(object.toVersion(ABIVersion.MAGNESIUM)).length); @SuppressWarnings("unchecked") final var deserialize = (T) SerializationUtils.deserialize(bytes); diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java index b07bee69f5..f276ac3937 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/commands/AbstractTransactionRequestTest.java @@ -29,8 +29,8 @@ public abstract class AbstractTransactionRequestTest ALTERNATES = ImmutableList.of(ACTOR_SELECTION); private static final int MAX_MESSAGES = 10; @@ -41,7 +40,7 @@ public class ConnectClientSuccessTest extends AbstractRequestSuccessTest> { private static final ActorSystem SYSTEM = ActorSystem.create("test"); @@ -30,12 +29,10 @@ public abstract class AbstractRequestTest> { private final T object; private final int expectedSize; - private final int legacySize; - protected AbstractRequestTest(final T object, final int baseSize, final int legacySize) { + protected AbstractRequestTest(final T object, final int baseSize) { this.object = requireNonNull(object); this.expectedSize = baseSize + ACTOR_REF_SIZE; - this.legacySize = legacySize + ACTOR_REF_SIZE; } protected final T object() { @@ -60,8 +57,6 @@ public abstract class AbstractRequestTest> { @Test public void serializationTest() { - assertEquals(legacySize, SerializationUtils.serialize(object.cloneAsVersion(ABIVersion.MAGNESIUM)).length); - final byte[] bytes = SerializationUtils.serialize(object); assertEquals(expectedSize, bytes.length); @SuppressWarnings("unchecked") diff --git a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java index 3c1a591be8..70132a6c05 100644 --- a/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java +++ b/opendaylight/md-sal/cds-access-api/src/test/java/org/opendaylight/controller/cluster/access/concepts/FailureEnvelopeTest.java @@ -7,6 +7,8 @@ */ package org.opendaylight.controller.cluster.access.concepts; +import static com.google.common.base.Verify.verifyNotNull; +import static java.util.Objects.requireNonNull; import static org.junit.Assert.assertEquals; import java.io.DataInput; @@ -21,7 +23,7 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { final var cause = new RuntimeRequestException("msg", new RuntimeException()); final int causeSize = SerializationUtils.serialize(cause).length; return new EnvelopeDetails<>(new FailureEnvelope(new MockFailure(OBJECT, cause, 42), 1L, 2L, 11L), - causeSize + 485); + causeSize + 216); } @Override @@ -33,17 +35,19 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { assertEquals(expectedCause.isRetriable(), actualCause.isRetriable()); } - private static class MockRequestFailureProxy extends AbstractRequestFailureProxy { + private static class MockRequestFailureProxy implements RequestFailure.SerialForm { @java.io.Serial private static final long serialVersionUID = 5015515628523887221L; + private MockFailure message; + @SuppressWarnings("checkstyle:RedundantModifier") public MockRequestFailureProxy() { //For Externalizable } private MockRequestFailureProxy(final MockFailure mockFailure) { - super(mockFailure); + message = requireNonNull(mockFailure); } @Override @@ -56,6 +60,21 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { public WritableIdentifier readTarget(final DataInput in) throws IOException { return TransactionIdentifier.readFrom(in); } + + @Override + public MockFailure message() { + return verifyNotNull(message); + } + + @Override + public void setMessage(final MockFailure message) { + this.message = requireNonNull(message); + } + + @Override + public Object readResolve() { + return message(); + } } private static class MockFailure extends RequestFailure { @@ -67,7 +86,7 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { } @Override - protected AbstractRequestFailureProxy externalizableProxy( + protected RequestFailure.SerialForm externalizableProxy( final ABIVersion version) { return new MockRequestFailureProxy(this); } diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java index d566e0ec3b..f77500328d 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectingClientConnectionTest.java @@ -38,8 +38,6 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.cluster.access.ABIVersion; -import org.opendaylight.controller.cluster.access.concepts.AbstractRequestFailureProxy; -import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy; import org.opendaylight.controller.cluster.access.concepts.FailureEnvelope; import org.opendaylight.controller.cluster.access.concepts.Request; import org.opendaylight.controller.cluster.access.concepts.RequestEnvelope; @@ -64,8 +62,7 @@ public class ConnectingClientConnectionTest { } @Override - protected AbstractRequestFailureProxy externalizableProxy( - final ABIVersion version) { + protected SerialForm externalizableProxy(final ABIVersion version) { return null; } @@ -88,7 +85,7 @@ public class ConnectingClientConnectionTest { } @Override - protected AbstractRequestProxy externalizableProxy(final ABIVersion version) { + protected Request.SerialForm externalizableProxy(final ABIVersion version) { return null; } diff --git a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java index 2d1afb81ad..b3bfdec66e 100644 --- a/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java +++ b/opendaylight/md-sal/cds-access-client/src/test/java/org/opendaylight/controller/cluster/access/client/ConnectionEntryTest.java @@ -26,8 +26,6 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.opendaylight.controller.cluster.access.ABIVersion; -import org.opendaylight.controller.cluster.access.concepts.AbstractRequestFailureProxy; -import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy; import org.opendaylight.controller.cluster.access.concepts.Request; import org.opendaylight.controller.cluster.access.concepts.RequestException; import org.opendaylight.controller.cluster.access.concepts.RequestFailure; @@ -47,8 +45,7 @@ public class ConnectionEntryTest { } @Override - protected AbstractRequestFailureProxy externalizableProxy( - final ABIVersion version) { + protected SerialForm externalizableProxy(final ABIVersion version) { return null; } @@ -71,7 +68,7 @@ public class ConnectionEntryTest { } @Override - protected AbstractRequestProxy externalizableProxy(final ABIVersion version) { + protected Request.SerialForm externalizableProxy(final ABIVersion version) { return null; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractShardBackendResolver.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractShardBackendResolver.java index 95089119e4..cdb1ac9c3a 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractShardBackendResolver.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/databroker/actors/dds/AbstractShardBackendResolver.java @@ -97,7 +97,7 @@ abstract class AbstractShardBackendResolver extends BackendInfoResolver new ConnectClientRequest(clientId, t, ABIVersion.MAGNESIUM, + connectFunction = ExplicitAsk.toScala(t -> new ConnectClientRequest(clientId, t, ABIVersion.CHLORINE_SR2, ABIVersion.current())); } @@ -107,7 +107,7 @@ abstract class AbstractShardBackendResolver extends BackendInfoResolver staleBackendInfoCallbacks.remove(callback); } - protected void notifyStaleBackendInfoCallbacks(Long cookie) { + protected void notifyStaleBackendInfoCallbacks(final Long cookie) { staleBackendInfoCallbacks.forEach(callback -> callback.accept(cookie)); } -- 2.36.6