From 05684ed19aecabcc084c948b48e2bc64d3af249d Mon Sep 17 00:00:00 2001 From: Satia Herfert Date: Thu, 12 Mar 2020 17:14:47 +0100 Subject: [PATCH] Use java driver 4.0.1 --- build.gradle | 2 +- .../main/java/org/neo4j/shell/state/BoltStateHandler.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index d5b0a18b..325d3cf4 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ ext { argparse4jVersion = '0.7.0' junitVersion = '4.12' evaluatorVersion = '3.5.14' - neo4jJavaDriverVersion = '4.0.0' + neo4jJavaDriverVersion = '4.0.1' findbugsVersion = '3.0.0' jansiVersion = '1.13' jlineVersion = '2.14.6' diff --git a/cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java b/cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java index 9fcbbce8..33656435 100644 --- a/cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java +++ b/cypher-shell/src/main/java/org/neo4j/shell/state/BoltStateHandler.java @@ -26,7 +26,7 @@ import org.neo4j.driver.Values; import org.neo4j.driver.exceptions.ClientException; import org.neo4j.driver.exceptions.SessionExpiredException; -import org.neo4j.driver.internal.DriverFactory; +import org.neo4j.driver.internal.Scheme; import org.neo4j.driver.summary.DatabaseInfo; import org.neo4j.driver.summary.ResultSummary; import org.neo4j.function.ThrowingAction; @@ -161,11 +161,11 @@ public void connect( @Nonnull ConnectionConfig connectionConfig, ThrowingAction< driver = getDriver(connectionConfig, authToken); reconnect(command); } catch (org.neo4j.driver.exceptions.ServiceUnavailableException e) { - if (!connectionConfig.scheme().equals(DriverFactory.BOLT_ROUTING_URI_SCHEME + "://")) { + if (!connectionConfig.scheme().equals( Scheme.NEO4J_URI_SCHEME + "://")) { throw e; } connectionConfig = new ConnectionConfig( - DriverFactory.BOLT_URI_SCHEME + "://", + Scheme.BOLT_URI_SCHEME + "://", connectionConfig.host(), connectionConfig.port(), connectionConfig.username(),