Skip to content

Commit

Permalink
Spelling
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrewkerr9000
andrewkerr9000 committed Feb 1, 2018
1 parent e3f6eb1 commit 35a4a76
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 40 deletions.
2 changes: 1 addition & 1 deletion ...se/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/TestTopology.java
View file
Expand Up @@ -43,7 +43,7 @@ private static ClientConnectorAddresses wrapAsClientConnectorAddresses( Advertis
return new ClientConnectorAddresses( singletonList( new ClientConnectorAddresses.ConnectorUri( bolt, advertisedSocketAddress ) ) ); return new ClientConnectorAddresses( singletonList( new ClientConnectorAddresses.ConnectorUri( bolt, advertisedSocketAddress ) ) );
} }


public static CoreServerInfo adressesForCore( int id ) public static CoreServerInfo addressesForCore( int id )
{ {
AdvertisedSocketAddress raftServerAddress = new AdvertisedSocketAddress( "localhost", 3000 + id ); AdvertisedSocketAddress raftServerAddress = new AdvertisedSocketAddress( "localhost", 3000 + id );
AdvertisedSocketAddress catchupServerAddress = new AdvertisedSocketAddress( "localhost", 4000 + id ); AdvertisedSocketAddress catchupServerAddress = new AdvertisedSocketAddress( "localhost", 4000 + id );
Expand Down
8 changes: 4 additions & 4 deletions ...st/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedureTest.java
View file
Expand Up @@ -47,7 +47,7 @@
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.neo4j.causalclustering.discovery.TestTopology.addressesForReadReplica; import static org.neo4j.causalclustering.discovery.TestTopology.addressesForReadReplica;
import static org.neo4j.causalclustering.discovery.TestTopology.adressesForCore; import static org.neo4j.causalclustering.discovery.TestTopology.addressesForCore;
import static org.neo4j.helpers.collection.Iterators.asSet; import static org.neo4j.helpers.collection.Iterators.asSet;


public class ClusterOverviewProcedureTest public class ClusterOverviewProcedureTest
Expand All @@ -63,9 +63,9 @@ public void shouldProvideOverviewOfCoreServersAndReadReplicas() throws Exception
MemberId follower1 = new MemberId( UUID.randomUUID() ); MemberId follower1 = new MemberId( UUID.randomUUID() );
MemberId follower2 = new MemberId( UUID.randomUUID() ); MemberId follower2 = new MemberId( UUID.randomUUID() );


coreMembers.put( theLeader, adressesForCore( 0 ) ); coreMembers.put( theLeader, addressesForCore( 0 ) );
coreMembers.put( follower1, adressesForCore( 1 ) ); coreMembers.put( follower1, addressesForCore( 1 ) );
coreMembers.put( follower2, adressesForCore( 2 ) ); coreMembers.put( follower2, addressesForCore( 2 ) );


Map<MemberId,ReadReplicaInfo> replicaMembers = new HashMap<>(); Map<MemberId,ReadReplicaInfo> replicaMembers = new HashMap<>();
MemberId replica4 = new MemberId( UUID.randomUUID() ); MemberId replica4 = new MemberId( UUID.randomUUID() );
Expand Down
8 changes: 4 additions & 4 deletions ...org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1RoutingTest.java
View file
Expand Up @@ -45,7 +45,7 @@
import static org.junit.runners.Parameterized.Parameters; import static org.junit.runners.Parameterized.Parameters;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.neo4j.causalclustering.discovery.TestTopology.adressesForCore; import static org.neo4j.causalclustering.discovery.TestTopology.addressesForCore;
import static org.neo4j.causalclustering.identity.RaftTestMember.member; import static org.neo4j.causalclustering.identity.RaftTestMember.member;
import static org.neo4j.helpers.collection.Iterators.asList; import static org.neo4j.helpers.collection.Iterators.asList;
import static org.neo4j.logging.NullLogProvider.getInstance; import static org.neo4j.logging.NullLogProvider.getInstance;
Expand Down Expand Up @@ -75,9 +75,9 @@ public void shouldReturnEndpointsInDifferentOrders() throws Exception
when( leaderLocator.getLeader() ).thenReturn( member( 0 ) ); when( leaderLocator.getLeader() ).thenReturn( member( 0 ) );


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), adressesForCore( 0 ) ); coreMembers.put( member( 0 ), addressesForCore( 0 ) );
coreMembers.put( member( 1 ), adressesForCore( 1 ) ); coreMembers.put( member( 1 ), addressesForCore( 1 ) );
coreMembers.put( member( 2 ), adressesForCore( 2 ) ); coreMembers.put( member( 2 ), addressesForCore( 2 ) );


final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers );
when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology );
Expand Down
62 changes: 31 additions & 31 deletions ...t/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java
View file
Expand Up @@ -61,7 +61,7 @@
import static org.neo4j.causalclustering.core.CausalClusteringSettings.cluster_allow_reads_on_followers; import static org.neo4j.causalclustering.core.CausalClusteringSettings.cluster_allow_reads_on_followers;
import static org.neo4j.causalclustering.core.CausalClusteringSettings.cluster_routing_ttl; import static org.neo4j.causalclustering.core.CausalClusteringSettings.cluster_routing_ttl;
import static org.neo4j.causalclustering.discovery.TestTopology.addressesForReadReplica; import static org.neo4j.causalclustering.discovery.TestTopology.addressesForReadReplica;
import static org.neo4j.causalclustering.discovery.TestTopology.adressesForCore; import static org.neo4j.causalclustering.discovery.TestTopology.addressesForCore;
import static org.neo4j.causalclustering.discovery.TestTopology.readReplicaInfoMap; import static org.neo4j.causalclustering.discovery.TestTopology.readReplicaInfoMap;
import static org.neo4j.causalclustering.identity.RaftTestMember.member; import static org.neo4j.causalclustering.identity.RaftTestMember.member;
import static org.neo4j.helpers.collection.Iterators.asList; import static org.neo4j.helpers.collection.Iterators.asList;
Expand Down Expand Up @@ -144,7 +144,7 @@ public void shouldProvideReaderAndRouterForSingleCoreSetup() throws Exception
LeaderLocator leaderLocator = mock( LeaderLocator.class ); LeaderLocator leaderLocator = mock( LeaderLocator.class );


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), adressesForCore( 0 ) ); coreMembers.put( member( 0 ), addressesForCore( 0 ) );


final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers );
when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology );
Expand All @@ -158,8 +158,8 @@ public void shouldProvideReaderAndRouterForSingleCoreSetup() throws Exception


// then // then
ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand All @@ -174,9 +174,9 @@ public void shouldReturnCoreServersWithRouteAllCoresButLeaderAsReadAndSingleWrit
when( leaderLocator.getLeader() ).thenReturn( member( 0 ) ); when( leaderLocator.getLeader() ).thenReturn( member( 0 ) );


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), adressesForCore( 0 ) ); coreMembers.put( member( 0 ), addressesForCore( 0 ) );
coreMembers.put( member( 1 ), adressesForCore( 1 ) ); coreMembers.put( member( 1 ), addressesForCore( 1 ) );
coreMembers.put( member( 2 ), adressesForCore( 2 ) ); coreMembers.put( member( 2 ), addressesForCore( 2 ) );


final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers );
when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology );
Expand All @@ -190,12 +190,12 @@ public void shouldReturnCoreServersWithRouteAllCoresButLeaderAsReadAndSingleWrit


// then // then
ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.readAddress( adressesForCore( 1 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 1 ).connectors().boltAddress() );
builder.readAddress( adressesForCore( 2 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 2 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 1 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 1 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 2 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 2 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand All @@ -210,7 +210,7 @@ public void shouldReturnSelfIfOnlyMemberOfTheCluster() throws Exception
when( leaderLocator.getLeader() ).thenReturn( member( 0 ) ); when( leaderLocator.getLeader() ).thenReturn( member( 0 ) );


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), adressesForCore( 0 ) ); coreMembers.put( member( 0 ), addressesForCore( 0 ) );


final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers );
when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology );
Expand All @@ -224,9 +224,9 @@ public void shouldReturnSelfIfOnlyMemberOfTheCluster() throws Exception


// then // then
ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand All @@ -239,7 +239,7 @@ public void shouldReturnTheCoreLeaderForWriteAndReadReplicasAndCoresForReads() t


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
MemberId theLeader = member( 0 ); MemberId theLeader = member( 0 );
coreMembers.put( theLeader, adressesForCore( 0 ) ); coreMembers.put( theLeader, addressesForCore( 0 ) );


when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) ); when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) );
when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( readReplicaInfoMap( 1 ) ) ); when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( readReplicaInfoMap( 1 ) ) );
Expand All @@ -255,13 +255,13 @@ public void shouldReturnTheCoreLeaderForWriteAndReadReplicasAndCoresForReads() t


// then // then
ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() );
if ( expectFollowersAsReadEndPoints ) if ( expectFollowersAsReadEndPoints )
{ {
builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() );
} }
builder.readAddress( addressesForReadReplica( 1 ).connectors().boltAddress() ); builder.readAddress( addressesForReadReplica( 1 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand All @@ -274,7 +274,7 @@ public void shouldReturnCoreMemberAsReadServerIfNoReadReplicasAvailable() throws


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
MemberId theLeader = member( 0 ); MemberId theLeader = member( 0 );
coreMembers.put( theLeader, adressesForCore( 0 ) ); coreMembers.put( theLeader, addressesForCore( 0 ) );


when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) ); when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) );
when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) ); when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) );
Expand All @@ -290,9 +290,9 @@ public void shouldReturnCoreMemberAsReadServerIfNoReadReplicasAvailable() throws


// then // then
ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand All @@ -304,7 +304,7 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoLeader() throws Exception
final CoreTopologyService topologyService = mock( CoreTopologyService.class ); final CoreTopologyService topologyService = mock( CoreTopologyService.class );


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), adressesForCore( 0 ) ); coreMembers.put( member( 0 ), addressesForCore( 0 ) );


when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) ); when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) );
when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) ); when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) );
Expand All @@ -320,8 +320,8 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoLeader() throws Exception


// then // then
ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand All @@ -333,7 +333,7 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws
final CoreTopologyService topologyService = mock( CoreTopologyService.class ); final CoreTopologyService topologyService = mock( CoreTopologyService.class );


Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>(); Map<MemberId,CoreServerInfo> coreMembers = new HashMap<>();
coreMembers.put( member( 0 ), adressesForCore( 0 ) ); coreMembers.put( member( 0 ), addressesForCore( 0 ) );


when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) ); when( topologyService.coreServers() ).thenReturn( new CoreTopology( clusterId, false, coreMembers ) );
when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) ); when( topologyService.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) );
Expand All @@ -350,8 +350,8 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws
// then // then


ClusterView.Builder builder = new ClusterView.Builder(); ClusterView.Builder builder = new ClusterView.Builder();
builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() );
builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() );


assertEquals( builder.build(), clusterView ); assertEquals( builder.build(), clusterView );
} }
Expand Down

0 comments on commit 35a4a76

Please sign in to comment.