From 0224f99256f8d84191d5153d488f453b1643481d Mon Sep 17 00:00:00 2001 From: Martin Furmanski Date: Fri, 15 Jan 2016 17:40:50 +0100 Subject: [PATCH] Rename StubReplicator to DirectReplicator. Since that is what it does, replicates directly. --- .../membership/RaftMembershipManagerTest.java | 12 ++++++------ ...StubReplicator.java => DirectReplicator.java} | 2 +- .../id/ReplicatedIdRangeAcquirerTest.java | 4 ++-- .../core/locks/LeaderOnlyLockManagerTest.java | 6 +++--- .../ReplicatedLockTokenStateMachineTest.java | 16 ++++++++-------- 5 files changed, 20 insertions(+), 20 deletions(-) rename enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/{StubReplicator.java => DirectReplicator.java} (96%) diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java index b8ea8a98129af..a1a3850866b46 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/membership/RaftMembershipManagerTest.java @@ -23,7 +23,7 @@ import org.neo4j.coreedge.raft.log.InMemoryRaftLog; import org.neo4j.coreedge.raft.log.RaftLogEntry; -import org.neo4j.coreedge.raft.replication.StubReplicator; +import org.neo4j.coreedge.raft.replication.DirectReplicator; import org.neo4j.coreedge.raft.state.membership.InMemoryRaftMembershipState; import org.neo4j.coreedge.server.RaftTestMember; import org.neo4j.coreedge.server.RaftTestMemberSetBuilder; @@ -49,7 +49,7 @@ public void membershipManagerShouldUseLatestAppendedMembershipSetEntries() // given final InMemoryRaftLog log = new InMemoryRaftLog(); - RaftMembershipManager membershipManager = new RaftMembershipManager<>( new StubReplicator(), + RaftMembershipManager membershipManager = new RaftMembershipManager<>( new DirectReplicator(), RaftTestMemberSetBuilder.INSTANCE, log, NullLogProvider.getInstance(), 3, 1000, new FakeClock(), 1000, new InMemoryRaftMembershipState<>() ); @@ -72,7 +72,7 @@ public void membershipManagerShouldRevertToOldMembershipSetAfterTruncationCauses final InMemoryRaftLog log = new InMemoryRaftLog(); - RaftMembershipManager membershipManager = new RaftMembershipManager<>( new StubReplicator(), + RaftMembershipManager membershipManager = new RaftMembershipManager<>( new DirectReplicator(), RaftTestMemberSetBuilder.INSTANCE, log, NullLogProvider.getInstance(), 3, 1000, new FakeClock(), 1000, new InMemoryRaftMembershipState<>() ); @@ -97,7 +97,7 @@ public void membershipManagerShouldRevertToEarlierAppendedMembershipSetAfterTrun // given final InMemoryRaftLog log = new InMemoryRaftLog(); - RaftMembershipManager membershipManager = new RaftMembershipManager<>( new StubReplicator(), + RaftMembershipManager membershipManager = new RaftMembershipManager<>( new DirectReplicator(), RaftTestMemberSetBuilder.INSTANCE, log, NullLogProvider.getInstance(), 3, 1000, new FakeClock(), 1000, new InMemoryRaftMembershipState<>() ); @@ -126,7 +126,7 @@ public void shouldNotOverwriteCurrentStateWithPreviousState() throws Exception final long logIndex = 42l; when( state.logIndex() ).thenReturn( logIndex ); - RaftMembershipManager membershipManager = new RaftMembershipManager<>( new StubReplicator(), + RaftMembershipManager membershipManager = new RaftMembershipManager<>( new DirectReplicator(), RaftTestMemberSetBuilder.INSTANCE, log, NullLogProvider.getInstance(), 3, 1000, new FakeClock(), 1000, state ); @@ -139,4 +139,4 @@ public void shouldNotOverwriteCurrentStateWithPreviousState() throws Exception verify( state, times( 0 ) ).logIndex( anyLong() ); verify( state, times( 0 ) ).setVotingMembers( anySet() ); } -} \ No newline at end of file +} diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/StubReplicator.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/DirectReplicator.java similarity index 96% rename from enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/StubReplicator.java rename to enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/DirectReplicator.java index 81226d1cfb341..34d51d1114b33 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/StubReplicator.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/DirectReplicator.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Set; -public class StubReplicator implements Replicator +public class DirectReplicator implements Replicator { private final Set listeners = new HashSet<>(); private long logIndex = 0; diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java index 9ab8833ad9ec0..4b13794cf12cb 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/raft/replication/id/ReplicatedIdRangeAcquirerTest.java @@ -24,7 +24,7 @@ import org.junit.Test; -import org.neo4j.coreedge.raft.replication.StubReplicator; +import org.neo4j.coreedge.raft.replication.DirectReplicator; import org.neo4j.coreedge.raft.state.id_allocation.InMemoryIdAllocationState; import org.neo4j.coreedge.server.AdvertisedSocketAddress; import org.neo4j.coreedge.server.CoreMember; @@ -39,7 +39,7 @@ public class ReplicatedIdRangeAcquirerTest new AdvertisedSocketAddress( "a:2" ) ); private final CoreMember two = new CoreMember( new AdvertisedSocketAddress( "b:1" ), new AdvertisedSocketAddress( "b:2" ) ); - private final StubReplicator replicator = new StubReplicator(); + private final DirectReplicator replicator = new DirectReplicator(); @Test public void consecutiveAllocationsFromSeparateIdGeneratorsForSameIdTypeShouldNotDuplicateWhenInitialIdIsZero() diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java index bc0a90aa5c701..80a9994464f29 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/LeaderOnlyLockManagerTest.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.neo4j.coreedge.raft.LeaderLocator; -import org.neo4j.coreedge.raft.replication.StubReplicator; +import org.neo4j.coreedge.raft.replication.DirectReplicator; import org.neo4j.coreedge.server.RaftTestMember; import org.neo4j.kernel.impl.locking.Locks; import org.neo4j.kernel.impl.locking.ResourceTypes; @@ -43,7 +43,7 @@ public void shouldIssueLocksOnLeader() throws Exception { // given RaftTestMember me = member( 0 ); - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); ReplicatedLockTokenStateMachine replicatedLockStateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); LeaderLocator leaderLocator = mock( LeaderLocator.class ); when(leaderLocator.getLeader()).thenReturn( me ); @@ -65,7 +65,7 @@ public void shouldNotIssueLocksOnNonLeader() throws Exception // given RaftTestMember me = member( 0 ); RaftTestMember leader = member( 1 ); - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); ReplicatedLockTokenStateMachine replicatedLockStateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); LeaderLocator leaderLocator = mock( LeaderLocator.class ); when(leaderLocator.getLeader()).thenReturn( leader ); diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java index cbb520a9a5bd8..de2f993781bea 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/server/core/locks/ReplicatedLockTokenStateMachineTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -import org.neo4j.coreedge.raft.replication.StubReplicator; +import org.neo4j.coreedge.raft.replication.DirectReplicator; import static org.junit.Assert.assertEquals; @@ -33,8 +33,8 @@ public class ReplicatedLockTokenStateMachineTest public void shouldStartWithInvalidTokenId() throws Exception { // given - StubReplicator replicator = new StubReplicator(); - ReplicatedLockTokenStateMachine stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); + DirectReplicator replicator = new DirectReplicator(); + LockTokenManager stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); // when int initialTokenId = stateMachine.currentToken().id(); @@ -47,7 +47,7 @@ public void shouldStartWithInvalidTokenId() throws Exception public void shouldIssueNextLockTokenCandidateId() throws Exception { // given - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); ReplicatedLockTokenStateMachine stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); int firstCandidateId = stateMachine.nextCandidateId(); @@ -62,7 +62,7 @@ public void shouldIssueNextLockTokenCandidateId() throws Exception public void shouldKeepTrackOfCurrentLockTokenId() throws Exception { // given - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); LockTokenManager stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); int firstCandidateId = stateMachine.nextCandidateId(); @@ -83,7 +83,7 @@ public void shouldKeepTrackOfCurrentLockTokenId() throws Exception public void shouldKeepTrackOfLockTokenOwner() throws Exception { // given - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); LockTokenManager stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); int firstCandidateId = stateMachine.nextCandidateId(); @@ -104,7 +104,7 @@ public void shouldKeepTrackOfLockTokenOwner() throws Exception public void shouldAcceptOnlyFirstRequestWithSameId() throws Exception { // given - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); LockTokenManager stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); int firstCandidateId = stateMachine.nextCandidateId(); @@ -129,7 +129,7 @@ public void shouldAcceptOnlyFirstRequestWithSameId() throws Exception public void shouldOnlyAcceptNextImmediateId() throws Exception { // given - StubReplicator replicator = new StubReplicator(); + DirectReplicator replicator = new DirectReplicator(); LockTokenManager stateMachine = new ReplicatedLockTokenStateMachine<>( replicator ); int firstCandidateId = stateMachine.nextCandidateId();