From 35a4a76db92fcd9dcf89f68719bebd394e1212b2 Mon Sep 17 00:00:00 2001 From: Andrew Kerr Date: Thu, 1 Feb 2018 12:10:51 +0000 Subject: [PATCH] Spelling --- .../discovery/TestTopology.java | 2 +- .../ClusterOverviewProcedureTest.java | 8 +-- .../GetServersProcedureV1RoutingTest.java | 8 +-- .../procedure/GetServersProcedureV1Test.java | 62 +++++++++---------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/TestTopology.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/TestTopology.java index 5cecb96a4711a..e6aafc024abf2 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/TestTopology.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/TestTopology.java @@ -43,7 +43,7 @@ private static ClientConnectorAddresses wrapAsClientConnectorAddresses( Advertis 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 catchupServerAddress = new AdvertisedSocketAddress( "localhost", 4000 + id ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedureTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedureTest.java index 1a8eaaabe998a..a45d63c8619af 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedureTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/discovery/procedures/ClusterOverviewProcedureTest.java @@ -47,7 +47,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; 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; public class ClusterOverviewProcedureTest @@ -63,9 +63,9 @@ public void shouldProvideOverviewOfCoreServersAndReadReplicas() throws Exception MemberId follower1 = new MemberId( UUID.randomUUID() ); MemberId follower2 = new MemberId( UUID.randomUUID() ); - coreMembers.put( theLeader, adressesForCore( 0 ) ); - coreMembers.put( follower1, adressesForCore( 1 ) ); - coreMembers.put( follower2, adressesForCore( 2 ) ); + coreMembers.put( theLeader, addressesForCore( 0 ) ); + coreMembers.put( follower1, addressesForCore( 1 ) ); + coreMembers.put( follower2, addressesForCore( 2 ) ); Map replicaMembers = new HashMap<>(); MemberId replica4 = new MemberId( UUID.randomUUID() ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1RoutingTest.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1RoutingTest.java index b7b66c00a8e88..a4622a8e9d430 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1RoutingTest.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1RoutingTest.java @@ -45,7 +45,7 @@ import static org.junit.runners.Parameterized.Parameters; import static org.mockito.Mockito.mock; 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.helpers.collection.Iterators.asList; import static org.neo4j.logging.NullLogProvider.getInstance; @@ -75,9 +75,9 @@ public void shouldReturnEndpointsInDifferentOrders() throws Exception when( leaderLocator.getLeader() ).thenReturn( member( 0 ) ); Map coreMembers = new HashMap<>(); - coreMembers.put( member( 0 ), adressesForCore( 0 ) ); - coreMembers.put( member( 1 ), adressesForCore( 1 ) ); - coreMembers.put( member( 2 ), adressesForCore( 2 ) ); + coreMembers.put( member( 0 ), addressesForCore( 0 ) ); + coreMembers.put( member( 1 ), addressesForCore( 1 ) ); + coreMembers.put( member( 2 ), addressesForCore( 2 ) ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); diff --git a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java index bd1b69b9e6acf..441e11d2c3a33 100644 --- a/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java +++ b/enterprise/causal-clustering/src/test/java/org/neo4j/causalclustering/load_balancing/procedure/GetServersProcedureV1Test.java @@ -61,7 +61,7 @@ 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.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.identity.RaftTestMember.member; import static org.neo4j.helpers.collection.Iterators.asList; @@ -144,7 +144,7 @@ public void shouldProvideReaderAndRouterForSingleCoreSetup() throws Exception LeaderLocator leaderLocator = mock( LeaderLocator.class ); Map coreMembers = new HashMap<>(); - coreMembers.put( member( 0 ), adressesForCore( 0 ) ); + coreMembers.put( member( 0 ), addressesForCore( 0 ) ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); @@ -158,8 +158,8 @@ public void shouldProvideReaderAndRouterForSingleCoreSetup() throws Exception // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); } @@ -174,9 +174,9 @@ public void shouldReturnCoreServersWithRouteAllCoresButLeaderAsReadAndSingleWrit when( leaderLocator.getLeader() ).thenReturn( member( 0 ) ); Map coreMembers = new HashMap<>(); - coreMembers.put( member( 0 ), adressesForCore( 0 ) ); - coreMembers.put( member( 1 ), adressesForCore( 1 ) ); - coreMembers.put( member( 2 ), adressesForCore( 2 ) ); + coreMembers.put( member( 0 ), addressesForCore( 0 ) ); + coreMembers.put( member( 1 ), addressesForCore( 1 ) ); + coreMembers.put( member( 2 ), addressesForCore( 2 ) ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); @@ -190,12 +190,12 @@ public void shouldReturnCoreServersWithRouteAllCoresButLeaderAsReadAndSingleWrit // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.readAddress( adressesForCore( 1 ).connectors().boltAddress() ); - builder.readAddress( adressesForCore( 2 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 1 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 2 ).connectors().boltAddress() ); + builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 1 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 2 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 1 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 2 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); } @@ -210,7 +210,7 @@ public void shouldReturnSelfIfOnlyMemberOfTheCluster() throws Exception when( leaderLocator.getLeader() ).thenReturn( member( 0 ) ); Map coreMembers = new HashMap<>(); - coreMembers.put( member( 0 ), adressesForCore( 0 ) ); + coreMembers.put( member( 0 ), addressesForCore( 0 ) ); final CoreTopology clusterTopology = new CoreTopology( clusterId, false, coreMembers ); when( coreTopologyService.coreServers() ).thenReturn( clusterTopology ); @@ -224,9 +224,9 @@ public void shouldReturnSelfIfOnlyMemberOfTheCluster() throws Exception // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); } @@ -239,7 +239,7 @@ public void shouldReturnTheCoreLeaderForWriteAndReadReplicasAndCoresForReads() t Map coreMembers = new HashMap<>(); 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.readReplicas() ).thenReturn( new ReadReplicaTopology( readReplicaInfoMap( 1 ) ) ); @@ -255,13 +255,13 @@ public void shouldReturnTheCoreLeaderForWriteAndReadReplicasAndCoresForReads() t // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() ); if ( expectFollowersAsReadEndPoints ) { - builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() ); } builder.readAddress( addressesForReadReplica( 1 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); } @@ -274,7 +274,7 @@ public void shouldReturnCoreMemberAsReadServerIfNoReadReplicasAvailable() throws Map coreMembers = new HashMap<>(); 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.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) ); @@ -290,9 +290,9 @@ public void shouldReturnCoreMemberAsReadServerIfNoReadReplicasAvailable() throws // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.writeAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.writeAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); } @@ -304,7 +304,7 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoLeader() throws Exception final CoreTopologyService topologyService = mock( CoreTopologyService.class ); Map 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.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) ); @@ -320,8 +320,8 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoLeader() throws Exception // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); } @@ -333,7 +333,7 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws final CoreTopologyService topologyService = mock( CoreTopologyService.class ); Map 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.readReplicas() ).thenReturn( new ReadReplicaTopology( emptyMap() ) ); @@ -350,8 +350,8 @@ public void shouldReturnNoWriteEndpointsIfThereIsNoAddressForTheLeader() throws // then ClusterView.Builder builder = new ClusterView.Builder(); - builder.readAddress( adressesForCore( 0 ).connectors().boltAddress() ); - builder.routeAddress( adressesForCore( 0 ).connectors().boltAddress() ); + builder.readAddress( addressesForCore( 0 ).connectors().boltAddress() ); + builder.routeAddress( addressesForCore( 0 ).connectors().boltAddress() ); assertEquals( builder.build(), clusterView ); }