Merge pull request #623 from zhenlineo/4.0-cleanup

Removed database name normalization on the driver side.

Author: zhenlineo

driver/src/main/java/org/neo4j/driver/SessionConfig.java

@@ -228,11 +228,7 @@ public Builder withDatabase( String database )
                 // Disallow users to use bolt internal value directly. To users, this is totally an illegal database name.
                 throw new IllegalArgumentException( String.format( "Illegal database name '%s'.", database ) );
             }
-            // The database name is normalized to lowercase on the server side.
-            // The client in theory shall not perform any normalization at all.
-            // However as this name is also used in routing table registry as the map's key to find the routing table for the given database,
-            // to avoid multiple routing tables for the same database, we perform a client side normalization.
-            this.database = database.toLowerCase();
+            this.database = database;
             return this;
         }
 

driver/src/test/java/org/neo4j/driver/integration/RoutingDriverMultidatabaseBoltKitTest.java

@@ -62,7 +62,7 @@ void shouldDiscoverForDatabase() throws IOException, InterruptedException, StubS
         StubServer reader = StubServer.start( "read_server_v4_read.script", 9005 );
         URI uri = URI.create( "neo4j://127.0.0.1:9001" );
         try ( Driver driver = GraphDatabase.driver( uri, INSECURE_CONFIG );
-                Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "myDatabase" ).build() ) )
+                Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "mydatabase" ).build() ) )
         {
             List<String> result = session.run( "MATCH (n) RETURN n.name" ).list( record -> record.get( "n.name" ).asString() );
 
@@ -89,7 +89,7 @@ void shouldRetryOnEmptyDiscoveryResult() throws IOException, InterruptedExceptio
 
         Config config = insecureBuilder().withResolver( resolver ).build();
         try ( Driver driver = GraphDatabase.driver( "neo4j://my.virtual.host:8080", config );
-                Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "myDatabase" ).build() ) )
+                Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "mydatabase" ).build() ) )
         {
             List<String> result = session.run( "MATCH (n) RETURN n.name" ).list( record -> record.get( "n.name" ).asString() );
 
@@ -109,7 +109,7 @@ void shouldThrowRoutingErrorIfDatabaseNotFound() throws IOException, Interrupted
 
         URI uri = URI.create( "neo4j://127.0.0.1:9001" );
         try ( Driver driver = GraphDatabase.driver( uri, INSECURE_CONFIG );
-                Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "myDatabase" ).build() ) )
+                Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "mydatabase" ).build() ) )
         {
             final FatalDiscoveryException error = assertThrows( FatalDiscoveryException.class, () -> {
                 session.run( "MATCH (n) RETURN n.name" );
@@ -132,7 +132,7 @@ void shouldBeAbleToServeReachableDatabase() throws IOException, InterruptedExcep
 
         try ( Driver driver = GraphDatabase.driver( uri, INSECURE_CONFIG ) )
         {
-            try( Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "Unreachable" ).build() ) )
+            try( Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "unreachable" ).build() ) )
             {
                 final ServiceUnavailableException error = assertThrows( ServiceUnavailableException.class, () -> {
                     session.run( "MATCH (n) RETURN n.name" );
@@ -141,7 +141,7 @@ void shouldBeAbleToServeReachableDatabase() throws IOException, InterruptedExcep
                 assertThat( error.getMessage(), containsString( "Could not perform discovery for database 'unreachable'" ) );
             }
 
-            try ( Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "myDatabase" ).build() ) )
+            try ( Session session = driver.session( builder().withDefaultAccessMode( AccessMode.READ ).withDatabase( "mydatabase" ).build() ) )
             {
                 List<String> result = session.run( "MATCH (n) RETURN n.name" ).list( record -> record.get( "n.name" ).asString() );
 
@@ -164,7 +164,7 @@ void shouldVerifyConnectivityOnDriverCreation() throws Throwable
         try ( Driver driver = GraphDatabase.driver( uri, INSECURE_CONFIG ) )
         {
             driver.verifyConnectivity();
-            try ( Session session = driver.session( builder().withDatabase( "myDatabase" ).withDefaultAccessMode( AccessMode.READ ).build() ) )
+            try ( Session session = driver.session( builder().withDatabase( "mydatabase" ).withDefaultAccessMode( AccessMode.READ ).build() ) )
             {
                 List<Record> records = session.run( "MATCH (n) RETURN n.name" ).list();
                 assertEquals( 3, records.size() );

driver/src/test/java/org/neo4j/driver/internal/DirectDriverBoltKitTest.java

@@ -306,7 +306,7 @@ void shouldAllowDatabaseNameInSessionRun() throws Throwable
         StubServer server = StubServer.start( "read_server_v4_read.script", 9001 );
 
         try ( Driver driver = GraphDatabase.driver( "bolt://localhost:9001", INSECURE_CONFIG );
-                Session session = driver.session( builder().withDatabase( "myDatabase" ).withDefaultAccessMode( AccessMode.READ ).build() ) )
+                Session session = driver.session( builder().withDatabase( "mydatabase" ).withDefaultAccessMode( AccessMode.READ ).build() ) )
         {
             final StatementResult result = session.run( "MATCH (n) RETURN n.name" );
             result.consume();
@@ -323,7 +323,7 @@ void shouldAllowDatabaseNameInBeginTransaction() throws Throwable
         StubServer server = StubServer.start( "read_server_v4_read_tx.script", 9001 );
 
         try ( Driver driver = GraphDatabase.driver( "bolt://localhost:9001", INSECURE_CONFIG );
-                Session session = driver.session( forDatabase( "myDatabase" ) ) )
+                Session session = driver.session( forDatabase( "mydatabase" ) ) )
         {
             session.readTransaction( tx -> tx.run( "MATCH (n) RETURN n.name" ).summary() );
         }