Merge pull request #88 from spacecowboy/boltrouting

Support bolt+routing

Author: spacecowboy

cypher-shell/src/integration-test/java/org/neo4j/shell/MainIntegrationTest.java

@@ -35,7 +35,6 @@ public void connectInteractivelyPromptsOnWrongAuthentication() throws Exception
         logger.setFormat(cliArgs.getFormat());
 
         ConnectionConfig connectionConfig = new ConnectionConfig(
-                logger,
                 cliArgs.getScheme(),
                 cliArgs.getHost(),
                 cliArgs.getPort(),

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellFailureIntegrationTest.java

@@ -35,6 +35,6 @@ public void cypherWithNoPasswordShouldReturnValidError() throws CommandException
         thrown.expect( AuthenticationException.class );
         thrown.expectMessage("The client is unauthorized due to authentication failure.");
 
-        shell.connect(new ConnectionConfig(logger, "bolt://", "localhost", 7687, "neo4j", "", true));
+        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "", true));
     }
 }

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellIntegrationTest.java

@@ -45,7 +45,7 @@ public void setUp() throws Exception {
         commitCommand = new Commit(shell);
         beginCommand = new Begin(shell);
 
-        shell.connect(new ConnectionConfig(logger, "bolt://", "localhost", 7687, "neo4j", "neo", true));
+        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true));
     }
 
     @After
@@ -126,7 +126,7 @@ public void connectTwiceThrows() throws CommandException {
         thrown.expect(CommandException.class);
         thrown.expectMessage("Already connected");
 
-        ConnectionConfig config = new ConnectionConfig(logger, "bolt://", "localhost", 7687, "neo4j", "neo", true);
+        ConnectionConfig config = new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true);
         assertTrue("Shell should already be connected", shell.isConnected());
         shell.connect(config);
     }

cypher-shell/src/main/java/org/neo4j/shell/ConnectionConfig.java

@@ -1,8 +1,6 @@
 package org.neo4j.shell;
 
 import org.neo4j.driver.v1.Config;
-import org.neo4j.shell.log.AnsiFormattedText;
-import org.neo4j.shell.log.Logger;
 
 import javax.annotation.Nonnull;
 
@@ -14,22 +12,13 @@ public class ConnectionConfig {
     private String username;
     private String password;
 
-    public ConnectionConfig(@Nonnull Logger logger, @Nonnull String scheme, @Nonnull String host, int port,
+    public ConnectionConfig(@Nonnull String scheme, @Nonnull String host, int port,
                             @Nonnull String username, @Nonnull String password, boolean encryption) {
         this.host = host;
         this.port = port;
         this.username = fallbackToEnvVariable(username, "NEO4J_USERNAME");
         this.password = fallbackToEnvVariable(password, "NEO4J_PASSWORD");
         this.encryption = encryption ? Config.EncryptionLevel.REQUIRED : Config.EncryptionLevel.NONE;
-
-        if ("bolt+routing://".equalsIgnoreCase(scheme)) {
-            logger.printError(
-                    AnsiFormattedText.s()
-                                     .colorRed()
-                                     .append("Routing is not supported by cypher-shell. Falling back to direct connection.")
-                                     .formattedString());
-            scheme = "bolt://";
-        }
         this.scheme = scheme;
     }
 

cypher-shell/src/main/java/org/neo4j/shell/Main.java

@@ -57,7 +57,6 @@ void startShell(@Nonnull CliArgs cliArgs) {
         logger.setFormat(cliArgs.getFormat());
 
         ConnectionConfig connectionConfig = new ConnectionConfig(
-                logger,
                 cliArgs.getScheme(),
                 cliArgs.getHost(),
                 cliArgs.getPort(),

cypher-shell/src/test/java/org/neo4j/shell/ConnectionConfigTest.java

@@ -6,11 +6,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 
 public class ConnectionConfigTest {
     private Logger logger = mock(Logger.class);
-    private ConnectionConfig config = new ConnectionConfig(logger, "bolt://", "localhost", 1, "bob",
+    private ConnectionConfig config = new ConnectionConfig("bolt://", "localhost", 1, "bob",
             "pass", false);
 
     @Test
@@ -43,19 +42,11 @@ public void driverUrlDefaultScheme() throws Exception {
         assertEquals("bolt://localhost:1", config.driverUrl());
     }
 
-    @Test
-    public void driverUrlRoutingScheme() throws Exception {
-        ConnectionConfig config = new ConnectionConfig(logger, "bolt+routing://", "localhost", 1, "bob",
-                "pass", false);
-        verify(logger).printError("@|RED Routing is not supported by cypher-shell. Falling back to direct connection.|@");
-        assertEquals("bolt://localhost:1", config.driverUrl());
-    }
-
     @Test
     public void encryption() {
         assertEquals(Config.EncryptionLevel.REQUIRED,
-                new ConnectionConfig(logger, "bolt://", "", -1, "", "", true).encryption());
+                new ConnectionConfig("bolt://", "", -1, "", "", true).encryption());
         assertEquals(Config.EncryptionLevel.NONE,
-                new ConnectionConfig(logger, "bolt://", "", -1, "", "", false).encryption());
+                new ConnectionConfig("bolt://", "", -1, "", "", false).encryption());
     }
 }

cypher-shell/src/test/java/org/neo4j/shell/CypherShellTest.java

@@ -21,7 +21,6 @@
 import org.neo4j.shell.test.OfflineTestShell;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Optional;
 
 import static java.util.Arrays.asList;
@@ -59,7 +58,7 @@ public void setup() {
 
     @Test
     public void verifyDelegationOfConnectionMethods() throws CommandException {
-        ConnectionConfig cc = new ConnectionConfig(logger, "bolt://", "", 1, "", "", false);
+        ConnectionConfig cc = new ConnectionConfig("bolt://", "", 1, "", "", false);
         CypherShell shell = new CypherShell(logger, mockedBoltStateHandler, mockedPrettyPrinter);
 
         shell.connect(cc);

cypher-shell/src/test/java/org/neo4j/shell/prettyprint/TableOutputFormatTest.java

@@ -276,6 +276,7 @@ private StatementResult mockResult(List<String> cols, Object... data) {
         }
         when(result.list()).thenReturn(records);
         when(result.consume()).thenReturn(summary);
+        when(result.summary()).thenReturn(summary);
         return result;
     }
 

cypher-shell/src/test/java/org/neo4j/shell/state/BoltStateHandlerTest.java

@@ -76,7 +76,7 @@ public Session session() {
             }
         };
         BoltStateHandler handler = new BoltStateHandler(provider);
-        ConnectionConfig config = new ConnectionConfig(logger, "bolt://", "", -1, "", "", false);
+        ConnectionConfig config = new ConnectionConfig("bolt://", "", -1, "", "", false);
         handler.connect(config);
 
         assertEquals("", handler.getServerVersion());
@@ -87,7 +87,7 @@ public void versionIsNotEmptyAfterConnect() throws CommandException {
         Driver driverMock = stubVersionInAnOpenSession(mock(StatementResult.class), mock(Session.class), "Neo4j/9.4.1-ALPHA");
 
         BoltStateHandler handler = new BoltStateHandler((s, authToken, config) -> driverMock);
-        ConnectionConfig config = new ConnectionConfig(logger, "bolt://", "", -1, "", "", false);
+        ConnectionConfig config = new ConnectionConfig("bolt://", "", -1, "", "", false);
         handler.connect(config);
 
         assertEquals("9.4.1-ALPHA", handler.getServerVersion());
@@ -336,7 +336,7 @@ public void silentDisconnectCleansUp() throws Exception {
     public void turnOffEncryptionIfRequested() throws CommandException {
         RecordingDriverProvider provider = new RecordingDriverProvider();
         BoltStateHandler handler = new BoltStateHandler(provider);
-        ConnectionConfig config = new ConnectionConfig(logger, "bolt://", "", -1, "", "", false);
+        ConnectionConfig config = new ConnectionConfig("bolt://", "", -1, "", "", false);
         handler.connect(config);
         assertEquals(Config.EncryptionLevel.NONE, provider.config.encryptionLevel());
     }
@@ -345,7 +345,7 @@ public void turnOffEncryptionIfRequested() throws CommandException {
     public void turnOnEncryptionIfRequested() throws CommandException {
         RecordingDriverProvider provider = new RecordingDriverProvider();
         BoltStateHandler handler = new BoltStateHandler(provider);
-        ConnectionConfig config = new ConnectionConfig(logger, "bolt://", "", -1, "", "", true);
+        ConnectionConfig config = new ConnectionConfig("bolt://", "", -1, "", "", true);
         handler.connect(config);
         assertEquals(Config.EncryptionLevel.REQUIRED, provider.config.encryptionLevel());
     }
@@ -376,7 +376,7 @@ public OfflineBoltStateHandler(Driver driver) {
         }
 
         public void connect() throws CommandException {
-            connect(new ConnectionConfig(mock(Logger.class), "bolt://", "", 1, "", "", false));
+            connect(new ConnectionConfig("bolt://", "", 1, "", "", false));
         }
     }