Support database selection with 2.x driver

- Add :use command for selecting active database
- Add -d, --database command line parameter
- Upgrade driver dependency to 2.0.0-alpha01

Author: henriknyman

build.gradle

@@ -72,7 +72,7 @@ ext {
     argparse4jVersion = '0.7.0'
     junitVersion = '4.12'
     evaluatorVersion = '3.5.4'
-    neo4jJavaDriverVersion = '1.7.0'
+    neo4jJavaDriverVersion = '2.0.0-alpha01'
     findbugsVersion = '3.0.0'
     jansiVersion = '1.13'
     jlineVersion = '2.14.6'

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

@@ -40,7 +40,8 @@ public void connectInteractivelyPromptsOnWrongAuthentication() throws Exception
                 cliArgs.getPort(),
                 cliArgs.getUsername(),
                 cliArgs.getPassword(),
-                cliArgs.getEncryption());
+                cliArgs.getEncryption(),
+                cliArgs.getDatabase());
 
         CypherShell shell = new CypherShell(logger, prettyConfig);
 

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

@@ -5,14 +5,17 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.neo4j.driver.v1.exceptions.AuthenticationException;
+
+import org.neo4j.driver.exceptions.AuthenticationException;
 import org.neo4j.shell.ConnectionConfig;
 import org.neo4j.shell.CypherShell;
 import org.neo4j.shell.StringLinePrinter;
 import org.neo4j.shell.cli.Format;
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.prettyprint.PrettyConfig;
 
+import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
+
 public class CypherShellFailureIntegrationTest {
     @Rule
     public final ExpectedException thrown = ExpectedException.none();
@@ -28,9 +31,20 @@ public void setUp() throws Exception {
 
     @Test
     public void cypherWithNoPasswordShouldReturnValidError() throws CommandException {
-        thrown.expect( AuthenticationException.class );
+        thrown.expect(AuthenticationException.class);
         thrown.expectMessage("The client is unauthorized due to authentication failure.");
 
-        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "", true));
+        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "", true, ABSENT_DB_NAME));
+    }
+
+    @Test
+    public void switchingDatabaseInOpenTransactionShouldFail() throws CommandException {
+        thrown.expect(CommandException.class);
+        thrown.expectMessage("There is an open transaction.");
+
+        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "", true, ABSENT_DB_NAME));
+
+        shell.beginTransaction();
+        shell.setActiveDatabase("another_database");
     }
 }

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

@@ -15,6 +15,7 @@
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
 import static org.neo4j.shell.prettyprint.OutputFormatter.NEWLINE;
 
 public class CypherShellPlainIntegrationTest {
@@ -28,7 +29,7 @@ public class CypherShellPlainIntegrationTest {
     public void setUp() throws Exception {
         linePrinter.clear();
         shell = new CypherShell(linePrinter, new PrettyConfig(Format.PLAIN, true, 1000));
-        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true));
+        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true, ABSENT_DB_NAME));
     }
 
     @After

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

@@ -17,6 +17,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
+import static org.neo4j.driver.internal.messaging.request.MultiDatabaseUtil.ABSENT_DB_NAME;
 import static org.neo4j.shell.Versions.majorVersion;
 import static org.neo4j.shell.Versions.minorVersion;
 
@@ -38,7 +39,7 @@ public void setUp() throws Exception {
         commitCommand = new Commit(shell);
         beginCommand = new Begin(shell);
 
-        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true));
+        shell.connect(new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true, ABSENT_DB_NAME));
     }
 
     @After
@@ -72,7 +73,7 @@ public void connectTwiceThrows() throws CommandException {
         thrown.expect(CommandException.class);
         thrown.expectMessage("Already connected");
 
-        ConnectionConfig config = new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true);
+        ConnectionConfig config = new ConnectionConfig("bolt://", "localhost", 7687, "neo4j", "neo", true, ABSENT_DB_NAME);
         assertTrue("Shell should already be connected", shell.isConnected());
         shell.connect(config);
     }

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

@@ -1,6 +1,6 @@
 package org.neo4j.shell;
 
-import org.neo4j.driver.v1.Config;
+import org.neo4j.driver.Config;
 
 import javax.annotation.Nonnull;
 
@@ -11,15 +11,18 @@ public class ConnectionConfig {
     private final Config.EncryptionLevel encryption;
     private String username;
     private String password;
+    private String database;
 
     public ConnectionConfig(@Nonnull String scheme, @Nonnull String host, int port,
-                            @Nonnull String username, @Nonnull String password, boolean encryption) {
+                            @Nonnull String username, @Nonnull String password, boolean encryption,
+                            @Nonnull String database) {
         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;
         this.scheme = scheme;
+        this.database = database;
     }
 
     /**
@@ -68,6 +71,11 @@ public Config.EncryptionLevel encryption() {
         return encryption;
     }
 
+    @Nonnull
+    public String database() {
+        return database;
+    }
+
     public void setUsername(@Nonnull String username) {
         this.username = username;
     }

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

@@ -28,7 +28,7 @@
 /**
  * A possibly interactive shell for evaluating cypher statements.
  */
-public class CypherShell implements StatementExecuter, Connector, TransactionHandler, ParameterMap {
+public class CypherShell implements StatementExecuter, Connector, TransactionHandler, ParameterMap, DatabaseManager {
     // Final space to catch newline
     protected static final Pattern cmdNamePattern = Pattern.compile("^\\s*(?<name>[^\\s]+)\\b(?<args>.*)\\s*$");
     protected final Map<String, ParamValue> queryParams = new HashMap<>();
@@ -199,4 +199,15 @@ protected void addRuntimeHookToResetShell() {
         Runtime.getRuntime().addShutdownHook(new Thread(this::reset));
     }
 
+    @Override
+    public void setActiveDatabase(String databaseName) throws CommandException
+    {
+        boltStateHandler.setActiveDatabase(databaseName);
+    }
+
+    @Override
+    public String getActiveDatabase()
+    {
+        return boltStateHandler.getActiveDatabase();
+    }
 }

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

@@ -0,0 +1,13 @@
+package org.neo4j.shell;
+
+import org.neo4j.shell.exception.CommandException;
+
+/**
+ * An object capable of tracking the active database.
+ */
+public interface DatabaseManager
+{
+    void setActiveDatabase(String databaseName) throws CommandException;
+
+    String getActiveDatabase();
+}

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

@@ -1,7 +1,7 @@
 package org.neo4j.shell;
 
 import jline.console.ConsoleReader;
-import org.neo4j.driver.v1.exceptions.AuthenticationException;
+import org.neo4j.driver.exceptions.AuthenticationException;
 import org.neo4j.shell.build.Build;
 import org.neo4j.shell.cli.CliArgHelper;
 import org.neo4j.shell.cli.CliArgs;
@@ -67,7 +67,8 @@ void startShell(@Nonnull CliArgs cliArgs) {
                 cliArgs.getPort(),
                 cliArgs.getUsername(),
                 cliArgs.getPassword(),
-                cliArgs.getEncryption());
+                cliArgs.getEncryption(),
+                cliArgs.getDatabase());
 
         try {
             CypherShell shell = new CypherShell(logger, prettyConfig);

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

@@ -51,8 +51,8 @@ static ShellRunner getShellRunner(@Nonnull CliArgs cliArgs,
         } else if (shouldBeInteractive(cliArgs)) {
             UserMessagesHandler userMessagesHandler =
                     new UserMessagesHandler(connectionConfig, cypherShell.getServerVersion());
-            return new InteractiveShellRunner(cypherShell, cypherShell, logger, new ShellStatementParser(),
-                    System.in, FileHistorian.getDefaultHistoryFile(), userMessagesHandler);
+            return new InteractiveShellRunner(cypherShell, cypherShell, cypherShell, logger, new ShellStatementParser(),
+                    System.in, FileHistorian.getDefaultHistoryFile(), userMessagesHandler, connectionConfig);
         } else {
             return new NonInteractiveShellRunner(cliArgs.getFailBehavior(), cypherShell, logger,
                     new ShellStatementParser(), System.in);