Skip to content

Commit 6eb2dd7

Browse files
pontusmelkepontusmelke
committed
AccessMode -> AccessRole
1 parent a197ccd commit 6eb2dd7

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed

‎driver/src/main/java/org/neo4j/driver/internal/ClusterDriver.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.neo4j.driver.internal.spi.ConnectionPool;
3030
import org.neo4j.driver.internal.util.ConcurrentRoundRobinSet;
3131
import org.neo4j.driver.internal.util.Consumer;
32-
import org.neo4j.driver.v1.AccessMode;
32+
import org.neo4j.driver.v1.AccessRole;
3333
import org.neo4j.driver.v1.Logger;
3434
import org.neo4j.driver.v1.Logging;
3535
import org.neo4j.driver.v1.Record;
@@ -242,13 +242,13 @@ private synchronized void forget( BoltServerAddress address )
242242
@Override
243243
public Session session()
244244
{
245-
return session( AccessMode.WRITE );
245+
return session( AccessRole.WRITE );
246246
}
247247

248248
@Override
249-
public Session session( final AccessMode mode )
249+
public Session session( final AccessRole role )
250250
{
251-
return new ClusteredNetworkSession( acquireConnection( mode ),
251+
return new ClusteredNetworkSession( acquireConnection( role ),
252252
new ClusteredErrorHandler()
253253
{
254254
@Override
@@ -266,19 +266,19 @@ public void onWriteFailure( BoltServerAddress address )
266266
log );
267267
}
268268

269-
private Connection acquireConnection( AccessMode mode )
269+
private Connection acquireConnection( AccessRole role )
270270
{
271271
//Potentially rediscover servers if we are not happy with our current knowledge
272272
checkServers();
273273

274-
switch ( mode )
274+
switch ( role )
275275
{
276276
case READ:
277277
return connections.acquire( readServers.hop() );
278278
case WRITE:
279279
return connections.acquire( writeServers.hop() );
280280
default:
281-
throw new ClientException( mode + " is not supported for creating new sessions" );
281+
throw new ClientException( role + " is not supported for creating new sessions" );
282282
}
283283
}
284284

‎driver/src/main/java/org/neo4j/driver/internal/DirectDriver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.neo4j.driver.internal.net.BoltServerAddress;
2222
import org.neo4j.driver.internal.security.SecurityPlan;
2323
import org.neo4j.driver.internal.spi.ConnectionPool;
24-
import org.neo4j.driver.v1.AccessMode;
24+
import org.neo4j.driver.v1.AccessRole;
2525
import org.neo4j.driver.v1.Logging;
2626
import org.neo4j.driver.v1.Session;
2727

@@ -47,7 +47,7 @@ public Session session()
4747
}
4848

4949
@Override
50-
public Session session( AccessMode ignore )
50+
public Session session( AccessRole ignore )
5151
{
5252
return session();
5353
}

‎driver/src/main/java/org/neo4j/driver/v1/AccessMode.java renamed to ‎driver/src/main/java/org/neo4j/driver/v1/AccessRole.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*/
1919
package org.neo4j.driver.v1;
2020

21-
public enum AccessMode
21+
public enum AccessRole
2222
{
2323
READ,
2424
WRITE

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public interface Driver extends AutoCloseable
8686
*/
8787
Session session();
8888

89-
Session session(AccessMode mode);
89+
Session session(AccessRole role);
9090

9191
/**
9292
* Close all the resources assigned to this driver

‎driver/src/test/java/org/neo4j/driver/internal/ClusterDriverStubTest.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
import org.neo4j.driver.internal.logging.ConsoleLogging;
3838
import org.neo4j.driver.internal.net.BoltServerAddress;
39-
import org.neo4j.driver.v1.AccessMode;
39+
import org.neo4j.driver.v1.AccessRole;
4040
import org.neo4j.driver.v1.Config;
4141
import org.neo4j.driver.v1.GraphDatabase;
4242
import org.neo4j.driver.v1.Record;
@@ -133,7 +133,7 @@ public void shouldHandleAcquireReadSession() throws IOException, InterruptedExce
133133
StubServer readServer = StubServer.start( resource( "read_server.script" ), 9005 );
134134
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
135135
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
136-
Session session = driver.session( AccessMode.READ ) )
136+
Session session = driver.session( AccessRole.READ ) )
137137
{
138138
List<String> result = session.run( "MATCH (n) RETURN n.name" ).list( new Function<Record,String>()
139139
{
@@ -167,7 +167,7 @@ public void shouldRoundRobinReadServers() throws IOException, InterruptedExcepti
167167
// Run twice, one on each read server
168168
for ( int i = 0; i < 2; i++ )
169169
{
170-
try ( Session session = driver.session( AccessMode.READ ) )
170+
try ( Session session = driver.session( AccessRole.READ ) )
171171
{
172172
assertThat( session.run( "MATCH (n) RETURN n.name" ).list( new Function<Record,String>()
173173
{
@@ -201,7 +201,7 @@ public void shouldThrowSessionExpiredIfReadServerDisappears()
201201
StubServer.start( resource( "dead_server.script" ), 9005 );
202202
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
203203
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
204-
Session session = driver.session( AccessMode.READ ) )
204+
Session session = driver.session( AccessRole.READ ) )
205205
{
206206
session.run( "MATCH (n) RETURN n.name" );
207207
}
@@ -224,7 +224,7 @@ public void shouldThrowSessionExpiredIfWriteServerDisappears()
224224
StubServer.start( resource( "dead_server.script" ), 9007 );
225225
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
226226
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
227-
Session session = driver.session( AccessMode.WRITE ) )
227+
Session session = driver.session( AccessRole.WRITE ) )
228228
{
229229
session.run( "MATCH (n) RETURN n.name" ).consume();
230230
}
@@ -242,7 +242,7 @@ public void shouldHandleAcquireWriteSession() throws IOException, InterruptedExc
242242
StubServer writeServer = StubServer.start( resource( "write_server.script" ), 9007 );
243243
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
244244
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
245-
Session session = driver.session( AccessMode.WRITE ) )
245+
Session session = driver.session( AccessRole.WRITE ) )
246246
{
247247
session.run( "CREATE (n {name:'Bob'})" );
248248
}
@@ -287,7 +287,7 @@ public void shouldRememberEndpoints() throws IOException, InterruptedException,
287287
StubServer readServer = StubServer.start( resource( "read_server.script" ), 9005 );
288288
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
289289
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
290-
Session session = driver.session( AccessMode.READ ) )
290+
Session session = driver.session( AccessRole.READ ) )
291291
{
292292
session.run( "MATCH (n) RETURN n.name" ).consume();
293293

@@ -319,7 +319,7 @@ public void shouldForgetEndpointsOnFailure() throws IOException, InterruptedExce
319319
boolean failed = false;
320320
try
321321
{
322-
Session session = driver.session( AccessMode.READ );
322+
Session session = driver.session( AccessRole.READ );
323323
session.run( "MATCH (n) RETURN n.name" ).consume();
324324
session.close();
325325
}
@@ -353,7 +353,7 @@ public void shouldRediscoverIfNecessaryOnSessionAcquisition() throws IOException
353353
assertThat( driver.routingServers(), hasItem( new BoltServerAddress( "127.0.0.1", 9001 ) ));
354354

355355
//since we know about less than three servers a rediscover should be triggered
356-
Session session = driver.session( AccessMode.READ );
356+
Session session = driver.session( AccessRole.READ );
357357
assertThat( driver.routingServers(), hasSize( 4 ) );
358358
assertThat( driver.routingServers(), hasItem( new BoltServerAddress( "127.0.0.1", 9001 ) ));
359359
assertThat( driver.routingServers(), hasItem( new BoltServerAddress( "127.0.0.1", 9002 ) ));
@@ -391,7 +391,7 @@ public void shouldOnlyGetServersOnce() throws IOException, InterruptedException,
391391
public void run()
392392
{
393393
//noinspection EmptyTryBlock
394-
try(Session ignore = driver.session( AccessMode.READ ))
394+
try(Session ignore = driver.session( AccessRole.READ ))
395395
{
396396
//empty
397397
}
@@ -448,7 +448,7 @@ public void shouldHandleLeaderSwitchWhenWriting()
448448
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
449449
ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
450450
boolean failed = false;
451-
try ( Session session = driver.session( AccessMode.WRITE ) )
451+
try ( Session session = driver.session( AccessRole.WRITE ) )
452452
{
453453
assertThat(driver.writeServers(), hasItem( new BoltServerAddress( "127.0.0.1", 9007 ) ));
454454
assertThat(driver.writeServers(), hasItem( new BoltServerAddress( "127.0.0.1", 9008 ) ));

‎driver/src/test/java/org/neo4j/driver/internal/ClusterDriverTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import org.neo4j.driver.internal.net.BoltServerAddress;
3232
import org.neo4j.driver.internal.spi.Connection;
3333
import org.neo4j.driver.internal.spi.ConnectionPool;
34-
import org.neo4j.driver.v1.AccessMode;
34+
import org.neo4j.driver.v1.AccessRole;
3535
import org.neo4j.driver.v1.Logger;
3636
import org.neo4j.driver.v1.Logging;
3737
import org.neo4j.driver.v1.Record;
@@ -111,7 +111,7 @@ public void shouldDoReRoutingOnSessionAcquisitionIfNecessary()
111111

112112

113113
// When
114-
clusterDriver.session( AccessMode.READ );
114+
clusterDriver.session( AccessRole.READ );
115115

116116
// Then
117117
assertThat( clusterDriver.routingServers(),
@@ -138,7 +138,7 @@ public void shouldNotDoReRoutingOnSessionAcquisitionIfNotNecessary()
138138
ClusterDriver clusterDriver = forSession( session );
139139

140140
// When
141-
clusterDriver.session( AccessMode.WRITE );
141+
clusterDriver.session( AccessRole.WRITE );
142142

143143
// Then
144144
assertThat( clusterDriver.routingServers(),

0 commit comments

Comments
 (0)