X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-distributed-datastore%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fcluster%2Fdatastore%2Fpersisted%2FSkipTransactionsPayload.java;h=a8fb52c4b97d06f1c91b3a28b7c03d7175a6685f;hb=HEAD;hp=085774592b72a3d1c1888157a6b8f854e0c74609;hpb=0f88bd70a92ec2b536b0633a6ba4e6733cee475d;p=controller.git diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayload.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayload.java index 085774592b..a8fb52c4b9 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayload.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/SkipTransactionsPayload.java @@ -7,17 +7,14 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; -import static com.google.common.base.Verify.verifyNotNull; import static java.util.Objects.requireNonNull; import com.google.common.io.ByteStreams; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import java.io.DataInput; import java.io.IOException; import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.controller.cluster.access.concepts.LocalHistoryIdentifier; import org.opendaylight.controller.cluster.datastore.utils.ImmutableUnsignedLongSet; -import org.opendaylight.controller.cluster.raft.persisted.LegacySerializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,45 +23,7 @@ import org.slf4j.LoggerFactory; * for other purposes. It contains a {@link LocalHistoryIdentifier} and a list of transaction identifiers within that * local history. */ -public sealed class SkipTransactionsPayload extends AbstractIdentifiablePayload { - private static final class Magnesium extends SkipTransactionsPayload implements LegacySerializable { - @java.io.Serial - private static final long serialVersionUID = 1L; - - Magnesium(final LocalHistoryIdentifier historyId, final byte[] serialized, - final ImmutableUnsignedLongSet transactionIds) { - super(historyId, serialized, transactionIds); - } - } - - @Deprecated(since = "7.0.0", forRemoval = true) - private static final class Proxy extends AbstractProxy { - @java.io.Serial - private static final long serialVersionUID = 1L; - - private ImmutableUnsignedLongSet transactionIds; - - // checkstyle flags the public modifier as redundant which really doesn't make sense since it clearly isn't - // redundant. It is explicitly needed for Java serialization to be able to create instances via reflection. - @SuppressWarnings("checkstyle:RedundantModifier") - public Proxy() { - // For Externalizable - } - - @Override - protected LocalHistoryIdentifier readIdentifier(final DataInput in) throws IOException { - final var id = LocalHistoryIdentifier.readFrom(in); - transactionIds = ImmutableUnsignedLongSet.readFrom(in); - return id; - } - - @Override - protected SkipTransactionsPayload createObject(final LocalHistoryIdentifier identifier, - final byte[] serialized) { - return new Magnesium(identifier, serialized, verifyNotNull(transactionIds)); - } - } - +public final class SkipTransactionsPayload extends AbstractIdentifiablePayload { private static final Logger LOG = LoggerFactory.getLogger(SkipTransactionsPayload.class); @java.io.Serial private static final long serialVersionUID = 1L;