Skip to content

Commit f6f6d5d

Browse files
pontusmelkepontusmelke
committed
Changed back to AccessMode
1 parent 740db84 commit f6f6d5d

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.neo4j.driver.internal.util.Clock;
3333
import org.neo4j.driver.internal.util.ConcurrentRoundRobinSet;
3434
import org.neo4j.driver.internal.util.Consumer;
35-
import org.neo4j.driver.v1.AccessRole;
35+
import org.neo4j.driver.v1.AccessMode;
3636
import org.neo4j.driver.v1.Logger;
3737
import org.neo4j.driver.v1.Logging;
3838
import org.neo4j.driver.v1.Record;
@@ -286,13 +286,13 @@ private synchronized void forget( BoltServerAddress address )
286286
@Override
287287
public Session session()
288288
{
289-
return session( AccessRole.WRITE );
289+
return session( AccessMode.WRITE );
290290
}
291291

292292
@Override
293-
public Session session( final AccessRole role )
293+
public Session session( final AccessMode mode )
294294
{
295-
return new ClusteredNetworkSession( acquireConnection( role ),
295+
return new ClusteredNetworkSession( acquireConnection( mode ),
296296
new ClusteredErrorHandler()
297297
{
298298
@Override
@@ -310,7 +310,7 @@ public void onWriteFailure( BoltServerAddress address )
310310
log );
311311
}
312312

313-
private Connection acquireConnection( AccessRole role )
313+
private Connection acquireConnection( AccessMode role )
314314
{
315315
//Potentially rediscover servers if we are not happy with our current knowledge
316316
checkServers();

‎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.AccessRole;
24+
import org.neo4j.driver.v1.AccessMode;
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( AccessRole ignore )
50+
public Session session( AccessMode ignore )
5151
{
5252
return session();
5353
}

‎driver/src/main/java/org/neo4j/driver/v1/AccessRole.java‎ renamed to ‎driver/src/main/java/org/neo4j/driver/v1/AccessMode.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 AccessRole
21+
public enum AccessMode
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(AccessRole role);
89+
Session session(AccessMode mode);
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.AccessRole;
39+
import org.neo4j.driver.v1.AccessMode;
4040
import org.neo4j.driver.v1.Config;
4141
import org.neo4j.driver.v1.GraphDatabase;
4242
import org.neo4j.driver.v1.Record;
@@ -131,7 +131,7 @@ public void shouldHandleAcquireReadSession() throws IOException, InterruptedExce
131131
StubServer readServer = StubServer.start( resource( "read_server.script" ), 9005 );
132132
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
133133
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
134-
Session session = driver.session( AccessRole.READ ) )
134+
Session session = driver.session( AccessMode.READ ) )
135135
{
136136
List<String> result = session.run( "MATCH (n) RETURN n.name" ).list( new Function<Record,String>()
137137
{
@@ -165,7 +165,7 @@ public void shouldRoundRobinReadServers() throws IOException, InterruptedExcepti
165165
// Run twice, one on each read server
166166
for ( int i = 0; i < 2; i++ )
167167
{
168-
try ( Session session = driver.session( AccessRole.READ ) )
168+
try ( Session session = driver.session( AccessMode.READ ) )
169169
{
170170
assertThat( session.run( "MATCH (n) RETURN n.name" ).list( new Function<Record,String>()
171171
{
@@ -199,7 +199,7 @@ public void shouldThrowSessionExpiredIfReadServerDisappears()
199199
StubServer.start( resource( "dead_server.script" ), 9005 );
200200
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
201201
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
202-
Session session = driver.session( AccessRole.READ ) )
202+
Session session = driver.session( AccessMode.READ ) )
203203
{
204204
session.run( "MATCH (n) RETURN n.name" );
205205
}
@@ -222,7 +222,7 @@ public void shouldThrowSessionExpiredIfWriteServerDisappears()
222222
StubServer.start( resource( "dead_server.script" ), 9007 );
223223
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
224224
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
225-
Session session = driver.session( AccessRole.WRITE ) )
225+
Session session = driver.session( AccessMode.WRITE ) )
226226
{
227227
session.run( "MATCH (n) RETURN n.name" ).consume();
228228
}
@@ -240,7 +240,7 @@ public void shouldHandleAcquireWriteSession() throws IOException, InterruptedExc
240240
StubServer writeServer = StubServer.start( resource( "write_server.script" ), 9007 );
241241
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
242242
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
243-
Session session = driver.session( AccessRole.WRITE ) )
243+
Session session = driver.session( AccessMode.WRITE ) )
244244
{
245245
session.run( "CREATE (n {name:'Bob'})" );
246246
}
@@ -285,7 +285,7 @@ public void shouldRememberEndpoints() throws IOException, InterruptedException,
285285
StubServer readServer = StubServer.start( resource( "read_server.script" ), 9005 );
286286
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
287287
try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
288-
Session session = driver.session( AccessRole.READ ) )
288+
Session session = driver.session( AccessMode.READ ) )
289289
{
290290
session.run( "MATCH (n) RETURN n.name" ).consume();
291291

@@ -310,7 +310,7 @@ public void shouldForgetEndpointsOnFailure() throws IOException, InterruptedExce
310310
ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
311311
try
312312
{
313-
Session session = driver.session( AccessRole.READ );
313+
Session session = driver.session( AccessMode.READ );
314314
session.run( "MATCH (n) RETURN n.name" ).consume();
315315
session.close();
316316
fail();
@@ -346,7 +346,7 @@ public void shouldRediscoverIfNecessaryOnSessionAcquisition()
346346
assertTrue( driver.connectionPool().hasAddress( address( 9001 ) ) );
347347

348348
//since we have no write nor read servers we must rediscover
349-
Session session = driver.session( AccessRole.READ );
349+
Session session = driver.session( AccessMode.READ );
350350
assertThat( driver.routingServers(), containsInAnyOrder(address( 9002 ),
351351
address( 9003 ), address( 9004 ) ) );
352352
//server told os to forget 9001
@@ -381,7 +381,7 @@ public void shouldOnlyGetServersOnce() throws IOException, InterruptedException,
381381
public void run()
382382
{
383383
//noinspection EmptyTryBlock
384-
try ( Session ignore = driver.session( AccessRole.READ ) )
384+
try ( Session ignore = driver.session( AccessMode.READ ) )
385385
{
386386
//empty
387387
}
@@ -434,7 +434,7 @@ public void shouldHandleLeaderSwitchWhenWriting()
434434
URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
435435
ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
436436
boolean failed = false;
437-
try ( Session session = driver.session( AccessRole.WRITE ) )
437+
try ( Session session = driver.session( AccessMode.WRITE ) )
438438
{
439439
assertThat( driver.writeServers(), hasItem(address( 9007 ) ) );
440440
assertThat( driver.writeServers(), hasItem( address( 9008 ) ) );

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.neo4j.driver.internal.spi.Connection;
3333
import org.neo4j.driver.internal.spi.ConnectionPool;
3434
import org.neo4j.driver.internal.util.Clock;
35-
import org.neo4j.driver.v1.AccessRole;
35+
import org.neo4j.driver.v1.AccessMode;
3636
import org.neo4j.driver.v1.Logger;
3737
import org.neo4j.driver.v1.Logging;
3838
import org.neo4j.driver.v1.Record;
@@ -114,7 +114,7 @@ public void shouldDoReRoutingOnSessionAcquisitionIfNecessary()
114114

115115

116116
// When
117-
clusterDriver.session( AccessRole.READ );
117+
clusterDriver.session( AccessMode.READ );
118118

119119
// Then
120120
assertThat( clusterDriver.routingServers(),
@@ -141,7 +141,7 @@ public void shouldNotDoReRoutingOnSessionAcquisitionIfNotNecessary()
141141
ClusterDriver clusterDriver = forSession( session );
142142

143143
// When
144-
clusterDriver.session( AccessRole.WRITE );
144+
clusterDriver.session( AccessMode.WRITE );
145145

146146
// Then
147147
assertThat( clusterDriver.routingServers(),
@@ -184,7 +184,7 @@ public void shouldForgetAboutServersOnRerouting()
184184

185185

186186
// When
187-
clusterDriver.session( AccessRole.READ );
187+
clusterDriver.session( AccessMode.READ );
188188

189189
// Then
190190
assertThat( clusterDriver.routingServers(),
@@ -210,7 +210,7 @@ public void shouldRediscoverOnTimeout()
210210
ClusterDriver clusterDriver = forSession( session, clock );
211211

212212
// When
213-
clusterDriver.session( AccessRole.WRITE );
213+
clusterDriver.session( AccessMode.WRITE );
214214

215215
// Then
216216
assertThat( clusterDriver.routingServers(), containsInAnyOrder( boltAddress( "localhost", 5555 ) ) );
@@ -236,7 +236,7 @@ public void shouldNotRediscoverWheNoTimeout()
236236
ClusterDriver clusterDriver = forSession( session, clock );
237237

238238
// When
239-
clusterDriver.session( AccessRole.WRITE );
239+
clusterDriver.session( AccessMode.WRITE );
240240

241241
// Then
242242
assertThat( clusterDriver.routingServers(), containsInAnyOrder( boltAddress( "localhost", 1111 ), boltAddress( "localhost", 1112 ), boltAddress( "localhost", 1113 ) ) );

0 commit comments

Comments
 (0)