Skip to content

Commit be303fc

Browse files
author
Zhen
committed
Fix after review
Renamed to `getRoutingTable` and `withRoutingContext`
1 parent 5421c71 commit be303fc

File tree

7 files changed

+31
-30
lines changed

7 files changed

+31
-30
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/cluster/GetServersProcedureRunner.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,27 +28,27 @@
2828
import org.neo4j.driver.v1.Value;
2929

3030
import static org.neo4j.driver.internal.SessionResourcesHandler.NO_OP;
31-
import static org.neo4j.driver.internal.cluster.ServerVersion.v3_2_0;
32-
import static org.neo4j.driver.internal.cluster.ServerVersion.version;
31+
import static org.neo4j.driver.internal.util.ServerVersion.v3_2_0;
32+
import static org.neo4j.driver.internal.util.ServerVersion.version;
3333

3434
public class GetServersProcedureRunner
3535
{
36-
private static final String GET_SERVERS = "dbms.cluster.routing.getServers";
37-
private static final String GET_SERVERS_V2 = "dbms.cluster.routing.getServersV2";
36+
static final String GET_SERVERS = "dbms.cluster.routing.getServers";
37+
static final String GET_ROUTING_TABLE = "dbms.cluster.routing.getRoutingTable";
3838

39-
private final Value routingParameters;
39+
private final Value routingContext;
4040
private Statement procedureCalled;
4141

42-
public GetServersProcedureRunner( Value parameters )
42+
public GetServersProcedureRunner( Value context )
4343
{
44-
this.routingParameters = parameters;
44+
this.routingContext = context;
4545
}
4646

4747
public List<Record> run( Connection connection )
4848
{
4949
if( version( connection.server().version() ).greaterThanOrEqual( v3_2_0 ) )
5050
{
51-
procedureCalled = new Statement( "CALL " + GET_SERVERS_V2, routingParameters );
51+
procedureCalled = new Statement( "CALL " + GET_ROUTING_TABLE, routingContext );
5252
}
5353
else
5454
{

‎driver/src/main/java/org/neo4j/driver/internal/cluster/ServerVersion.java‎ renamed to ‎driver/src/main/java/org/neo4j/driver/internal/util/ServerVersion.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*/
19-
package org.neo4j.driver.internal.cluster;
19+
package org.neo4j.driver.internal.util;
2020

2121
import java.util.regex.Matcher;
2222
import java.util.regex.Pattern;

‎driver/src/main/java/org/neo4j/driver/v1/Config.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class Config
7575
private final int connectionTimeoutMillis;
7676
private final RetrySettings retrySettings;
7777

78-
private final Map<String, String> routingParameters;
78+
private final Map<String, String> routingContext;
7979

8080
private Config( ConfigBuilder builder)
8181
{
@@ -92,7 +92,7 @@ private Config( ConfigBuilder builder)
9292
this.connectionTimeoutMillis = builder.connectionTimeoutMillis;
9393
this.retrySettings = builder.retrySettings;
9494

95-
this.routingParameters = builder.routingParameters;
95+
this.routingContext = builder.routingContext;
9696
}
9797

9898
/**
@@ -187,7 +187,7 @@ public static Config defaultConfig()
187187

188188
RoutingSettings routingSettings()
189189
{
190-
return new RoutingSettings( routingFailureLimit, routingRetryDelayMillis, routingParameters );
190+
return new RoutingSettings( routingFailureLimit, routingRetryDelayMillis, routingContext );
191191
}
192192

193193
RetrySettings retrySettings()
@@ -210,7 +210,7 @@ public static class ConfigBuilder
210210
private long routingRetryDelayMillis = TimeUnit.SECONDS.toMillis( 5 );
211211
private int connectionTimeoutMillis = (int) TimeUnit.SECONDS.toMillis( 5 );
212212
private RetrySettings retrySettings = RetrySettings.DEFAULT;
213-
private Map<String,String> routingParameters = null;
213+
private Map<String,String> routingContext = null;
214214

215215
private ConfigBuilder() {}
216216

@@ -480,17 +480,17 @@ public ConfigBuilder withMaxTransactionRetryTime( long value, TimeUnit unit )
480480
}
481481

482482
/**
483-
* Specify routing parameters that would be passed to server in getServers Procedure call for customized
483+
* Specify routing context that would be passed to server in getRoutingTable Procedure call for customized
484484
* routing table reply.
485485
* This parameter is only valid for the routing driver, a.k.a. the driver created use bolt+routing in URI
486486
* scheme with 3.2+ Neo4j Casual Cluster servers.
487-
* @param parameters The parameters to pass to getServers Procedure
487+
* @param context The routing context to pass to getRoutingTable Procedure
488488
* @since 1.3
489489
* @return this builder
490490
*/
491-
public ConfigBuilder withRoutingParameters( Map<String, String> parameters )
491+
public ConfigBuilder withRoutingContext( Map<String, String> context )
492492
{
493-
this.routingParameters = parameters;
493+
this.routingContext = context;
494494
return this;
495495
}
496496

‎driver/src/test/java/org/neo4j/driver/internal/cluster/GetServersProcedureRunnerTest.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import static org.hamcrest.core.IsEqual.equalTo;
3535
import static org.mockito.Mockito.mock;
3636
import static org.mockito.Mockito.when;
37+
import static org.neo4j.driver.internal.cluster.GetServersProcedureRunner.GET_SERVERS;
38+
import static org.neo4j.driver.internal.cluster.GetServersProcedureRunner.GET_ROUTING_TABLE;
3739
import static org.neo4j.driver.v1.Values.value;
3840

3941
public class GetServersProcedureRunnerTest
@@ -50,8 +52,8 @@ public void shouldCallGetServersV2WithNull() throws Throwable
5052
runner.run( mock );
5153

5254
// Then
53-
assertThat( runner.procedureCalled().toString(), equalTo(
54-
"Statement{text='CALL dbms.cluster.routing.getServersV2', parameters=NULL}" ) );
55+
assertThat( runner.procedureCalled(), equalTo(
56+
new Statement( "CALL " + GET_ROUTING_TABLE, value( (Object) null) ) ) );
5557
}
5658

5759
@Test
@@ -69,9 +71,8 @@ public void shouldCallGetServersV2WithParam() throws Throwable
6971
runner.run( mock );
7072

7173
// Then
72-
assertThat( runner.procedureCalled().toString(), equalTo(
73-
"Statement{text='CALL dbms.cluster.routing.getServersV2', " +
74-
"parameters={key2: \"value2\", key1: \"value1\"}}" ) );
74+
assertThat( runner.procedureCalled(), equalTo(
75+
new Statement( "CALL " + GET_ROUTING_TABLE, value( param ) ) ) );
7576
}
7677

7778
@Test
@@ -89,8 +90,8 @@ public void shouldCallGetServerV1() throws Throwable
8990
runner.run( mock );
9091

9192
// Then
92-
assertThat( runner.procedureCalled().toString(), equalTo(
93-
"Statement{text='CALL dbms.cluster.routing.getServers', parameters={}}" ) );
93+
assertThat( runner.procedureCalled(), equalTo(
94+
new Statement( "CALL " + GET_SERVERS ) ) );
9495
}
9596

9697
private static class TestGetServersProcedureRunner extends GetServersProcedureRunner

‎driver/src/test/java/org/neo4j/driver/v1/integration/BookmarkIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.neo4j.driver.v1.Transaction;
3232
import org.neo4j.driver.v1.exceptions.ClientException;
3333
import org.neo4j.driver.v1.exceptions.TransientException;
34-
import org.neo4j.driver.internal.cluster.ServerVersion;
34+
import org.neo4j.driver.internal.util.ServerVersion;
3535
import org.neo4j.driver.v1.util.TestNeo4jSession;
3636

3737
import static java.util.Arrays.asList;
@@ -43,7 +43,7 @@
4343
import static org.junit.Assert.assertThat;
4444
import static org.junit.Assert.fail;
4545
import static org.junit.Assume.assumeTrue;
46-
import static org.neo4j.driver.internal.cluster.ServerVersion.v3_1_0;
46+
import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
4747

4848
public class BookmarkIT
4949
{

‎driver/src/test/java/org/neo4j/driver/v1/integration/SessionIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import org.neo4j.driver.v1.exceptions.ClientException;
4545
import org.neo4j.driver.v1.exceptions.Neo4jException;
4646
import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
47-
import org.neo4j.driver.internal.cluster.ServerVersion;
47+
import org.neo4j.driver.internal.util.ServerVersion;
4848
import org.neo4j.driver.v1.util.TestNeo4j;
4949

5050
import static org.hamcrest.CoreMatchers.containsString;
@@ -68,7 +68,7 @@
6868
import static org.mockito.Mockito.verify;
6969
import static org.neo4j.driver.v1.Config.defaultConfig;
7070
import static org.neo4j.driver.v1.Values.parameters;
71-
import static org.neo4j.driver.internal.cluster.ServerVersion.v3_1_0;
71+
import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
7272

7373
public class SessionIT
7474
{

‎driver/src/test/java/org/neo4j/driver/v1/integration/SummaryIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import static org.junit.Assert.assertNotNull;
4444
import static org.junit.Assert.assertThat;
4545
import static org.junit.Assert.assertTrue;
46-
import static org.neo4j.driver.internal.cluster.ServerVersion.v3_1_0;
47-
import static org.neo4j.driver.internal.cluster.ServerVersion.version;
46+
import static org.neo4j.driver.internal.util.ServerVersion.v3_1_0;
47+
import static org.neo4j.driver.internal.util.ServerVersion.version;
4848

4949
public class SummaryIT
5050
{

0 commit comments

Comments
 (0)