From e326c615c459b24d1d9d696c645ad0e79c479d9f Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 29 May 2019 18:23:04 +0200 Subject: [PATCH] Bump persisted PayloadVersion Since the NormalizedNodeStream format has changed, shard persisted state is affected. This patch bumps PayloadVersion and applies that bump to snapshots and CommitTransactionPayload. On recovery, a snapshot's need to migrate is reflected in its state, and it is examined just as MigratedSerializables are. CommitTransactionPayload is not examined, as understanding its stream version would require deserializing at least its header. JIRA: CONTROLLER-1888 Change-Id: I678527be4487ee1729123ba8b9dcd2269e6cf262 Signed-off-by: Robert Varga (cherry picked from commit 2658d126f67512fcaac684d2ccb7197fe12f61f4) --- .../raft/RaftActorRecoverySupport.java | 15 ++++-- .../cluster/raft/persisted/Snapshot.java | 9 ++++ .../datastore/ShardSnapshotCohort.java | 2 +- ...bstractVersionedShardDataTreeSnapshot.java | 30 ++++++----- .../DataTreeCandidateInputOutput.java | 7 +-- .../MetadataShardDataTreeSnapshot.java | 10 ++-- .../datastore/persisted/PayloadVersion.java | 52 ++++++++++++++++--- .../persisted/ShardDataTreeSnapshot.java | 6 +-- .../persisted/ShardSnapshotState.java | 18 +++++-- .../actors/ShardSnapshotActorTest.java | 2 +- .../CommitTransactionPayloadTest.java | 2 +- .../persisted/ShardDataTreeSnapshotTest.java | 14 ++--- 12 files changed, 118 insertions(+), 49 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java index d94fd293be..873b8514a2 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/RaftActorRecoverySupport.java @@ -19,6 +19,7 @@ import org.opendaylight.controller.cluster.raft.persisted.EmptyState; import org.opendaylight.controller.cluster.raft.persisted.MigratedSerializable; import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload; import org.opendaylight.controller.cluster.raft.persisted.Snapshot; +import org.opendaylight.controller.cluster.raft.persisted.Snapshot.State; import org.opendaylight.controller.cluster.raft.persisted.UpdateElectionTerm; import org.opendaylight.controller.cluster.raft.protobuff.client.messages.PersistentPayload; import org.slf4j.Logger; @@ -136,11 +137,15 @@ class RaftActorRecoverySupport { context.setCommitIndex(snapshot.getLastAppliedIndex()); context.getTermInformation().update(snapshot.getElectionTerm(), snapshot.getElectionVotedFor()); - Stopwatch timer = Stopwatch.createStarted(); + final Stopwatch timer = Stopwatch.createStarted(); // Apply the snapshot to the actors state - if (!(snapshot.getState() instanceof EmptyState)) { - cohort.applyRecoverySnapshot(snapshot.getState()); + final State snapshotState = snapshot.getState(); + if (snapshotState.needsMigration()) { + hasMigratedDataRecovered = true; + } + if (!(snapshotState instanceof EmptyState)) { + cohort.applyRecoverySnapshot(snapshotState); } if (snapshot.getServerConfiguration() != null) { @@ -149,8 +154,8 @@ class RaftActorRecoverySupport { timer.stop(); log.info("Recovery snapshot applied for {} in {}: snapshotIndex={}, snapshotTerm={}, journal-size={}", - context.getId(), timer.toString(), replicatedLog().getSnapshotIndex(), - replicatedLog().getSnapshotTerm(), replicatedLog().size()); + context.getId(), timer, replicatedLog().getSnapshotIndex(), replicatedLog().getSnapshotTerm(), + replicatedLog().size()); } private void onRecoveredJournalLogEntry(final ReplicatedLogEntry logEntry) { diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/Snapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/Snapshot.java index 42a4a8de81..091009e2bd 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/Snapshot.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/persisted/Snapshot.java @@ -31,6 +31,15 @@ public class Snapshot implements Serializable { * @author Thomas Pantelis */ public interface State extends Serializable { + /** + * Indicate whether the snapshot requires migration, i.e. a new snapshot should be created after recovery. + * Default implementation returns false, i.e. do not re-snapshot. + * + * @return True if complete recovery based upon this snapshot should trigger a new snapshot. + */ + default boolean needsMigration() { + return false; + } } private static final class Proxy implements Externalizable { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java index 3ed3a48770..e936d4389b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/ShardSnapshotCohort.java @@ -99,7 +99,7 @@ final class ShardSnapshotCohort implements RaftActorSnapshotCohort { @Override public State deserializeSnapshot(final ByteSource snapshotBytes) throws IOException { try (ObjectInputStream in = new ObjectInputStream(snapshotBytes.openStream())) { - return new ShardSnapshotState(ShardDataTreeSnapshot.deserialize(in)); + return ShardDataTreeSnapshot.deserialize(in); } } } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java index 7ebb0055f2..e6f2b9dacf 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/AbstractVersionedShardDataTreeSnapshot.java @@ -27,27 +27,30 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps private static final Logger LOG = LoggerFactory.getLogger(AbstractVersionedShardDataTreeSnapshot.class); @SuppressWarnings("checkstyle:FallThrough") - static ShardDataTreeSnapshot versionedDeserialize(final ObjectInput in) throws IOException { + @Nonnull static ShardSnapshotState versionedDeserialize(final ObjectInput in) throws IOException { final PayloadVersion version = PayloadVersion.readFrom(in); switch (version) { case BORON: - // Boron snapshots use Java Serialization - try { - return (ShardDataTreeSnapshot) in.readObject(); - } catch (ClassNotFoundException e) { - LOG.error("Failed to serialize data tree snapshot", e); - throw new IOException("Snapshot failed to deserialize", e); - } + return new ShardSnapshotState(readSnapshot(in), true); + case SODIUM: + return new ShardSnapshotState(readSnapshot(in), false); case TEST_FUTURE_VERSION: case TEST_PAST_VERSION: // These versions are never returned and this code is effectively dead - break; default: - throw new IOException("Invalid payload version in snapshot"); + // Not included as default in above switch to ensure we get warnings when new versions are added + throw new IOException("Encountered unhandled version" + version); } + } - // Not included as default in above switch to ensure we get warnings when new versions are added - throw new IOException("Encountered unhandled version" + version); + // Boron and Sodium snapshots use Java Serialization, but differ in stream format + @Nonnull private static ShardDataTreeSnapshot readSnapshot(final ObjectInput in) throws IOException { + try { + return (ShardDataTreeSnapshot) in.readObject(); + } catch (ClassNotFoundException e) { + LOG.error("Failed to serialize data tree snapshot", e); + throw new IOException("Snapshot failed to deserialize", e); + } } @Override @@ -74,7 +77,8 @@ abstract class AbstractVersionedShardDataTreeSnapshot extends ShardDataTreeSnaps private void versionedSerialize(final ObjectOutput out, final PayloadVersion version) throws IOException { switch (version) { case BORON: - // Boron snapshots use Java Serialization + case SODIUM: + // Boron and Sodium snapshots use Java Serialization, but differ in stream format out.writeObject(this); return; case TEST_FUTURE_VERSION: diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DataTreeCandidateInputOutput.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DataTreeCandidateInputOutput.java index bc1fca1655..cb833c1483 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DataTreeCandidateInputOutput.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/DataTreeCandidateInputOutput.java @@ -129,7 +129,6 @@ public final class DataTreeCandidateInputOutput { return DataTreeCandidates.newDataTreeCandidate(rootPath, rootNode); } - private static void writeChildren(final NormalizedNodeDataOutput out, final Collection children) throws IOException { out.writeInt(children.size()); @@ -172,8 +171,10 @@ public final class DataTreeCandidateInputOutput { } } - public static void writeDataTreeCandidate(final DataOutput out, DataTreeCandidate candidate) throws IOException { - try (NormalizedNodeDataOutput writer = NormalizedNodeInputOutput.newDataOutput(out)) { + public static void writeDataTreeCandidate(final DataOutput out, final DataTreeCandidate candidate) + throws IOException { + try (NormalizedNodeDataOutput writer = NormalizedNodeInputOutput.newDataOutput(out, + PayloadVersion.current().getStreamVersion())) { writer.writeYangInstanceIdentifier(candidate.getRootPath()); final DataTreeCandidateNode node = candidate.getRootNode(); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java index 320ae61cd3..a5131c2ab2 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/MetadataShardDataTreeSnapshot.java @@ -7,9 +7,11 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; +import static com.google.common.base.Preconditions.checkArgument; +import static java.util.Objects.requireNonNull; + import com.google.common.annotations.Beta; import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -64,7 +66,7 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD @Override public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { final int metaSize = in.readInt(); - Preconditions.checkArgument(metaSize >= 0, "Invalid negative metadata map length %s", metaSize); + checkArgument(metaSize >= 0, "Invalid negative metadata map length %s", metaSize); // Default pre-allocate is 4, which should be fine final Builder>, ShardDataTreeSnapshotMetadata> @@ -103,7 +105,7 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD public MetadataShardDataTreeSnapshot(final NormalizedNode rootNode, final Map>, ShardDataTreeSnapshotMetadata> metadata) { - this.rootNode = Preconditions.checkNotNull(rootNode); + this.rootNode = requireNonNull(rootNode); this.metadata = ImmutableMap.copyOf(metadata); } @@ -118,7 +120,7 @@ public final class MetadataShardDataTreeSnapshot extends AbstractVersionedShardD @Override PayloadVersion version() { - return PayloadVersion.BORON; + return PayloadVersion.SODIUM; } private Object writeReplace() { diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java index 1dbbcba2e5..97b3ab5ed6 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/PayloadVersion.java @@ -14,6 +14,7 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; import javax.annotation.Nonnull; +import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeStreamVersion; import org.opendaylight.yangtools.concepts.WritableObject; /** @@ -34,25 +35,51 @@ import org.opendaylight.yangtools.concepts.WritableObject; */ @Beta public enum PayloadVersion implements WritableObject { - // NOTE: enumeration values need to be sorted in asceding order of their version to keep Comparable working + // NOTE: enumeration values need to be sorted in ascending order of their version to keep Comparable working /** * Version which is older than any other version. This version exists purely for testing purposes. */ @VisibleForTesting - TEST_PAST_VERSION(0), + TEST_PAST_VERSION(0) { + @Override + public NormalizedNodeStreamVersion getStreamVersion() { + throw new UnsupportedOperationException(); + } + }, /** * Initial ABI version, as shipped with Boron Simultaneous release. */ - // We seed the initial version to be the same as DataStoreVersions.BORON-VERSION for compatibility reasons. - BORON(5), + // We seed the initial version to be the same as DataStoreVersions.BORON_VERSION for compatibility reasons. + BORON(5) { + @Override + public NormalizedNodeStreamVersion getStreamVersion() { + return NormalizedNodeStreamVersion.LITHIUM; + } + }, + + /** + * Revised payload version. Payloads remain the same as {@link #BORON}, but messages bearing QNames in any shape + * are using {@link NormalizedNodeStreamVersion#SODIUM}, which improves encoding. + */ + SODIUM(6) { + @Override + public NormalizedNodeStreamVersion getStreamVersion() { + return NormalizedNodeStreamVersion.SODIUM; + } + }, /** * Version which is newer than any other version. This version exists purely for testing purposes. */ @VisibleForTesting - TEST_FUTURE_VERSION(65535); + TEST_FUTURE_VERSION(65535) { + @Override + public NormalizedNodeStreamVersion getStreamVersion() { + throw new UnsupportedOperationException(); + } + }; private final short value; @@ -70,6 +97,14 @@ public enum PayloadVersion implements WritableObject { return value; } + /** + * Return the NormalizedNode stream version corresponding to this particular ABI. + * + * @return Stream Version to use for this ABI version + */ + @Nonnull + public abstract NormalizedNodeStreamVersion getStreamVersion(); + /** * Return the codebase-native persistence version. This version is the default version allocated to messages * at runtime. Conversion to previous versions may incur additional overhead (such as object allocation). @@ -78,7 +113,7 @@ public enum PayloadVersion implements WritableObject { */ @Nonnull public static PayloadVersion current() { - return BORON; + return SODIUM; } /** @@ -101,8 +136,10 @@ public enum PayloadVersion implements WritableObject { throw new PastVersionException(version, BORON); case 5: return BORON; + case 6: + return SODIUM; default: - throw new FutureVersionException(version, BORON); + throw new FutureVersionException(version, SODIUM); } } @@ -128,5 +165,4 @@ public enum PayloadVersion implements WritableObject { throw new IOException("Unsupported version", e); } } - } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java index 7a8bd4648b..9c1622bb1b 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardDataTreeSnapshot.java @@ -12,6 +12,7 @@ import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; import java.util.Optional; +import org.eclipse.jdt.annotation.NonNull; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; /** @@ -25,8 +26,8 @@ public abstract class ShardDataTreeSnapshot { // Hidden to prevent subclassing from outside of this package } - public static ShardDataTreeSnapshot deserialize(final ObjectInput in) throws IOException { - final ShardDataTreeSnapshot ret = AbstractVersionedShardDataTreeSnapshot.versionedDeserialize(in); + public static @NonNull ShardSnapshotState deserialize(final ObjectInput in) throws IOException { + final ShardSnapshotState ret = AbstractVersionedShardDataTreeSnapshot.versionedDeserialize(in); // Make sure we consume all bytes, otherwise something went very wrong final int bytesLeft = in.available(); @@ -34,7 +35,6 @@ public abstract class ShardDataTreeSnapshot { throw new IOException("Deserialization left " + bytesLeft + " in the buffer"); } - return ret; } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java index 8f22c0ec2d..95953f9200 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/persisted/ShardSnapshotState.java @@ -7,7 +7,8 @@ */ package org.opendaylight.controller.cluster.datastore.persisted; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Externalizable; import java.io.IOException; @@ -47,7 +48,7 @@ public class ShardSnapshotState implements Snapshot.State { @Override public void readExternal(final ObjectInput in) throws IOException { - snapshotState = new ShardSnapshotState(ShardDataTreeSnapshot.deserialize(in)); + snapshotState = ShardDataTreeSnapshot.deserialize(in); } private Object readResolve() { @@ -59,9 +60,15 @@ public class ShardSnapshotState implements Snapshot.State { + "implements writeReplace to delegate serialization to a Proxy class and thus instances of this class " + "aren't serialized. FindBugs does not recognize this.") private final ShardDataTreeSnapshot snapshot; + private final boolean migrated; + + ShardSnapshotState(@Nonnull final ShardDataTreeSnapshot snapshot, final boolean migrated) { + this.snapshot = requireNonNull(snapshot); + this.migrated = migrated; + } public ShardSnapshotState(@Nonnull final ShardDataTreeSnapshot snapshot) { - this.snapshot = Preconditions.checkNotNull(snapshot); + this(snapshot, false); } @Nonnull @@ -69,6 +76,11 @@ public class ShardSnapshotState implements Snapshot.State { return snapshot; } + @Override + public boolean needsMigration() { + return migrated; + } + private Object writeReplace() { return new Proxy(this); } diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java index 5878675fdf..6a0def0901 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/actors/ShardSnapshotActorTest.java @@ -52,7 +52,7 @@ public class ShardSnapshotActorTest extends AbstractActorTest { final ShardDataTreeSnapshot deserialized; try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream( installSnapshotStream.toByteArray()))) { - deserialized = ShardDataTreeSnapshot.deserialize(in); + deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } assertEquals("Deserialized snapshot type", snapshot.getClass(), deserialized.getClass()); diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java index 09273b363c..0886d94fee 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/test/java/org/opendaylight/controller/cluster/datastore/persisted/CommitTransactionPayloadTest.java @@ -107,7 +107,7 @@ public class CommitTransactionPayloadTest extends AbstractTest { @Test public void testCandidateSerialization() throws IOException { final CommitTransactionPayload payload = CommitTransactionPayload.create(nextTransactionId(), candidate); - assertEquals("payload size", 181, payload.size()); + assertEquals("payload size", 169, payload.size()); } @Test 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 333f3e9b24..9e05cf4860 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 @@ -49,7 +49,7 @@ public class ShardDataTreeSnapshotTest { ShardDataTreeSnapshot deserialized; try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()))) { - deserialized = ShardDataTreeSnapshot.deserialize(in); + deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } Optional> actualNode = deserialized.getRootNode(); @@ -75,7 +75,7 @@ public class ShardDataTreeSnapshotTest { ShardDataTreeSnapshot deserialized; try (ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(bos.toByteArray()))) { - deserialized = ShardDataTreeSnapshot.deserialize(in); + deserialized = ShardDataTreeSnapshot.deserialize(in).getSnapshot(); } Optional> actualNode = deserialized.getRootNode(); @@ -91,7 +91,7 @@ public class ShardDataTreeSnapshotTest { private final String data; - TestShardDataTreeSnapshotMetadata(String data) { + TestShardDataTreeSnapshotMetadata(final String data) { this.data = data; } @@ -111,7 +111,7 @@ public class ShardDataTreeSnapshotTest { } @Override - public boolean equals(Object obj) { + public boolean equals(final Object obj) { return obj instanceof TestShardDataTreeSnapshotMetadata && data.equals(((TestShardDataTreeSnapshotMetadata)obj).data); } @@ -123,17 +123,17 @@ public class ShardDataTreeSnapshotTest { public Proxy() { } - Proxy(String data) { + Proxy(final String data) { this.data = data; } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { out.writeObject(data); } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { data = (String) in.readObject(); } -- 2.36.6