Update java driver

build.gradle

@@ -71,7 +71,7 @@ ext {
     argparse4jVersion = '0.7.0'
     junitVersion = '4.12'
     evaluatorVersion = '3.5.14'
-    neo4jJavaDriverVersion = '1.7.6'
+    neo4jJavaDriverVersion = '4.4.20'
     findbugsVersion = '3.0.0'
     jansiVersion = '1.13'
     jlineVersion = '2.14.6'

geequel-shell/src/dist/geequel-shell

@@ -84,7 +84,7 @@ _show_java_help() {
 }
 
 build_classpath() {
-  APP_HOME="$(cd "$(dirname "$0")" && pwd)"
+  APP_HOME="$(cd "$(dirname "$(realpath "$0")")" && pwd)"
   # First try in sub directory
   JARPATH="$(find "${APP_HOME}" -name "geequel-shell.jar" )"
 

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

@@ -24,7 +24,7 @@
 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.CypherShell;
 import org.neo4j.shell.StringLinePrinter;
 import org.neo4j.shell.cli.Format;

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

@@ -19,7 +19,7 @@
  */
 package org.neo4j.shell.commands;
 
-import org.neo4j.driver.v1.exceptions.ServiceUnavailableException;
+import org.neo4j.driver.exceptions.ServiceUnavailableException;
 import org.neo4j.shell.ConnectionConfig;
 import org.neo4j.shell.CypherShell;
 import org.neo4j.shell.exception.CommandException;

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

@@ -19,26 +19,26 @@
  */
 package org.neo4j.shell;
 
-import org.neo4j.driver.v1.Config;
+import org.neo4j.driver.Config;
 
 import javax.annotation.Nonnull;
 
 public class ConnectionConfig {
     private final String scheme;
     private final String host;
     private final int port;
-    private final Config.EncryptionLevel encryption;
     private String username;
     private String password;
+    private boolean encryption;
 
     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, "ONGDB_USERNAME");
         this.password = fallbackToEnvVariable(password, "ONGDB_PASSWORD");
-        this.encryption = encryption ? Config.EncryptionLevel.REQUIRED : Config.EncryptionLevel.NONE;
         this.scheme = scheme;
+        this.encryption = encryption;
     }
 
     /**
@@ -78,13 +78,13 @@ public String password() {
     }
 
     @Nonnull
-    public String driverUrl() {
-        return String.format("%s%s:%d", scheme(), host(), port());
+    public Boolean encryption() {
+        return encryption;
     }
 
     @Nonnull
-    public Config.EncryptionLevel encryption() {
-        return encryption;
+    public String driverUrl() {
+        return String.format("%s%s:%d", scheme(), host(), port());
     }
 
     public void setUsername(@Nonnull String username) {

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

@@ -21,7 +21,7 @@
 
 import jline.console.ConsoleReader;
 
-import org.neo4j.driver.v1.exceptions.AuthenticationException;
+import org.neo4j.driver.exceptions.AuthenticationException;
 import org.neo4j.shell.config.Build;
 import org.neo4j.shell.cli.CliArgHelper;
 import org.neo4j.shell.cli.CliArgs;

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

@@ -145,7 +145,7 @@ private static ArgumentParser setupParser()
         ArgumentGroup connGroup = parser.addArgumentGroup("connection arguments");
         connGroup.addArgument("-a", "--address")
                 .help("address and port to connect to")
-                .setDefault("bolt://localhost:7687");
+                .setDefault("neo4j://localhost:7687");
         connGroup.addArgument("-u", "--username")
                 .setDefault("")
                 .help("username to connect as. Can also be specified using environment variable ONGDB_USERNAME");

geequel-shell/src/main/java/org/neo4j/shell/log/AnsiLogger.java

@@ -21,7 +21,7 @@
 
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
-import org.neo4j.driver.v1.exceptions.ClientException;
+import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.shell.cli.Format;
 import org.neo4j.shell.exception.AnsiFormattedException;
 

geequel-shell/src/main/java/org/neo4j/shell/log/NullLogger.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.shell.log;
 
-import org.neo4j.driver.v1.Logger;
+import org.neo4j.driver.Logger;
 
 public class NullLogger implements Logger
 {
@@ -54,6 +54,10 @@ public void debug( String message, Object... params )
     {
     }
 
+    @Override
+    public void debug(String s, Throwable throwable) {
+    }
+
     @Override
     public void trace( String message, Object... params )
     {

geequel-shell/src/main/java/org/neo4j/shell/log/NullLogging.java

@@ -19,8 +19,8 @@
  */
 package org.neo4j.shell.log;
 
-import org.neo4j.driver.v1.Logger;
-import org.neo4j.driver.v1.Logging;
+import org.neo4j.driver.Logger;
+import org.neo4j.driver.Logging;
 
 public class NullLogging implements Logging
 {

geequel-shell/src/main/java/org/neo4j/shell/prettyprint/OutputFormatter.java

@@ -20,15 +20,15 @@
 package org.neo4j.shell.prettyprint;
 
 import org.neo4j.driver.internal.types.TypeRepresentation;
-import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.Values;
-import org.neo4j.driver.v1.summary.Plan;
-import org.neo4j.driver.v1.summary.ProfiledPlan;
-import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.types.Node;
-import org.neo4j.driver.v1.types.Path;
-import org.neo4j.driver.v1.types.Point;
-import org.neo4j.driver.v1.types.Relationship;
+import org.neo4j.driver.Value;
+import org.neo4j.driver.Values;
+import org.neo4j.driver.summary.Plan;
+import org.neo4j.driver.summary.ProfiledPlan;
+import org.neo4j.driver.summary.ResultSummary;
+import org.neo4j.driver.types.Node;
+import org.neo4j.driver.types.Path;
+import org.neo4j.driver.types.Point;
+import org.neo4j.driver.types.Relationship;
 import org.neo4j.shell.state.BoltResult;
 
 import javax.annotation.Nonnull;
@@ -216,7 +216,7 @@ static Map<String, Value> info(@Nonnull ResultSummary summary) {
 
         Plan plan = summary.plan();
         result.put("Plan", Values.value(summary.hasProfile() ? "PROFILE" : "EXPLAIN"));
-        result.put("Statement", Values.value(summary.statementType().name()));
+        result.put("Statement", Values.value(summary.queryType().name()));
         Map<String, Value> arguments = plan.arguments();
         Value defaultValue = Values.value("");
 

geequel-shell/src/main/java/org/neo4j/shell/prettyprint/SimpleOutputFormatter.java

@@ -19,9 +19,9 @@
  */
 package org.neo4j.shell.prettyprint;
 
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.summary.ResultSummary;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.Value;
+import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.shell.state.BoltResult;
 
 import javax.annotation.Nonnull;

geequel-shell/src/main/java/org/neo4j/shell/prettyprint/StatisticsCollector.java

@@ -19,8 +19,8 @@
  */
 package org.neo4j.shell.prettyprint;
 
-import org.neo4j.driver.v1.summary.ResultSummary;
-import org.neo4j.driver.v1.summary.SummaryCounters;
+import org.neo4j.driver.summary.ResultSummary;
+import org.neo4j.driver.summary.SummaryCounters;
 import org.neo4j.shell.cli.Format;
 
 import javax.annotation.Nonnull;

geequel-shell/src/main/java/org/neo4j/shell/prettyprint/TableOutputFormatter.java

@@ -31,9 +31,9 @@
 
 import org.neo4j.driver.internal.InternalRecord;
 import org.neo4j.driver.internal.value.NumberValueAdapter;
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.summary.ResultSummary;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.Value;
+import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.shell.state.BoltResult;
 
 import static java.util.Arrays.asList;

geequel-shell/src/main/java/org/neo4j/shell/prettyprint/TablePlanFormatter.java

@@ -35,9 +35,9 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import org.neo4j.driver.v1.Value;
-import org.neo4j.driver.v1.Values;
-import org.neo4j.driver.v1.summary.Plan;
+import org.neo4j.driver.Value;
+import org.neo4j.driver.Values;
+import org.neo4j.driver.summary.Plan;
 
 import static java.util.Arrays.asList;
 import static java.util.stream.Collectors.joining;

geequel-shell/src/main/java/org/neo4j/shell/state/BoltResult.java

@@ -19,8 +19,8 @@
  */
 package org.neo4j.shell.state;
 
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.summary.ResultSummary;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.summary.ResultSummary;
 
 import javax.annotation.Nonnull;
 import java.util.Iterator;

geequel-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java

@@ -19,21 +19,14 @@
  */
 package org.neo4j.shell.state;
 
-import org.neo4j.driver.v1.AccessMode;
-import org.neo4j.driver.v1.AuthToken;
-import org.neo4j.driver.v1.AuthTokens;
-import org.neo4j.driver.v1.Config;
-import org.neo4j.driver.v1.Driver;
-import org.neo4j.driver.v1.GraphDatabase;
-import org.neo4j.driver.v1.Session;
-import org.neo4j.driver.v1.Statement;
-import org.neo4j.driver.v1.StatementResult;
-import org.neo4j.driver.v1.Transaction;
-import org.neo4j.driver.v1.exceptions.SessionExpiredException;
+import org.neo4j.driver.*;
+import org.neo4j.driver.Result;
+import org.neo4j.driver.exceptions.SessionExpiredException;
 import org.neo4j.shell.ConnectionConfig;
 import org.neo4j.shell.Connector;
 import org.neo4j.shell.TransactionHandler;
 import org.neo4j.shell.TriFunction;
+import org.neo4j.shell.config.Build;
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.log.NullLogging;
 
@@ -49,6 +42,7 @@
  * Handles interactions with the driver
  */
 public class BoltStateHandler implements TransactionHandler, Connector {
+    private static final String USER_AGENT = "ongdb-geequel-shell/v" + Build.version();
     private final TriFunction<String, AuthToken, Config, Driver> driverProvider;
     protected Driver driver;
     protected Session session;
@@ -82,7 +76,7 @@ public Optional<List<BoltResult>> commitTransaction() throws CommandException {
         if (!isTransactionOpen()) {
             throw new CommandException("There is no open transaction to commit");
         }
-        tx.success();
+        tx.commit();
         tx.close();
         tx = null;
 
@@ -97,7 +91,7 @@ public void rollbackTransaction() throws CommandException {
         if (!isTransactionOpen()) {
             throw new CommandException("There is no open transaction to rollback");
         }
-        tx.failure();
+        tx.rollback();
         tx.close();
         tx = null;
     }
@@ -125,24 +119,26 @@ public void connect(@Nonnull ConnectionConfig connectionConfig) throws CommandEx
             reconnect();
         } catch (Throwable t) {
             try {
+                System.err.println("Error connecting to ONgDB: " + t.getMessage());
                 silentDisconnect();
             } catch (Exception e) {
+                System.err.println("Error disconnecting from ONgDB: " + e.getMessage());
                 t.addSuppressed(e);
             }
             throw t;
         }
     }
 
     private void reconnect() {
-        String bookmark = null;
+        Bookmark bookmark = null;
         if (session != null) {
             bookmark = session.lastBookmark();
             session.close();
         }
-        session = driver.session(AccessMode.WRITE, bookmark);
-        StatementResult run = session.run("RETURN 1");
-        this.version = run.summary().server().version();
-        run.consume();
+        SessionConfig sessionConfig = SessionConfig.builder().withDefaultAccessMode(AccessMode.WRITE).withBookmarks( bookmark).build();
+        session = driver.session(sessionConfig);
+        Result run = session.run("RETURN 1");
+        this.version = run.consume().server().version();
     }
 
     @Nonnull
@@ -194,19 +190,19 @@ public Optional<BoltResult> runCypher(@Nonnull String cypher,
      */
     @Nonnull
     private Optional<BoltResult> getBoltResult(@Nonnull String cypher, @Nonnull Map<String, Object> queryParams) throws SessionExpiredException {
-        StatementResult statementResult;
+        Result Result;
 
         if (isTransactionOpen()){
-            statementResult = tx.run(new Statement(cypher, queryParams));
+            Result = tx.run(new Query(cypher, queryParams));
         } else {
-            statementResult = session.run(new Statement(cypher, queryParams));
+            Result = session.run(new Query(cypher, queryParams));
         }
 
-        if (statementResult == null) {
+        if (Result == null) {
             return Optional.empty();
         }
 
-        return Optional.of(new StatementBoltResult(statementResult));
+        return Optional.of(new StatementBoltResult(Result));
     }
 
     /**
@@ -237,21 +233,24 @@ public void reset() {
             // Clear current state
             if (isTransactionOpen()) {
                 // Bolt has already rolled back the transaction but it doesn't close it properly
-                tx.failure();
+                tx.rollback();
                 tx.close();
                 tx = null;
             }
         }
     }
 
     private Driver getDriver(@Nonnull ConnectionConfig connectionConfig, @Nullable AuthToken authToken) {
-        Config config = Config.build()
-                              .withLogging(NullLogging.NULL_LOGGING)
-                              .withEncryptionLevel(connectionConfig.encryption()).toConfig();
-        return driverProvider.apply(connectionConfig.driverUrl(), authToken, config);
+        Config.ConfigBuilder configBuilder = Config.builder()
+                              .withLogging(NullLogging.NULL_LOGGING).withUserAgent( USER_AGENT );
+        Config config;
+        if (connectionConfig.encryption()){config = configBuilder.withEncryption().build();} else {config = configBuilder.build();}
+
+        String driverUrl = connectionConfig.driverUrl();
+        return driverProvider.apply(driverUrl, authToken, config);
     }
 
-    private List<BoltResult> executeWithRetry(List<Statement> transactionStatements, BiFunction<Statement, Transaction, BoltResult> biFunction) {
+    private List<BoltResult> executeWithRetry(List<Query> transactionStatements, BiFunction<Query, Transaction, BoltResult> biFunction) {
         return session.writeTransaction(tx ->
                 transactionStatements.stream()
                         .map(transactionStatement -> biFunction.apply(transactionStatement, tx))

geequel-shell/src/main/java/org/neo4j/shell/state/ListBoltResult.java

@@ -19,8 +19,8 @@
  */
 package org.neo4j.shell.state;
 
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.summary.ResultSummary;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.summary.ResultSummary;
 
 import javax.annotation.Nonnull;
 import java.util.Collections;