Support Neo4j Java Driver 1.7.0-rc2 and --driver-version

Author: craigtaverner

build.gradle

@@ -72,7 +72,7 @@ ext {
 
     argparse4jVersion = '0.7.0'
     junitVersion = '4.12'
-    neo4jJavaVersion = '1.6.1'
+    neo4jJavaDriverVersion = '1.7.0-rc2'
     findbugsVersion = '3.0.0'
     jansiVersion = '1.13'
     jlineVersion = '2.14.6'

cypher-shell/build.gradle

@@ -7,6 +7,7 @@ task generateBuildProperties {
     def propFile = new File(outputDir, "build.properties")
     def props = new Properties()
     props.setProperty("version", buildVersion)
+    props.setProperty("driverVersion", neo4jJavaDriverVersion)
     props.store(propFile.newWriter(), null)
   }
 }
@@ -36,7 +37,7 @@ distributions {
 
 dependencies {
     compile "net.sourceforge.argparse4j:argparse4j:$argparse4jVersion"
-    compile "org.neo4j.driver:neo4j-java-driver:$neo4jJavaVersion"
+    compile "org.neo4j.driver:neo4j-java-driver:$neo4jJavaDriverVersion"
     compileOnly "com.google.code.findbugs:annotations:$findbugsVersion"
     compile "org.fusesource.jansi:jansi:$jansiVersion"
     compile("jline:jline:$jlineVersion") {

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

@@ -51,6 +51,11 @@ public static void main(String[] args) {
     void startShell(@Nonnull CliArgs cliArgs) {
         if (cliArgs.getVersion()) {
             out.println("Cypher-Shell " + Build.version());
+        }
+        if (cliArgs.getDriverVersion()) {
+            out.println("Neo4j Driver " + Build.driverVersion());
+        }
+        if (cliArgs.getVersion() || cliArgs.getDriverVersion()) {
             return;
         }
         Logger logger = instantiateLogger(cliArgs);

cypher-shell/src/main/java/org/neo4j/shell/build/Build.java

@@ -22,7 +22,11 @@ private static Properties getProperties() {
         if (props == null) {
             props = new Properties();
             try (InputStream stream = Build.class.getClassLoader().getResourceAsStream("build.properties")) {
-                props.load(stream);
+                if (stream == null) {
+                    throw new IllegalStateException("Cannot read build.properties");
+                } else {
+                    props.load(stream);
+                }
             } catch (IOException e) {
                 System.err.println("Could not read build properties: " + e.getMessage());
             }
@@ -38,4 +42,12 @@ private static Properties getProperties() {
     public static String version() {
         return getProperties().getProperty("version", "dev");
     }
+
+    /**
+     * @return the revision of the Neo4j Driver, or "dev" if no properties file could be read.
+     */
+    @Nonnull
+    public static String driverVersion() {
+        return getProperties().getProperty("driverVersion", "dev");
+    }
 }

cypher-shell/src/main/java/org/neo4j/shell/cli/CliArgHelper.java

@@ -90,6 +90,8 @@ public static CliArgs parse(@Nonnull String... args) {
 
         cliArgs.setVersion(ns.getBoolean("version"));
 
+        cliArgs.setDriverVersion(ns.getBoolean("driver-version"));
+
         return cliArgs;
     }
 
@@ -169,6 +171,11 @@ private static ArgumentParser setupParser()
                 .help("print version of cypher-shell and exit")
                 .action(new StoreTrueArgumentAction());
 
+        parser.addArgument("--driver-version")
+                .help("print version of the Neo4j Driver used and exit")
+                .dest("driver-version")
+                .action(new StoreTrueArgumentAction());
+
         parser.addArgument("cypher")
                 .nargs("?")
                 .help("an optional string of cypher to execute and then exit");

cypher-shell/src/main/java/org/neo4j/shell/cli/CliArgs.java

@@ -17,6 +17,7 @@ public class CliArgs {
     private boolean debugMode;
     private boolean nonInteractive = false;
     private boolean version = false;
+    private boolean driverVersion = false;
 
     /**
      * Set the scheme to the primary value, or if null, the fallback value.
@@ -155,6 +156,14 @@ public void setVersion(boolean version) {
         this.version = version;
     }
 
+    public boolean getDriverVersion() {
+        return driverVersion;
+    }
+
+    public void setDriverVersion(boolean version) {
+        this.driverVersion = version;
+    }
+
     public boolean isStringShell() {
         return cypher.isPresent();
     }

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

@@ -221,7 +221,7 @@ public void connectMaybeInteractivelyRepromptsIfUserIsNotProvided() throws Excep
     }
 
     @Test
-    public void printsVersionAndExits() throws Exception {
+    public void printsVersionAndExits() {
         CliArgs args = new CliArgs();
         args.setVersion(true);
 
@@ -235,4 +235,20 @@ public void printsVersionAndExits() throws Exception {
         verify(printStream).println(argument.capture());
         assertTrue(argument.getValue().matches("Cypher-Shell \\d+\\.\\d+\\.\\d+.*"));
     }
+
+    @Test
+    public void printsDriverVersionAndExits() {
+        CliArgs args = new CliArgs();
+        args.setDriverVersion(true);
+
+        PrintStream printStream = mock(PrintStream.class);
+
+        Main main = new Main(System.in, printStream);
+        main.startShell(args);
+
+        ArgumentCaptor<String> argument = ArgumentCaptor.forClass(String.class);
+
+        verify(printStream).println(argument.capture());
+        assertTrue(argument.getValue().matches("Neo4j Driver \\d+\\.\\d+\\.\\d+.*"));
+    }
 }

cypher-shell/src/test/java/org/neo4j/shell/build/BuildTest.java

@@ -10,4 +10,9 @@ public class BuildTest {
     public void versionIsNumeric() throws Exception {
         assertTrue(Build.version().matches("\\d+\\.\\d+\\.\\d+.*"));
     }
+
+    @Test
+    public void neo4jDriverVersionIsNumeric() throws Exception {
+        assertTrue(Build.driverVersion().matches("\\d+\\.\\d+\\.\\d+.*"));
+    }
 }

cypher-shell/src/test/java/org/neo4j/shell/cli/CliArgHelperTest.java

@@ -50,6 +50,18 @@ public void testDebugIsParsed() {
                 CliArgHelper.parse(asArray("--debug")).getDebugMode());
     }
 
+    @Test
+    public void testVersionIsParsed() {
+        assertTrue("Version should have been parsed to true",
+                CliArgHelper.parse(asArray("--version")).getVersion());
+    }
+
+    @Test
+    public void testDriverVersionIsParsed() {
+        assertTrue("Driver version should have been parsed to true",
+                CliArgHelper.parse(asArray("--driver-version")).getDriverVersion());
+    }
+
     @Test
     public void testFailFastIsDefault() {
         assertEquals("Unexpected fail-behavior", FailBehavior.FAIL_FAST,

cypher-shell/src/test/java/org/neo4j/shell/test/bolt/FakeSession.java

@@ -17,6 +17,12 @@ public Transaction beginTransaction() {
         return null;
     }
 
+    @Override
+    public Transaction beginTransaction( TransactionConfig config )
+    {
+        return null;
+    }
+
     @Override
     public Transaction beginTransaction(String bookmark) {
         return null;
@@ -27,26 +33,92 @@ public CompletionStage<Transaction> beginTransactionAsync() {
         return null;
     }
 
+    @Override
+    public CompletionStage<Transaction> beginTransactionAsync( TransactionConfig config )
+    {
+        return null;
+    }
+
     @Override
     public <T> T readTransaction(TransactionWork<T> work) {
         return null;
     }
 
+    @Override
+    public <T> T readTransaction( TransactionWork<T> work, TransactionConfig config )
+    {
+        return null;
+    }
+
     @Override
     public <T> CompletionStage<T> readTransactionAsync(TransactionWork<CompletionStage<T>> work) {
         return null;
     }
 
+    @Override
+    public <T> CompletionStage<T> readTransactionAsync( TransactionWork<CompletionStage<T>> work, TransactionConfig config )
+    {
+        return null;
+    }
+
     @Override
     public <T> T writeTransaction(TransactionWork<T> work) {
         return null;
     }
 
+    @Override
+    public <T> T writeTransaction( TransactionWork<T> work, TransactionConfig config )
+    {
+        return null;
+    }
+
     @Override
     public <T> CompletionStage<T> writeTransactionAsync(TransactionWork<CompletionStage<T>> work) {
         return null;
     }
 
+    @Override
+    public <T> CompletionStage<T> writeTransactionAsync( TransactionWork<CompletionStage<T>> work, TransactionConfig config )
+    {
+        return null;
+    }
+
+    @Override
+    public StatementResult run( String statement, TransactionConfig config )
+    {
+        return FakeStatementResult.parseStatement(statement);
+    }
+
+    @Override
+    public StatementResult run( String statement, Map<String,Object> parameters, TransactionConfig config )
+    {
+        return FakeStatementResult.parseStatement(statement);
+    }
+
+    @Override
+    public StatementResult run( Statement statement, TransactionConfig config )
+    {
+        return new FakeStatementResult();
+    }
+
+    @Override
+    public CompletionStage<StatementResultCursor> runAsync( String statement, TransactionConfig config )
+    {
+        return null;
+    }
+
+    @Override
+    public CompletionStage<StatementResultCursor> runAsync( String statement, Map<String,Object> parameters, TransactionConfig config )
+    {
+        return null;
+    }
+
+    @Override
+    public CompletionStage<StatementResultCursor> runAsync( Statement statement, TransactionConfig config )
+    {
+        return null;
+    }
+
     @Override
     public String lastBookmark() {
         return null;