Merge pull request #237 from pontusmelke/1.1-clustered-to-routing

Rename ClusteredX to RoutingX

Author: nigelsmall

driver/src/main/java/org/neo4j/driver/internal/ClusterDriver.java renamed to driver/src/main/java/org/neo4j/driver/internal/RoutingDriver.java

@@ -47,7 +47,7 @@
 
 import static java.lang.String.format;
 
-public class ClusterDriver extends BaseDriver
+public class RoutingDriver extends BaseDriver
 {
     private static final String GET_SERVERS = "dbms.cluster.routing.getServers";
     private static final long MAX_TTL = Long.MAX_VALUE / 1000L;
@@ -75,7 +75,7 @@ public int compare( BoltServerAddress o1, BoltServerAddress o2 )
     private final ConcurrentRoundRobinSet<BoltServerAddress> writeServers = new ConcurrentRoundRobinSet<>( COMPARATOR );
     private final AtomicLong expires = new AtomicLong( 0L );
 
-    public ClusterDriver( BoltServerAddress seedAddress,
+    public RoutingDriver( BoltServerAddress seedAddress,
             ConnectionPool connections,
             SecurityPlan securityPlan,
             BiFunction<Connection,Logger,Session> sessionProvider,
@@ -286,8 +286,8 @@ public Session session()
     @Override
     public Session session( final AccessMode mode )
     {
-        return new ClusteredNetworkSession( mode, acquireConnection( mode ),
-                new ClusteredErrorHandler()
+        return new RoutingNetworkSession( mode, acquireConnection( mode ),
+                new RoutingErrorHandler()
                 {
                     @Override
                     public void onConnectionFailure( BoltServerAddress address )

driver/src/main/java/org/neo4j/driver/internal/ClusteredErrorHandler.java renamed to driver/src/main/java/org/neo4j/driver/internal/RoutingErrorHandler.java

@@ -23,7 +23,7 @@
 /**
  * Interface used for tracking errors when connected to a cluster.
  */
-interface ClusteredErrorHandler
+interface RoutingErrorHandler
 {
     void onConnectionFailure( BoltServerAddress address );
 

driver/src/main/java/org/neo4j/driver/internal/ClusteredNetworkSession.java renamed to driver/src/main/java/org/neo4j/driver/internal/RoutingNetworkSession.java

@@ -32,13 +32,13 @@
 
 import static java.lang.String.format;
 
-public class ClusteredNetworkSession extends NetworkSession
+public class RoutingNetworkSession extends NetworkSession
 {
     private final AccessMode mode;
-    private final ClusteredErrorHandler onError;
+    private final RoutingErrorHandler onError;
 
-    ClusteredNetworkSession( AccessMode mode, Connection connection,
-            ClusteredErrorHandler onError, Logger logger )
+    RoutingNetworkSession( AccessMode mode, Connection connection,
+            RoutingErrorHandler onError, Logger logger )
     {
         super( connection, logger );
         this.mode = mode;
@@ -50,7 +50,7 @@ public StatementResult run( Statement statement )
     {
         try
         {
-            return new ClusteredStatementResult( super.run( statement ), mode, connection.address(), onError );
+            return new RoutingStatementResult( super.run( statement ), mode, connection.address(), onError );
         }
         catch ( ConnectionFailureException e )
         {
@@ -75,7 +75,7 @@ public void close()
         }
     }
 
-    static Neo4jException filterFailureToWrite( ClientException e, AccessMode mode, ClusteredErrorHandler onError,
+    static Neo4jException filterFailureToWrite( ClientException e, AccessMode mode, RoutingErrorHandler onError,
             BoltServerAddress address )
     {
         if ( isFailedToWrite( e ) )
@@ -99,7 +99,7 @@ static Neo4jException filterFailureToWrite( ClientException e, AccessMode mode,
         }
     }
 
-    static SessionExpiredException sessionExpired( ConnectionFailureException e, ClusteredErrorHandler onError,
+    static SessionExpiredException sessionExpired( ConnectionFailureException e, RoutingErrorHandler onError,
                                                    BoltServerAddress address )
     {
         onError.onConnectionFailure( address );

driver/src/main/java/org/neo4j/driver/internal/ClusteredStatementResult.java renamed to driver/src/main/java/org/neo4j/driver/internal/RoutingStatementResult.java

@@ -30,20 +30,18 @@
 import org.neo4j.driver.v1.summary.ResultSummary;
 import org.neo4j.driver.v1.util.Function;
 
-import static java.lang.String.format;
+import static org.neo4j.driver.internal.RoutingNetworkSession.filterFailureToWrite;
+import static org.neo4j.driver.internal.RoutingNetworkSession.sessionExpired;
 
-import static org.neo4j.driver.internal.ClusteredNetworkSession.filterFailureToWrite;
-import static org.neo4j.driver.internal.ClusteredNetworkSession.sessionExpired;
-
-public class ClusteredStatementResult implements StatementResult
+public class RoutingStatementResult implements StatementResult
 {
     private final StatementResult delegate;
     private final AccessMode mode;
     private final BoltServerAddress address;
-    private final ClusteredErrorHandler onError;
+    private final RoutingErrorHandler onError;
 
-    ClusteredStatementResult( StatementResult delegate, AccessMode mode, BoltServerAddress address,
-            ClusteredErrorHandler onError )
+    RoutingStatementResult( StatementResult delegate, AccessMode mode, BoltServerAddress address,
+            RoutingErrorHandler onError )
     {
         this.delegate = delegate;
         this.mode = mode;

driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java

@@ -22,10 +22,10 @@
 import java.net.URI;
 import java.security.GeneralSecurityException;
 
-import org.neo4j.driver.internal.ClusterDriver;
 import org.neo4j.driver.internal.ConnectionSettings;
 import org.neo4j.driver.internal.DirectDriver;
 import org.neo4j.driver.internal.NetworkSession;
+import org.neo4j.driver.internal.RoutingDriver;
 import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.net.pooling.PoolSettings;
 import org.neo4j.driver.internal.net.pooling.SocketConnectionPool;
@@ -190,7 +190,7 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
         case "bolt":
             return new DirectDriver( address, connectionPool, securityPlan, config.logging() );
         case "bolt+routing":
-            return new ClusterDriver( address, connectionPool, securityPlan, SESSION_PROVIDER, Clock.SYSTEM, config.logging() );
+            return new RoutingDriver( address, connectionPool, securityPlan, SESSION_PROVIDER, Clock.SYSTEM, config.logging() );
         default:
             throw new ClientException( format( "Unsupported URI scheme: %s", scheme ) );
         }

driver/src/test/java/org/neo4j/driver/internal/ClusterDriverStubTest.java renamed to driver/src/test/java/org/neo4j/driver/internal/RoutingDriverStubTest.java

@@ -59,7 +59,7 @@
 import static org.junit.Assert.fail;
 
 @Ignore
-public class ClusterDriverStubTest
+public class RoutingDriverStubTest
 {
     @Rule
     public ExpectedException exception = ExpectedException.none();
@@ -74,7 +74,7 @@ public void shouldDiscoverServers() throws IOException, InterruptedException, St
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
 
         // When
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config ) )
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config ) )
         {
             // Then
             Set<BoltServerAddress> addresses = driver.routingServers();
@@ -94,7 +94,7 @@ public void shouldDiscoverNewServers() throws IOException, InterruptedException,
         BoltServerAddress seed = address( 9001 );
 
         // When
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config ) )
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config ) )
         {
             // Then
             Set<BoltServerAddress> addresses = driver.routingServers();
@@ -112,7 +112,7 @@ public void shouldHandleEmptyResponse() throws IOException, InterruptedException
         // Given
         StubServer server = StubServer.start( resource( "handle_empty_response.script" ), 9001 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config ) )
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config ) )
         {
             Set<BoltServerAddress> servers = driver.routingServers();
             assertThat( servers, hasSize( 0 ) );
@@ -132,7 +132,7 @@ public void shouldHandleAcquireReadSession() throws IOException, InterruptedExce
         //START a read server
         StubServer readServer = StubServer.start( resource( "read_server.script" ), 9005 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
               Session session = driver.session( AccessMode.READ ) )
         {
             List<String> result = session.run( "MATCH (n) RETURN n.name" ).list( new Function<Record,String>()
@@ -162,7 +162,7 @@ public void shouldRoundRobinReadServers() throws IOException, InterruptedExcepti
         StubServer readServer1 = StubServer.start( resource( "read_server.script" ), 9005 );
         StubServer readServer2 = StubServer.start( resource( "read_server.script" ), 9006 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config ) )
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config ) )
         {
             // Run twice, one on each read server
             for ( int i = 0; i < 2; i++ )
@@ -200,7 +200,7 @@ public void shouldThrowSessionExpiredIfReadServerDisappears()
         //START a read server
         StubServer.start( resource( "dead_server.script" ), 9005 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
               Session session = driver.session( AccessMode.READ ) )
         {
             session.run( "MATCH (n) RETURN n.name" );
@@ -223,7 +223,7 @@ public void shouldThrowSessionExpiredIfWriteServerDisappears()
         //START a dead write servers
         StubServer.start( resource( "dead_server.script" ), 9007 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
               Session session = driver.session( AccessMode.WRITE ) )
         {
             session.run( "MATCH (n) RETURN n.name" ).consume();
@@ -241,7 +241,7 @@ public void shouldHandleAcquireWriteSession() throws IOException, InterruptedExc
         //START a write server
         StubServer writeServer = StubServer.start( resource( "write_server.script" ), 9007 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
               Session session = driver.session( AccessMode.WRITE ) )
         {
             session.run( "CREATE (n {name:'Bob'})" );
@@ -261,7 +261,7 @@ public void shouldRoundRobinWriteSessions() throws IOException, InterruptedExcep
         StubServer writeServer1 = StubServer.start( resource( "write_server.script" ), 9007 );
         StubServer writeServer2 = StubServer.start( resource( "write_server.script" ), 9008 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config ) )
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config ) )
         {
             for ( int i = 0; i < 2; i++ )
             {
@@ -286,7 +286,7 @@ public void shouldRememberEndpoints() throws IOException, InterruptedException,
         //START a read server
         StubServer readServer = StubServer.start( resource( "read_server.script" ), 9005 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        try ( ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        try ( RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
               Session session = driver.session( AccessMode.READ ) )
         {
             session.run( "MATCH (n) RETURN n.name" ).consume();
@@ -309,7 +309,7 @@ public void shouldForgetEndpointsOnFailure() throws IOException, InterruptedExce
         //START a read server
         StubServer.start( resource( "dead_server.script" ), 9005 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
         try
         {
             Session session = driver.session( AccessMode.READ );
@@ -343,7 +343,7 @@ public void shouldRediscoverIfNecessaryOnSessionAcquisition()
         StubServer read = StubServer.start( resource( "empty.script" ), 9005 );
 
         //On creation we only find ourselves
-        ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
         assertThat( driver.routingServers(), containsInAnyOrder( address( 9001 ) ) );
         assertTrue( driver.connectionPool().hasAddress( address( 9001 ) ) );
 
@@ -372,7 +372,7 @@ public void shouldOnlyGetServersOnce() throws IOException, InterruptedException,
         StubServer read = StubServer.start( resource( "empty.script" ), 9005 );
 
         //On creation we only find ourselves
-        final ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        final RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
         assertThat( driver.routingServers(), containsInAnyOrder( address( 9001 ) ) );
 
         ExecutorService runner = Executors.newFixedThreadPool( 10 );
@@ -441,7 +441,7 @@ public void shouldHandleLeaderSwitchWhenWriting()
         //START a write server that doesn't accept writes
         StubServer.start( resource( "not_able_to_write_server.script" ), 9007 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
         boolean failed = false;
         try ( Session session = driver.session( AccessMode.WRITE ) )
         {
@@ -473,7 +473,7 @@ public void shouldRediscoverOnExpiry() throws IOException, InterruptedException,
         //START a read server
         StubServer readServer = StubServer.start( resource( "empty.script" ), 9005 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
-        ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
         assertThat(driver.routingServers(), contains(address( 9001 )));
         assertThat(driver.readServers(), contains(address( 9002 )));
         assertThat(driver.writeServers(), contains(address( 9003 )));
@@ -502,7 +502,7 @@ public void shouldNotPutBackPurgedConnection() throws IOException, InterruptedEx
         StubServer writeServer2 = StubServer.start( resource( "empty.script" ), 9006 );
         URI uri = URI.create( "bolt+routing://127.0.0.1:9001" );
 
-        ClusterDriver driver = (ClusterDriver) GraphDatabase.driver( uri, config );
+        RoutingDriver driver = (RoutingDriver) GraphDatabase.driver( uri, config );
 
 
         //Open both a read and a write session
@@ -532,7 +532,7 @@ public void shouldNotPutBackPurgedConnection() throws IOException, InterruptedEx
 
         // now we close the read session and the connection should not be put
         // back to the pool
-        Connection connection = ((ClusteredNetworkSession) readSession).connection;
+        Connection connection = ((RoutingNetworkSession) readSession).connection;
         assertTrue( connection.isOpen() );
         readSession.close();
         assertFalse( connection.isOpen() );
@@ -550,7 +550,7 @@ public void shouldNotPutBackPurgedConnection() throws IOException, InterruptedEx
 
     String resource( String fileName )
     {
-        URL resource = ClusterDriverStubTest.class.getClassLoader().getResource( fileName );
+        URL resource = RoutingDriverStubTest.class.getClassLoader().getResource( fileName );
         if ( resource == null )
         {
             fail( fileName + " does not exists" );