From: Robert Varga Date: Mon, 28 Nov 2022 17:38:48 +0000 (+0100) Subject: Add serialVersionUID fields X-Git-Tag: v7.0.0~33 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0597bd64ca6214fd3ca3fb152ab2ca7fd3b32ed5 Add serialVersionUID fields We are missing a few definitions and are about to modify the classes in backwards-compatible ways, but the changes would end up changing the versions. Make sure to define generated serialVersionUIDs. JIRA: CONTROLLER-2051 JIRA: CONTROLLER-2056 Change-Id: I006f51e16dd3fee66fb9c344bb99235780b08d3e Signed-off-by: Robert Varga --- diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureProxyV1.java index 55efb283c0..84a10dae16 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureProxyV1.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientFailureProxyV1.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.cluster.access.commands; import java.io.DataInput; import java.io.IOException; +import java.io.Serial; import org.opendaylight.controller.cluster.access.concepts.AbstractRequestFailureProxy; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; import org.opendaylight.controller.cluster.access.concepts.RequestException; @@ -20,6 +21,9 @@ import org.opendaylight.controller.cluster.access.concepts.RequestException; * @author Robert Varga */ final class ConnectClientFailureProxyV1 extends AbstractRequestFailureProxy { + @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") diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java index da3a601db7..b420125b83 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/ConnectClientRequestProxyV1.java @@ -12,6 +12,7 @@ import java.io.DataInput; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.controller.cluster.access.concepts.AbstractRequestProxy; import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; @@ -23,6 +24,9 @@ import org.opendaylight.controller.cluster.access.concepts.ClientIdentifier; * @author Robert Varga */ final class ConnectClientRequestProxyV1 extends AbstractRequestProxy { + @Serial + private static final long serialVersionUID = 8439729661327852159L; + private ABIVersion minVersion; private ABIVersion maxVersion; @@ -35,8 +39,8 @@ final class ConnectClientRequestProxyV1 extends AbstractRequestProxy { + @Serial + private static final long serialVersionUID = -7345885599575376005L; + private long increment; // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to @@ -27,7 +31,7 @@ final class IncrementTransactionSequenceRequestProxyV1 IncrementTransactionSequenceRequestProxyV1(final IncrementTransactionSequenceRequest request) { super(request); - this.increment = request.getIncrement(); + increment = request.getIncrement(); } @Override diff --git a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestV1.java b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestV1.java index c7c383cf8d..26d660f1d9 100644 --- a/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestV1.java +++ b/opendaylight/md-sal/cds-access-api/src/main/java/org/opendaylight/controller/cluster/access/commands/SkipTransactionsRequestV1.java @@ -13,6 +13,7 @@ import com.google.common.primitives.UnsignedLong; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.io.Serial; import java.util.List; import org.opendaylight.controller.cluster.access.concepts.TransactionIdentifier; import org.opendaylight.yangtools.concepts.WritableObjects; @@ -22,6 +23,9 @@ import org.opendaylight.yangtools.concepts.WritableObjects; * (Phosphorus SR1) serialization format. */ final class SkipTransactionsRequestV1 extends AbstractTransactionRequestProxy { + @Serial + private static final long serialVersionUID = -7493419007644462643L; + private List others; // checkstyle flags the public modifier as redundant however it is explicitly needed for Java serialization to 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 733c3c7525..93f93b6d49 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 @@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals; import java.io.DataInput; import java.io.IOException; +import java.io.Serial; import org.opendaylight.controller.cluster.access.ABIVersion; import org.opendaylight.yangtools.concepts.WritableIdentifier; @@ -33,6 +34,8 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { } private static class MockRequestFailureProxy extends AbstractRequestFailureProxy { + @Serial + private static final long serialVersionUID = 5015515628523887221L; @SuppressWarnings("checkstyle:RedundantModifier") public MockRequestFailureProxy() { @@ -53,10 +56,10 @@ public class FailureEnvelopeTest extends AbstractEnvelopeTest { protected WritableIdentifier readTarget(final DataInput in) throws IOException { return TransactionIdentifier.readFrom(in); } - } private static class MockFailure extends RequestFailure { + @Serial private static final long serialVersionUID = 1L; MockFailure(final WritableIdentifier target, final RequestException cause, final long sequence) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java index 3b58458e1a..8d3fb17c20 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/AbortTransactionReply.java @@ -5,12 +5,13 @@ * 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.datastore.messages; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; public class AbortTransactionReply extends VersionedExternalizableMessage { + @java.io.Serial + private static final long serialVersionUID = 7251132353204199793L; private static final AbortTransactionReply INSTANCE = new AbortTransactionReply(); public AbortTransactionReply() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java index f346cba433..51fa29f113 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CanCommitTransactionReply.java @@ -15,6 +15,9 @@ import java.io.ObjectOutput; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; public class CanCommitTransactionReply extends VersionedExternalizableMessage { + @java.io.Serial + private static final long serialVersionUID = 4355566635423934872L; + private static final CanCommitTransactionReply YES = new CanCommitTransactionReply(true, DataStoreVersions.CURRENT_VERSION); private static final CanCommitTransactionReply NO = diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java index cd3a13a9f7..1dd8e8ec8f 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/CommitTransactionReply.java @@ -5,12 +5,14 @@ * 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.datastore.messages; import org.opendaylight.controller.cluster.datastore.DataStoreVersions; public class CommitTransactionReply extends VersionedExternalizableMessage { + @java.io.Serial + private static final long serialVersionUID = -8342450250867395000L; + public static final CommitTransactionReply INSTANCE = new CommitTransactionReply(); public CommitTransactionReply() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/EmptyExternalizable.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/EmptyExternalizable.java index c7ee83a819..79f97e84be 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/EmptyExternalizable.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/messages/EmptyExternalizable.java @@ -17,6 +17,8 @@ import java.io.ObjectOutput; * @author Thomas Pantelis */ public class EmptyExternalizable implements Externalizable { + @java.io.Serial + private static final long serialVersionUID = 8413772905242947276L; @Override public void readExternal(ObjectInput in) { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java index 33bd4d45e1..2645a03538 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/modification/AbstractModification.java @@ -14,6 +14,8 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; * Base class to be used for all simple modifications that can be applied to a DOMStoreTransaction. */ public abstract class AbstractModification implements Modification { + @java.io.Serial + private static final long serialVersionUID = 2647778426312509718L; private YangInstanceIdentifier path; private short version; diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DisableTrackingPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DisableTrackingPayload.java index d8684fef98..318df05d92 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DisableTrackingPayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DisableTrackingPayload.java @@ -17,6 +17,9 @@ import org.slf4j.LoggerFactory; public final class DisableTrackingPayload extends AbstractIdentifiablePayload { private static final class Proxy extends AbstractProxy { + @java.io.Serial + private static final long serialVersionUID = -5490519942445085251L; + @SuppressWarnings("checkstyle:RedundantModifier") public Proxy() { // For Externalizable diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java index 22d844a221..28fe35e9dd 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshotTest.java @@ -123,6 +123,9 @@ public class ShardDataTreeSnapshotTest { } private static class Proxy implements Externalizable { + @java.io.Serial + private static final long serialVersionUID = 7534948936595056176L; + private String data; @SuppressWarnings("checkstyle:RedundantModifier")