Separate out RaftEntryMeta

[controller.git] / opendaylight / md-sal / sal-akka-raft / src / test / java / org / opendaylight / controller / cluster / raft / behaviors / LeaderTest.java

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 c3f3b3296bc6456b8b21e4126c2fe05399c2f689..dc84644d3ba82487149b6505ac59a9ec85d14b2a 100644 (file)
--- 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
@@ -151,8 +151,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", lastIndex - 1, appendEntries.getPrevLogIndex());
         assertEquals("getPrevLogTerm", term, appendEntries.getPrevLogTerm());
         assertEquals("Entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Entry getIndex", lastIndex, appendEntries.getEntries().get(0).getIndex());
-        assertEquals("Entry getTerm", term, appendEntries.getEntries().get(0).getTerm());
+        assertEquals("Entry getIndex", lastIndex, appendEntries.getEntries().get(0).index());
+        assertEquals("Entry getTerm", term, appendEntries.getEntries().get(0).term());
         assertEquals("getPayloadVersion", payloadVersion, appendEntries.getPayloadVersion());
     }
 
@@ -168,9 +168,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
     private RaftActorBehavior sendReplicate(final MockRaftActorContext actorContext, final long term, final long index,
             final Payload payload) {
-        SimpleReplicatedLogEntry newEntry = new SimpleReplicatedLogEntry(index, term, payload);
-        actorContext.getReplicatedLog().append(newEntry);
-        return leader.handleMessage(leaderActor, new Replicate(null, null, newEntry, true));
+        actorContext.getReplicatedLog().append(new SimpleReplicatedLogEntry(index, term, payload));
+        return leader.handleMessage(leaderActor, new Replicate(index, true, null, null));
     }
 
     @Test
@@ -204,8 +203,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", lastIndex, appendEntries.getPrevLogIndex());
         assertEquals("getPrevLogTerm", term, appendEntries.getPrevLogTerm());
         assertEquals("Entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Entry getIndex", lastIndex + 1, appendEntries.getEntries().get(0).getIndex());
-        assertEquals("Entry getTerm", term, appendEntries.getEntries().get(0).getTerm());
+        assertEquals("Entry getIndex", lastIndex + 1, appendEntries.getEntries().get(0).index());
+        assertEquals("Entry getTerm", term, appendEntries.getEntries().get(0).term());
         assertEquals("Entry payload", "foo", appendEntries.getEntries().get(0).getData().toString());
         assertEquals("Commit Index", lastIndex, actorContext.getCommitIndex());
     }
@@ -252,8 +251,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", lastIndex, appendEntries.getPrevLogIndex());
         assertEquals("getPrevLogTerm", prevTerm, appendEntries.getPrevLogTerm());
         assertEquals("Entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Entry getIndex", newIndex, appendEntries.getEntries().get(0).getIndex());
-        assertEquals("Entry getTerm", newTerm, appendEntries.getEntries().get(0).getTerm());
+        assertEquals("Entry getIndex", newIndex, appendEntries.getEntries().get(0).index());
+        assertEquals("Entry getTerm", newTerm, appendEntries.getEntries().get(0).term());
         assertEquals("Entry payload", "foo", appendEntries.getEntries().get(0).getData().toString());
 
         // The follower replies with success. The leader should now update the commit index to the new index
@@ -297,8 +296,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", lastIndex, appendEntries.getPrevLogIndex());
         assertEquals("getPrevLogTerm", term, appendEntries.getPrevLogTerm());
         assertEquals("Entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Entry getIndex", lastIndex + 1, appendEntries.getEntries().get(0).getIndex());
-        assertEquals("Entry getTerm", term, appendEntries.getEntries().get(0).getTerm());
+        assertEquals("Entry getIndex", lastIndex + 1, appendEntries.getEntries().get(0).index());
+        assertEquals("Entry getTerm", term, appendEntries.getEntries().get(0).term());
         assertEquals("Entry payload", "foo", appendEntries.getEntries().get(0).getData().toString());
         assertEquals("Commit Index", lastIndex + 1, actorContext.getCommitIndex());
     }
@@ -411,7 +410,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         final List<ReplicatedLogEntry> entries = req.getEntries();
         assertEquals(1, entries.size());
-        assertEquals(messageNr + 2, entries.get(0).getIndex());
+        assertEquals(messageNr + 2, entries.get(0).index());
     }
 
     @Test
@@ -453,9 +452,10 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("The number of append entries collected should be 2", 2, allMessages.size());
 
         assertEquals(1, allMessages.get(0).getEntries().size());
-        assertEquals(lastIndex + 1, allMessages.get(0).getEntries().get(0).getIndex());
+        assertEquals(lastIndex + 1, allMessages.get(0).getEntries().get(0).index());
         assertEquals(1, allMessages.get(1).getEntries().size());
-        assertEquals(lastIndex + 1, allMessages.get(0).getEntries().get(0).getIndex());
+        // FIXME: weird assert
+        assertEquals(lastIndex + 1, allMessages.get(0).getEntries().get(0).index());
 
     }
 
@@ -546,16 +546,14 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         actorContext.setLastApplied(0);
 
-        long newLogIndex = actorContext.getReplicatedLog().lastIndex() + 1;
-        long term = actorContext.getTermInformation().getCurrentTerm();
-        ReplicatedLogEntry newEntry = new SimpleReplicatedLogEntry(
-                newLogIndex, term, new MockRaftActorContext.MockPayload("foo"));
+        final long newLogIndex = actorContext.getReplicatedLog().lastIndex() + 1;
+        final long term = actorContext.getTermInformation().getCurrentTerm();
+        final var data = new MockRaftActorContext.MockPayload("foo");
 
-        actorContext.getReplicatedLog().append(newEntry);
+        actorContext.getReplicatedLog().append(new SimpleReplicatedLogEntry(newLogIndex, term, data));
 
         final Identifier id = new MockIdentifier("state-id");
-        RaftActorBehavior raftBehavior = leader.handleMessage(leaderActor,
-                new Replicate(leaderActor, id, newEntry, true));
+        final var raftBehavior = leader.handleMessage(leaderActor, new Replicate(newLogIndex, true, leaderActor, id));
 
         // State should not change
         assertTrue(raftBehavior instanceof Leader);
@@ -564,18 +562,17 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         // We should get 2 ApplyState messages - 1 for new log entry and 1 for the previous
         // one since lastApplied state is 0.
-        List<ApplyState> applyStateList = MessageCollectorActor.getAllMatching(
-                leaderActor, ApplyState.class);
+        final var applyStateList = MessageCollectorActor.getAllMatching(leaderActor, ApplyState.class);
         assertEquals("ApplyState count", newLogIndex, applyStateList.size());
 
         for (int i = 0; i <= newLogIndex - 1; i++) {
             ApplyState applyState = applyStateList.get(i);
-            assertEquals("getIndex", i + 1, applyState.getReplicatedLogEntry().getIndex());
-            assertEquals("getTerm", term, applyState.getReplicatedLogEntry().getTerm());
+            assertEquals("getIndex", i + 1, applyState.getReplicatedLogEntry().index());
+            assertEquals("getTerm", term, applyState.getReplicatedLogEntry().term());
         }
 
         ApplyState last = applyStateList.get((int) newLogIndex - 1);
-        assertEquals("getData", newEntry.getData(), last.getReplicatedLogEntry().getData());
+        assertEquals("getData", data, last.getReplicatedLogEntry().getData());
         assertEquals("getIdentifier", id, last.getIdentifier());
     }
 
@@ -612,7 +609,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
                 List.of(), commitIndex, snapshotTerm, commitIndex, snapshotTerm,
                 -1, null, null), ByteSource.wrap(bs.toByteArray())));
         LeaderInstallSnapshotState fts = new LeaderInstallSnapshotState(
-                actorContext.getConfigParams().getSnapshotChunkSize(), leader.logName());
+                actorContext.getConfigParams().getMaximumMessageSliceSize(), leader.logName());
         fts.setSnapshotBytes(ByteSource.wrap(bs.toByteArray()));
         leader.getFollower(FOLLOWER_ID).setLeaderInstallSnapshotState(fts);
 
@@ -670,18 +667,15 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
 
         // new entry
-        SimpleReplicatedLogEntry entry =
-                new SimpleReplicatedLogEntry(newEntryIndex, currentTerm,
-                        new MockRaftActorContext.MockPayload("D"));
-
-        actorContext.getReplicatedLog().append(entry);
+        actorContext.getReplicatedLog().append(
+            new SimpleReplicatedLogEntry(newEntryIndex, currentTerm, new MockRaftActorContext.MockPayload("D")));
 
         //update follower timestamp
         leader.markFollowerActive(FOLLOWER_ID);
 
         // this should invoke a sendinstallsnapshot as followersLastIndex < snapshotIndex
         RaftActorBehavior raftBehavior = leader.handleMessage(
-                leaderActor, new Replicate(null, new MockIdentifier("state-id"), entry, true));
+                leaderActor, new Replicate(newEntryIndex, true, null, new MockIdentifier("state-id")));
 
         assertTrue(raftBehavior instanceof Leader);
 
@@ -718,15 +712,13 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         leader.setSnapshotHolder(null);
 
         // new entry
-        SimpleReplicatedLogEntry entry = new SimpleReplicatedLogEntry(newEntryIndex, currentTerm,
-                new MockRaftActorContext.MockPayload("D"));
-
-        actorContext.getReplicatedLog().append(entry);
+        actorContext.getReplicatedLog().append(
+            new SimpleReplicatedLogEntry(newEntryIndex, currentTerm, new MockRaftActorContext.MockPayload("D")));
 
         //update follower timestamp
         leader.markFollowerActive(FOLLOWER_ID);
 
-        leader.handleMessage(leaderActor, new Replicate(null, new MockIdentifier("state-id"), entry, true));
+        leader.handleMessage(leaderActor, new Replicate(newEntryIndex, true, null, new MockIdentifier("state-id")));
 
         assertEquals("isCapturing", true, actorContext.getSnapshotManager().isCapturing());
 
@@ -738,7 +730,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals(2, cs.getLastTerm());
 
         // if an initiate is started again when first is in progress, it shouldnt initiate Capture
-        leader.handleMessage(leaderActor, new Replicate(null, new MockIdentifier("state-id"), entry, true));
+        leader.handleMessage(leaderActor, new Replicate(newEntryIndex, true, null, new MockIdentifier("state-id")));
 
         assertSame("CaptureSnapshot instance", cs, actorContext.getSnapshotManager().getCaptureSnapshot());
     }
@@ -781,10 +773,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         }
 
         // new entry
-        SimpleReplicatedLogEntry entry = new SimpleReplicatedLogEntry(newEntryIndex, currentTerm,
-                new MockRaftActorContext.MockPayload("D"));
-
-        actorContext.getReplicatedLog().append(entry);
+        actorContext.getReplicatedLog().append(
+            new SimpleReplicatedLogEntry(newEntryIndex, currentTerm, new MockRaftActorContext.MockPayload("D")));
 
         //update follower timestamp
         leader.markFollowerActive(FOLLOWER_ID);
@@ -808,7 +798,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         MessageCollectorActor.clearMessages(followerActor);
 
         // Sending Replicate message should not initiate another capture since the first is in progress.
-        leader.handleMessage(leaderActor, new Replicate(null, new MockIdentifier("state-id"), entry, true));
+        leader.handleMessage(leaderActor, new Replicate(newEntryIndex, true, null, new MockIdentifier("state-id")));
         assertSame("CaptureSnapshot instance", cs, actorContext.getSnapshotManager().getCaptureSnapshot());
 
         // Similarly sending another AppendEntriesReply to force a snapshot should not initiate another capture.
@@ -976,7 +966,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
                 List.of(), commitIndex, snapshotTerm, commitIndex, snapshotTerm,
                 -1, null, null), ByteSource.wrap(bs.toByteArray())));
         LeaderInstallSnapshotState fts = new LeaderInstallSnapshotState(
-                actorContext.getConfigParams().getSnapshotChunkSize(), leader.logName());
+                actorContext.getConfigParams().getMaximumMessageSliceSize(), leader.logName());
         fts.setSnapshotBytes(ByteSource.wrap(bs.toByteArray()));
         leader.getFollower(FOLLOWER_ID).setLeaderInstallSnapshotState(fts);
         while (!fts.isLastChunk(fts.getChunkIndex())) {
@@ -1014,7 +1004,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         DefaultConfigParamsImpl configParams = new DefaultConfigParamsImpl() {
             @Override
-            public int getSnapshotChunkSize() {
+            public int getMaximumMessageSliceSize() {
                 return 50;
             }
         };
@@ -1091,7 +1081,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         actorContext.setConfigParams(new DefaultConfigParamsImpl() {
             @Override
-            public int getSnapshotChunkSize() {
+            public int getMaximumMessageSliceSize() {
                 return 50;
             }
         });
@@ -1155,7 +1145,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         actorContext.setConfigParams(new DefaultConfigParamsImpl() {
             @Override
-            public int getSnapshotChunkSize() {
+            public int getMaximumMessageSliceSize() {
                 return 50;
             }
         });
@@ -1467,10 +1457,10 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", 0, appendEntries.getPrevLogIndex());
         assertEquals("Log entries size", 2, appendEntries.getEntries().size());
 
-        assertEquals("First entry index", 1, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("First entry index", 1, appendEntries.getEntries().get(0).index());
         assertEquals("First entry data", leadersSecondLogEntry.getData(),
                 appendEntries.getEntries().get(0).getData());
-        assertEquals("Second entry index", 2, appendEntries.getEntries().get(1).getIndex());
+        assertEquals("Second entry index", 2, appendEntries.getEntries().get(1).index());
         assertEquals("Second entry data", leadersThirdLogEntry.getData(),
                 appendEntries.getEntries().get(1).getData());
 
@@ -1480,14 +1470,14 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         List<ApplyState> applyStateList = MessageCollectorActor.expectMatching(followerActor, ApplyState.class, 2);
 
         ApplyState applyState = applyStateList.get(0);
-        assertEquals("Follower's first ApplyState index", 1, applyState.getReplicatedLogEntry().getIndex());
-        assertEquals("Follower's first ApplyState term", 1, applyState.getReplicatedLogEntry().getTerm());
+        assertEquals("Follower's first ApplyState index", 1, applyState.getReplicatedLogEntry().index());
+        assertEquals("Follower's first ApplyState term", 1, applyState.getReplicatedLogEntry().term());
         assertEquals("Follower's first ApplyState data", leadersSecondLogEntry.getData(),
                 applyState.getReplicatedLogEntry().getData());
 
         applyState = applyStateList.get(1);
-        assertEquals("Follower's second ApplyState index", 2, applyState.getReplicatedLogEntry().getIndex());
-        assertEquals("Follower's second ApplyState term", 1, applyState.getReplicatedLogEntry().getTerm());
+        assertEquals("Follower's second ApplyState index", 2, applyState.getReplicatedLogEntry().index());
+        assertEquals("Follower's second ApplyState term", 1, applyState.getReplicatedLogEntry().term());
         assertEquals("Follower's second ApplyState data", leadersThirdLogEntry.getData(),
                 applyState.getReplicatedLogEntry().getData());
 
@@ -1548,10 +1538,10 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", -1, appendEntries.getPrevLogIndex());
         assertEquals("Log entries size", 2, appendEntries.getEntries().size());
 
-        assertEquals("First entry index", 0, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("First entry index", 0, appendEntries.getEntries().get(0).index());
         assertEquals("First entry data", leadersFirstLogEntry.getData(),
                 appendEntries.getEntries().get(0).getData());
-        assertEquals("Second entry index", 1, appendEntries.getEntries().get(1).getIndex());
+        assertEquals("Second entry index", 1, appendEntries.getEntries().get(1).index());
         assertEquals("Second entry data", leadersSecondLogEntry.getData(),
                 appendEntries.getEntries().get(1).getData());
 
@@ -1561,14 +1551,14 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         List<ApplyState> applyStateList = MessageCollectorActor.expectMatching(followerActor, ApplyState.class, 2);
 
         ApplyState applyState = applyStateList.get(0);
-        assertEquals("Follower's first ApplyState index", 0, applyState.getReplicatedLogEntry().getIndex());
-        assertEquals("Follower's first ApplyState term", 1, applyState.getReplicatedLogEntry().getTerm());
+        assertEquals("Follower's first ApplyState index", 0, applyState.getReplicatedLogEntry().index());
+        assertEquals("Follower's first ApplyState term", 1, applyState.getReplicatedLogEntry().term());
         assertEquals("Follower's first ApplyState data", leadersFirstLogEntry.getData(),
                 applyState.getReplicatedLogEntry().getData());
 
         applyState = applyStateList.get(1);
-        assertEquals("Follower's second ApplyState index", 1, applyState.getReplicatedLogEntry().getIndex());
-        assertEquals("Follower's second ApplyState term", 1, applyState.getReplicatedLogEntry().getTerm());
+        assertEquals("Follower's second ApplyState index", 1, applyState.getReplicatedLogEntry().index());
+        assertEquals("Follower's second ApplyState term", 1, applyState.getReplicatedLogEntry().term());
         assertEquals("Follower's second ApplyState data", leadersSecondLogEntry.getData(),
                 applyState.getReplicatedLogEntry().getData());
 
@@ -1630,12 +1620,12 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", -1, appendEntries.getPrevLogIndex());
         assertEquals("Log entries size", 2, appendEntries.getEntries().size());
 
-        assertEquals("First entry index", 0, appendEntries.getEntries().get(0).getIndex());
-        assertEquals("First entry term", 2, appendEntries.getEntries().get(0).getTerm());
+        assertEquals("First entry index", 0, appendEntries.getEntries().get(0).index());
+        assertEquals("First entry term", 2, appendEntries.getEntries().get(0).term());
         assertEquals("First entry data", leadersFirstLogEntry.getData(),
                 appendEntries.getEntries().get(0).getData());
-        assertEquals("Second entry index", 1, appendEntries.getEntries().get(1).getIndex());
-        assertEquals("Second entry term", 2, appendEntries.getEntries().get(1).getTerm());
+        assertEquals("Second entry index", 1, appendEntries.getEntries().get(1).index());
+        assertEquals("Second entry term", 2, appendEntries.getEntries().get(1).term());
         assertEquals("Second entry data", leadersSecondLogEntry.getData(),
                 appendEntries.getEntries().get(1).getData());
 
@@ -1645,14 +1635,14 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         List<ApplyState> applyStateList = MessageCollectorActor.expectMatching(followerActor, ApplyState.class, 2);
 
         ApplyState applyState = applyStateList.get(0);
-        assertEquals("Follower's first ApplyState index", 0, applyState.getReplicatedLogEntry().getIndex());
-        assertEquals("Follower's first ApplyState term", 2, applyState.getReplicatedLogEntry().getTerm());
+        assertEquals("Follower's first ApplyState index", 0, applyState.getReplicatedLogEntry().index());
+        assertEquals("Follower's first ApplyState term", 2, applyState.getReplicatedLogEntry().term());
         assertEquals("Follower's first ApplyState data", leadersFirstLogEntry.getData(),
                 applyState.getReplicatedLogEntry().getData());
 
         applyState = applyStateList.get(1);
-        assertEquals("Follower's second ApplyState index", 1, applyState.getReplicatedLogEntry().getIndex());
-        assertEquals("Follower's second ApplyState term", 2, applyState.getReplicatedLogEntry().getTerm());
+        assertEquals("Follower's second ApplyState index", 1, applyState.getReplicatedLogEntry().index());
+        assertEquals("Follower's second ApplyState term", 2, applyState.getReplicatedLogEntry().term());
         assertEquals("Follower's second ApplyState data", leadersSecondLogEntry.getData(),
                 applyState.getReplicatedLogEntry().getData());
 
@@ -1752,7 +1742,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         ApplyState applyState = applyStateList.get(0);
 
-        assertEquals(2, applyState.getReplicatedLogEntry().getIndex());
+        assertEquals(2, applyState.getReplicatedLogEntry().index());
 
         assertEquals(2, followerInfo.getMatchIndex());
         assertEquals(3, followerInfo.getNextIndex());
@@ -1783,7 +1773,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setHeartBeatInterval(
                 new FiniteDuration(1000, TimeUnit.SECONDS));
         // Note: the size here depends on estimate
-        ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setSnapshotChunkSize(246);
+        ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setMaximumMessageSliceSize(246);
 
         leaderActorContext.setReplicatedLog(
                 new MockRaftActorContext.MockReplicatedLogBuilder().createEntries(0, 4, 1).build());
@@ -1834,10 +1824,10 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", -1, appendEntries.getPrevLogIndex());
         assertEquals("Log entries size", 2, appendEntries.getEntries().size());
 
-        assertEquals("First entry index", 0, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("First entry index", 0, appendEntries.getEntries().get(0).index());
         assertEquals("First entry data", leadersFirstLogEntry.getData(),
                 appendEntries.getEntries().get(0).getData());
-        assertEquals("Second entry index", 1, appendEntries.getEntries().get(1).getIndex());
+        assertEquals("Second entry index", 1, appendEntries.getEntries().get(1).index());
         assertEquals("Second entry data", leadersSecondLogEntry.getData(),
                 appendEntries.getEntries().get(1).getData());
 
@@ -1846,10 +1836,10 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         assertEquals("getPrevLogIndex", 1, appendEntries.getPrevLogIndex());
         assertEquals("Log entries size", 2, appendEntries.getEntries().size());
 
-        assertEquals("First entry index", 2, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("First entry index", 2, appendEntries.getEntries().get(0).index());
         assertEquals("First entry data", leadersThirdLogEntry.getData(),
                 appendEntries.getEntries().get(0).getData());
-        assertEquals("Second entry index", 3, appendEntries.getEntries().get(1).getIndex());
+        assertEquals("Second entry index", 3, appendEntries.getEntries().get(1).index());
         assertEquals("Second entry data", leadersFourthLogEntry.getData(),
                 appendEntries.getEntries().get(1).getData());
 
@@ -2086,7 +2076,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         AppendEntries appendEntries = MessageCollectorActor.expectFirstMatching(nonVotingFollowerActor,
                 AppendEntries.class);
         assertEquals("Log entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Log entry index", 1, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("Log entry index", 1, appendEntries.getEntries().get(0).index());
 
         // Send reply only from the non-voting follower and verify no consensus via no ApplyState.
         leader.handleMessage(leaderActor, new AppendEntriesReply(nonVotingFollowerId, 1, true, 1, 1, (short)0));
@@ -2266,7 +2256,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         MockRaftActorContext leaderActorContext = createActorContextWithFollower();
         ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setHeartBeatInterval(
                 new FiniteDuration(300, TimeUnit.MILLISECONDS));
-        ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setSnapshotChunkSize(serializedSize - 50);
+        ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setMaximumMessageSliceSize(serializedSize - 50);
         leaderActorContext.setReplicatedLog(new MockRaftActorContext.MockReplicatedLogBuilder().build());
         leaderActorContext.setCommitIndex(-1);
         leaderActorContext.setLastApplied(-1);
@@ -2285,7 +2275,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         AppendEntries appendEntries = MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
         assertEquals("Entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Entry getIndex", 0, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("Entry getIndex", 0, appendEntries.getEntries().get(0).index());
 
         leader.handleMessage(followerActor, new AppendEntriesReply(FOLLOWER_ID, term, true, 0, term, (short)0));
         assertEquals("getCommitIndex", 0, leaderActorContext.getCommitIndex());
@@ -2338,7 +2328,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
 
         appendEntries = MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
         assertEquals("Entries size", 1, appendEntries.getEntries().size());
-        assertEquals("Entry getIndex", 2, appendEntries.getEntries().get(0).getIndex());
+        assertEquals("Entry getIndex", 2, appendEntries.getEntries().get(0).index());
         assertEquals("getLeaderCommit", 1, appendEntries.getLeaderCommit());
     }
 
@@ -2350,7 +2340,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setHeartBeatInterval(
                 new FiniteDuration(100, TimeUnit.MILLISECONDS));
         ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setElectionTimeoutFactor(1);
-        ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setSnapshotChunkSize(10);
+        ((DefaultConfigParamsImpl)leaderActorContext.getConfigParams()).setMaximumMessageSliceSize(10);
         leaderActorContext.setReplicatedLog(new MockRaftActorContext.MockReplicatedLogBuilder().build());
         leaderActorContext.setCommitIndex(-1);
         leaderActorContext.setLastApplied(-1);
@@ -2365,7 +2355,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         MessageCollectorActor.clearMessages(followerActor);
 
         sendReplicate(leaderActorContext, term, 0, new MockRaftActorContext.MockPayload("large",
-                leaderActorContext.getConfigParams().getSnapshotChunkSize() + 1));
+                leaderActorContext.getConfigParams().getMaximumMessageSliceSize() + 1));
         MessageCollectorActor.expectFirstMatching(followerActor, MessageSlice.class);
 
         // Sleep for at least 3 * election timeout so the slicing state expires.
@@ -2412,7 +2402,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         // Initial heartbeat shouldn't have the leader address
 
         AppendEntries appendEntries = MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
-        assertFalse(appendEntries.getLeaderAddress().isPresent());
+        assertNull(appendEntries.leaderAddress());
         MessageCollectorActor.clearMessages(followerActor);
 
         // Send AppendEntriesReply indicating the follower needs the leader address
@@ -2427,8 +2417,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         leader.handleMessage(leaderActor, SendHeartBeat.INSTANCE);
 
         appendEntries = MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
-        assertTrue(appendEntries.getLeaderAddress().isPresent());
-        assertEquals(leaderActor.path().toString(), appendEntries.getLeaderAddress().orElseThrow());
+        assertEquals(leaderActor.path().toString(), appendEntries.leaderAddress());
         MessageCollectorActor.clearMessages(followerActor);
 
         // Send AppendEntriesReply indicating the follower does not need the leader address
@@ -2442,7 +2431,7 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         leader.handleMessage(leaderActor, SendHeartBeat.INSTANCE);
 
         appendEntries = MessageCollectorActor.expectFirstMatching(followerActor, AppendEntries.class);
-        assertFalse(appendEntries.getLeaderAddress().isPresent());
+        assertNull(appendEntries.leaderAddress());
     }
 
     @Override
@@ -2455,11 +2444,11 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
     private static class MockConfigParamsImpl extends DefaultConfigParamsImpl {
 
         private final long electionTimeOutIntervalMillis;
-        private final int snapshotChunkSize;
+        private final int maximumMessageSliceSize;
 
-        MockConfigParamsImpl(final long electionTimeOutIntervalMillis, final int snapshotChunkSize) {
+        MockConfigParamsImpl(final long electionTimeOutIntervalMillis, final int maximumMessageSliceSize) {
             this.electionTimeOutIntervalMillis = electionTimeOutIntervalMillis;
-            this.snapshotChunkSize = snapshotChunkSize;
+            this.maximumMessageSliceSize = maximumMessageSliceSize;
         }
 
         @Override
@@ -2468,8 +2457,8 @@ public class LeaderTest extends AbstractLeaderTest<Leader> {
         }
 
         @Override
-        public int getSnapshotChunkSize() {
-            return snapshotChunkSize;
+        public int getMaximumMessageSliceSize() {
+            return maximumMessageSliceSize;
         }
     }
 }