From 570a59fc778c77bf8344af5fda9b28b91bec59d9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 10 Jul 2019 15:38:51 +0200 Subject: [PATCH] Migrate InstallSnapshot/SnapshotTracker use of Optional This patch migrates both classes to use Java 8 Optional and OptionalInt. Change-Id: Ib8e14f963b4e0db821fd8d3ab37f65b5bf5d5b54 Signed-off-by: Robert Varga --- .../raft/behaviors/AbstractLeader.java | 13 ++--- .../cluster/raft/behaviors/Follower.java | 6 +-- .../raft/behaviors/SnapshotTracker.java | 18 +++---- .../raft/messages/InstallSnapshot.java | 51 +++++++++---------- .../cluster/raft/behaviors/LeaderTest.java | 4 +- .../raft/behaviors/SnapshotTrackerTest.java | 27 +++++----- .../raft/messages/InstallSnapshotTest.java | 13 ++--- 7 files changed, 64 insertions(+), 68 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java index 035821006d..9f1a1d13f9 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/AbstractLeader.java @@ -13,7 +13,6 @@ import akka.actor.ActorRef; import akka.actor.ActorSelection; import akka.actor.Cancellable; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Optional; import com.google.common.io.ByteSource; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.IOException; @@ -26,6 +25,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Optional; +import java.util.OptionalInt; import java.util.Queue; import java.util.concurrent.TimeUnit; import org.eclipse.jdt.annotation.Nullable; @@ -98,7 +99,7 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { private final MessageSlicer appendEntriesMessageSlicer; private Cancellable heartbeatSchedule = null; - private Optional snapshotHolder = Optional.absent(); + private Optional snapshotHolder = Optional.empty(); private int minReplicationCount; protected AbstractLeader(final RaftActorContext context, final RaftState state, @@ -186,7 +187,7 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { @VisibleForTesting void setSnapshotHolder(final @Nullable SnapshotHolder snapshotHolder) { - this.snapshotHolder = Optional.fromNullable(snapshotHolder); + this.snapshotHolder = Optional.ofNullable(snapshotHolder); } @VisibleForTesting @@ -937,9 +938,9 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { nextSnapshotChunk.length); int nextChunkIndex = installSnapshotState.incrementChunkIndex(); - Optional serverConfig = Optional.absent(); + Optional serverConfig = Optional.empty(); if (installSnapshotState.isLastChunk(nextChunkIndex)) { - serverConfig = Optional.fromNullable(context.getPeerServerInfo(true)); + serverConfig = Optional.ofNullable(context.getPeerServerInfo(true)); } sendSnapshotChunk(followerActor, followerLogInfo, nextSnapshotChunk, nextChunkIndex, serverConfig); @@ -969,7 +970,7 @@ public abstract class AbstractLeader extends AbstractRaftActorBehavior { snapshotChunk, chunkIndex, installSnapshotState.getTotalChunks(), - Optional.of(installSnapshotState.getLastChunkHashCode()), + OptionalInt.of(installSnapshotState.getLastChunkHashCode()), serverConfig ).toSerializable(followerLogInfo.getRaftVersion()), actor() diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java index b193a549f7..b8d229d84c 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java @@ -408,8 +408,8 @@ public class Follower extends AbstractRaftActorBehavior { return false; } - private void sendOutOfSyncAppendEntriesReply(final ActorRef sender, boolean forceInstallSnapshot, - short leaderRaftVersion) { + private void sendOutOfSyncAppendEntriesReply(final ActorRef sender, final boolean forceInstallSnapshot, + final short leaderRaftVersion) { // We found that the log was out of sync so just send a negative reply. final AppendEntriesReply reply = new AppendEntriesReply(context.getId(), currentTerm(), false, lastIndex(), lastTerm(), context.getPayloadVersion(), forceInstallSnapshot, needsLeaderAddress(), @@ -600,7 +600,7 @@ public class Follower extends AbstractRaftActorBehavior { installSnapshot.getLastIncludedTerm(), context.getTermInformation().getCurrentTerm(), context.getTermInformation().getVotedFor(), - installSnapshot.getServerConfig().orNull()); + installSnapshot.getServerConfig().orElse(null)); ApplySnapshot.Callback applySnapshotCallback = new ApplySnapshot.Callback() { @Override diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTracker.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTracker.java index f8969fcfc1..1538bed74c 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTracker.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTracker.java @@ -5,15 +5,15 @@ * 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.raft.behaviors; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import com.google.common.io.ByteSource; import java.io.BufferedOutputStream; import java.io.IOException; import java.util.Arrays; +import java.util.OptionalInt; import org.opendaylight.controller.cluster.io.FileBackedOutputStream; import org.opendaylight.controller.cluster.raft.RaftActorContext; import org.slf4j.Logger; @@ -32,10 +32,10 @@ class SnapshotTracker implements AutoCloseable { private int lastChunkHashCode = LeaderInstallSnapshotState.INITIAL_LAST_CHUNK_HASH_CODE; private long count; - SnapshotTracker(Logger log, int totalChunks, String leaderId, RaftActorContext context) { + SnapshotTracker(final Logger log, final int totalChunks, final String leaderId, final RaftActorContext context) { this.log = log; this.totalChunks = totalChunks; - this.leaderId = Preconditions.checkNotNull(leaderId); + this.leaderId = requireNonNull(leaderId); fileBackedStream = context.getFileBackedOutputStreamFactory().newInstance(); bufferedStream = new BufferedOutputStream(fileBackedStream); } @@ -49,7 +49,7 @@ class SnapshotTracker implements AutoCloseable { * @return true if this is the last chunk is received * @throws InvalidChunkException if the chunk index is invalid or out of order */ - boolean addChunk(int chunkIndex, byte[] chunk, Optional maybeLastChunkHashCode) + boolean addChunk(final int chunkIndex, final byte[] chunk, final OptionalInt maybeLastChunkHashCode) throws InvalidChunkException, IOException { log.debug("addChunk: chunkIndex={}, lastChunkIndex={}, collectedChunks.size={}, lastChunkHashCode={}", chunkIndex, lastChunkIndex, count, this.lastChunkHashCode); @@ -63,10 +63,10 @@ class SnapshotTracker implements AutoCloseable { throw new InvalidChunkException("Expected chunkIndex " + (lastChunkIndex + 1) + " got " + chunkIndex); } - if (maybeLastChunkHashCode.isPresent() && maybeLastChunkHashCode.get() != this.lastChunkHashCode) { + if (maybeLastChunkHashCode.isPresent() && maybeLastChunkHashCode.getAsInt() != this.lastChunkHashCode) { throw new InvalidChunkException("The hash code of the recorded last chunk does not match " + "the senders hash code, expected " + this.lastChunkHashCode + " was " - + maybeLastChunkHashCode.get()); + + maybeLastChunkHashCode.getAsInt()); } bufferedStream.write(chunk); @@ -99,7 +99,7 @@ class SnapshotTracker implements AutoCloseable { public static class InvalidChunkException extends IOException { private static final long serialVersionUID = 1L; - InvalidChunkException(String message) { + InvalidChunkException(final String message) { super(message); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java index b64e902f3f..39fa74bd22 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshot.java @@ -5,15 +5,15 @@ * 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.raft.messages; -import com.google.common.base.Optional; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.io.Externalizable; import java.io.IOException; import java.io.ObjectInput; import java.io.ObjectOutput; +import java.util.Optional; +import java.util.OptionalInt; import org.opendaylight.controller.cluster.raft.persisted.ServerConfigurationPayload; /** @@ -28,15 +28,17 @@ public class InstallSnapshot extends AbstractRaftRPC { private final byte[] data; private final int chunkIndex; private final int totalChunks; - private final Optional lastChunkHashCode; + @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Handled via writeReplace()") + private final OptionalInt lastChunkHashCode; + @SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "Handled via writeReplace()") private final Optional serverConfig; @SuppressFBWarnings(value = "EI_EXPOSE_REP2", justification = "Stores a reference to an externally mutable byte[] " + "object but this is OK since this class is merely a DTO and does not process byte[] internally. " + "Also it would be inefficient to create a copy as the byte[] could be large.") - public InstallSnapshot(long term, String leaderId, long lastIncludedIndex, long lastIncludedTerm, byte[] data, - int chunkIndex, int totalChunks, Optional lastChunkHashCode, - Optional serverConfig) { + public InstallSnapshot(final long term, final String leaderId, final long lastIncludedIndex, + final long lastIncludedTerm, final byte[] data, final int chunkIndex, final int totalChunks, + final OptionalInt lastChunkHashCode, final Optional serverConfig) { super(term); this.leaderId = leaderId; this.lastIncludedIndex = lastIncludedIndex; @@ -48,10 +50,11 @@ public class InstallSnapshot extends AbstractRaftRPC { this.serverConfig = serverConfig; } - public InstallSnapshot(long term, String leaderId, long lastIncludedIndex, - long lastIncludedTerm, byte[] data, int chunkIndex, int totalChunks) { - this(term, leaderId, lastIncludedIndex, lastIncludedTerm, data, chunkIndex, totalChunks, - Optional.absent(), Optional.absent()); + public InstallSnapshot(final long term, final String leaderId, final long lastIncludedIndex, + final long lastIncludedTerm, final byte[] data, final int chunkIndex, + final int totalChunks) { + this(term, leaderId, lastIncludedIndex, lastIncludedTerm, data, chunkIndex, totalChunks, OptionalInt.empty(), + Optional.empty()); } public String getLeaderId() { @@ -81,7 +84,7 @@ public class InstallSnapshot extends AbstractRaftRPC { return totalChunks; } - public Optional getLastChunkHashCode() { + public OptionalInt getLastChunkHashCode() { return lastChunkHashCode; } @@ -90,7 +93,7 @@ public class InstallSnapshot extends AbstractRaftRPC { } - public Object toSerializable(short version) { + public Object toSerializable(final short version) { return this; } @@ -99,7 +102,7 @@ public class InstallSnapshot extends AbstractRaftRPC { return "InstallSnapshot [term=" + getTerm() + ", leaderId=" + leaderId + ", lastIncludedIndex=" + lastIncludedIndex + ", lastIncludedTerm=" + lastIncludedTerm + ", datasize=" + data.length + ", Chunk=" + chunkIndex + "/" + totalChunks + ", lastChunkHashCode=" + lastChunkHashCode - + ", serverConfig=" + serverConfig.orNull() + "]"; + + ", serverConfig=" + serverConfig.orElse(null) + "]"; } private Object writeReplace() { @@ -117,12 +120,12 @@ public class InstallSnapshot extends AbstractRaftRPC { public Proxy() { } - Proxy(InstallSnapshot installSnapshot) { + Proxy(final InstallSnapshot installSnapshot) { this.installSnapshot = installSnapshot; } @Override - public void writeExternal(ObjectOutput out) throws IOException { + public void writeExternal(final ObjectOutput out) throws IOException { out.writeLong(installSnapshot.getTerm()); out.writeObject(installSnapshot.leaderId); out.writeLong(installSnapshot.lastIncludedIndex); @@ -132,7 +135,7 @@ public class InstallSnapshot extends AbstractRaftRPC { out.writeByte(installSnapshot.lastChunkHashCode.isPresent() ? 1 : 0); if (installSnapshot.lastChunkHashCode.isPresent()) { - out.writeInt(installSnapshot.lastChunkHashCode.get().intValue()); + out.writeInt(installSnapshot.lastChunkHashCode.getAsInt()); } out.writeByte(installSnapshot.serverConfig.isPresent() ? 1 : 0); @@ -144,7 +147,7 @@ public class InstallSnapshot extends AbstractRaftRPC { } @Override - public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { + public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException { long term = in.readLong(); String leaderId = (String) in.readObject(); long lastIncludedIndex = in.readLong(); @@ -152,17 +155,9 @@ public class InstallSnapshot extends AbstractRaftRPC { int chunkIndex = in.readInt(); int totalChunks = in.readInt(); - Optional lastChunkHashCode = Optional.absent(); - boolean chunkHashCodePresent = in.readByte() == 1; - if (chunkHashCodePresent) { - lastChunkHashCode = Optional.of(in.readInt()); - } - - Optional serverConfig = Optional.absent(); - boolean serverConfigPresent = in.readByte() == 1; - if (serverConfigPresent) { - serverConfig = Optional.of((ServerConfigurationPayload)in.readObject()); - } + OptionalInt lastChunkHashCode = in.readByte() == 1 ? OptionalInt.of(in.readInt()) : OptionalInt.empty(); + Optional serverConfig = in.readByte() == 1 + ? Optional.of((ServerConfigurationPayload)in.readObject()) : Optional.empty(); byte[] data = (byte[])in.readObject(); diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java index 3805576ae1..af4819090e 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/LeaderTest.java @@ -1200,7 +1200,7 @@ public class LeaderTest extends AbstractLeaderTest { assertEquals(1, installSnapshot.getChunkIndex()); assertEquals(3, installSnapshot.getTotalChunks()); assertEquals(LeaderInstallSnapshotState.INITIAL_LAST_CHUNK_HASH_CODE, - installSnapshot.getLastChunkHashCode().get().intValue()); + installSnapshot.getLastChunkHashCode().getAsInt()); final int hashCode = Arrays.hashCode(installSnapshot.getData()); @@ -1213,7 +1213,7 @@ public class LeaderTest extends AbstractLeaderTest { assertEquals(2, installSnapshot.getChunkIndex()); assertEquals(3, installSnapshot.getTotalChunks()); - assertEquals(hashCode, installSnapshot.getLastChunkHashCode().get().intValue()); + assertEquals(hashCode, installSnapshot.getLastChunkHashCode().getAsInt()); } @Test diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTrackerTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTrackerTest.java index 443b931d25..50860630d4 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTrackerTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/behaviors/SnapshotTrackerTest.java @@ -5,7 +5,6 @@ * 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.raft.behaviors; import static org.junit.Assert.assertEquals; @@ -15,13 +14,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import akka.protobuf.ByteString; -import com.google.common.base.Optional; import com.google.common.io.ByteSource; import java.io.IOException; import java.io.Serializable; import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import java.util.OptionalInt; import org.apache.commons.lang3.SerializationUtils; import org.junit.Before; import org.junit.Test; @@ -68,9 +67,9 @@ public class SnapshotTrackerTest { @Test public void testAddChunks() throws IOException { try (SnapshotTracker tracker = new SnapshotTracker(LOG, 3, "leader", mockContext)) { - tracker.addChunk(1, chunk1, Optional.of(LeaderInstallSnapshotState.INITIAL_LAST_CHUNK_HASH_CODE)); - tracker.addChunk(2, chunk2, Optional.of(Arrays.hashCode(chunk1))); - tracker.addChunk(3, chunk3, Optional.of(Arrays.hashCode(chunk2))); + tracker.addChunk(1, chunk1, OptionalInt.of(LeaderInstallSnapshotState.INITIAL_LAST_CHUNK_HASH_CODE)); + tracker.addChunk(2, chunk2, OptionalInt.of(Arrays.hashCode(chunk1))); + tracker.addChunk(3, chunk3, OptionalInt.of(Arrays.hashCode(chunk2))); ByteSource snapshotBytes = tracker.getSnapshotBytes(); assertEquals("Deserialized", data, SerializationUtils.deserialize(snapshotBytes.read())); @@ -82,39 +81,39 @@ public class SnapshotTrackerTest { @Test(expected = SnapshotTracker.InvalidChunkException.class) public void testAddChunkWhenAlreadySealed() throws IOException { try (SnapshotTracker tracker = new SnapshotTracker(LOG, 2, "leader", mockContext)) { - tracker.addChunk(1, chunk1, Optional.absent()); - tracker.addChunk(2, chunk2, Optional.absent()); - tracker.addChunk(3, chunk3, Optional.absent()); + tracker.addChunk(1, chunk1, OptionalInt.empty()); + tracker.addChunk(2, chunk2, OptionalInt.empty()); + tracker.addChunk(3, chunk3, OptionalInt.empty()); } } @Test(expected = SnapshotTracker.InvalidChunkException.class) public void testInvalidFirstChunkIndex() throws IOException { try (SnapshotTracker tracker = new SnapshotTracker(LOG, 2, "leader", mockContext)) { - tracker.addChunk(LeaderInstallSnapshotState.FIRST_CHUNK_INDEX - 1, chunk1, Optional.absent()); + tracker.addChunk(LeaderInstallSnapshotState.FIRST_CHUNK_INDEX - 1, chunk1, OptionalInt.empty()); } } @Test(expected = SnapshotTracker.InvalidChunkException.class) public void testOutOfSequenceChunk() throws IOException { try (SnapshotTracker tracker = new SnapshotTracker(LOG, 2, "leader", mockContext)) { - tracker.addChunk(1, chunk1, Optional.absent()); - tracker.addChunk(3, chunk3, Optional.absent()); + tracker.addChunk(1, chunk1, OptionalInt.empty()); + tracker.addChunk(3, chunk3, OptionalInt.empty()); } } @Test(expected = SnapshotTracker.InvalidChunkException.class) public void testInvalidLastChunkHashCode() throws IOException { try (SnapshotTracker tracker = new SnapshotTracker(LOG, 2, "leader", mockContext)) { - tracker.addChunk(1, chunk1, Optional.of(LeaderInstallSnapshotState.INITIAL_LAST_CHUNK_HASH_CODE)); - tracker.addChunk(2, chunk2, Optional.of(1)); + tracker.addChunk(1, chunk1, OptionalInt.of(LeaderInstallSnapshotState.INITIAL_LAST_CHUNK_HASH_CODE)); + tracker.addChunk(2, chunk2, OptionalInt.of(1)); } } @Test(expected = IllegalStateException.class) public void testGetSnapshotBytesWhenNotSealed() throws IOException { try (SnapshotTracker tracker = new SnapshotTracker(LOG, 2, "leader", mockContext)) { - tracker.addChunk(1, chunk1, Optional.absent()); + tracker.addChunk(1, chunk1, OptionalInt.empty()); tracker.getSnapshotBytes(); } } diff --git a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java index 62a3e27428..c7fad2a191 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java +++ b/opendaylight/md-sal/sal-akka-raft/src/test/java/org/opendaylight/controller/cluster/raft/messages/InstallSnapshotTest.java @@ -10,9 +10,10 @@ package org.opendaylight.controller.cluster.raft.messages; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import com.google.common.base.Optional; import java.io.Serializable; import java.util.Arrays; +import java.util.Optional; +import java.util.OptionalInt; import org.apache.commons.lang.SerializationUtils; import org.junit.Test; import org.opendaylight.controller.cluster.raft.RaftVersions; @@ -38,8 +39,8 @@ public class InstallSnapshotTest { ServerConfigurationPayload serverConfig = new ServerConfigurationPayload(Arrays.asList( new ServerInfo("leader", true), new ServerInfo("follower", false))); - InstallSnapshot expected = new InstallSnapshot(3L, "leaderId", 11L, 2L, data, 5, 6, - Optional.of(54321), Optional.of(serverConfig)); + InstallSnapshot expected = new InstallSnapshot(3L, "leaderId", 11L, 2L, data, 5, 6, OptionalInt.of(54321), + Optional.of(serverConfig)); Object serialized = expected.toSerializable(RaftVersions.CURRENT_VERSION); assertEquals("Serialized type", InstallSnapshot.class, serialized.getClass()); @@ -53,7 +54,7 @@ public class InstallSnapshotTest { verifyInstallSnapshot(expected, actual); } - private static void verifyInstallSnapshot(InstallSnapshot expected, InstallSnapshot actual) { + private static void verifyInstallSnapshot(final InstallSnapshot expected, final InstallSnapshot actual) { assertEquals("getTerm", expected.getTerm(), actual.getTerm()); assertEquals("getChunkIndex", expected.getChunkIndex(), actual.getChunkIndex()); assertEquals("getTotalChunks", expected.getTotalChunks(), actual.getTotalChunks()); @@ -66,8 +67,8 @@ public class InstallSnapshotTest { assertEquals("getLastChunkHashCode present", expected.getLastChunkHashCode().isPresent(), actual.getLastChunkHashCode().isPresent()); if (expected.getLastChunkHashCode().isPresent()) { - assertEquals("getLastChunkHashCode", expected.getLastChunkHashCode().get(), - actual.getLastChunkHashCode().get()); + assertEquals("getLastChunkHashCode", expected.getLastChunkHashCode(), + actual.getLastChunkHashCode()); } assertEquals("getServerConfig present", expected.getServerConfig().isPresent(), -- 2.36.6