Update to java driver 2.0.0-alpha03

Author: sherfert

build.gradle

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

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

@@ -5,7 +5,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.BiFunction;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -17,12 +16,12 @@
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.GraphDatabase;
 import org.neo4j.driver.Session;
-import org.neo4j.driver.SessionParametersTemplate;
 import org.neo4j.driver.Statement;
 import org.neo4j.driver.StatementResult;
 import org.neo4j.driver.Transaction;
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.exceptions.SessionExpiredException;
+import org.neo4j.driver.internal.SessionConfig;
 import org.neo4j.driver.summary.DatabaseInfo;
 import org.neo4j.shell.ConnectionConfig;
 import org.neo4j.shell.Connector;
@@ -173,20 +172,21 @@ private void reconnect() {
     }
 
     private void reconnect(boolean keepBookmark) {
-        Consumer<SessionParametersTemplate> sessionOptionalArgs = t -> {};
-        if (session != null && keepBookmark) {
+        SessionConfig.Builder builder = SessionConfig.builder();
+        builder.withDefaultAccessMode( AccessMode.WRITE );
+        if ( !ABSENT_DB_NAME.equals( activeDatabaseNameAsSetByUser ) )
+        {
+            builder.withDatabase( activeDatabaseNameAsSetByUser );
+        }
+        if ( session != null && keepBookmark )
+        {
             // Save the last bookmark and close the session
             final String bookmark = session.lastBookmark();
             session.close();
-            sessionOptionalArgs = t -> t.withBookmarks(bookmark);
+            builder.withBookmarks( bookmark );
         }
-        Consumer<SessionParametersTemplate> sessionArgs = t -> {
-            t.withDefaultAccessMode(AccessMode.WRITE);
-            if (!ABSENT_DB_NAME.equals(activeDatabaseNameAsSetByUser)) {
-                t.withDatabase(activeDatabaseNameAsSetByUser);
-            }
-        };
-        session = driver.session(sessionArgs.andThen(sessionOptionalArgs));
+
+        session = driver.session( builder.build() );
 
         String query = activeDatabaseNameAsSetByUser.compareToIgnoreCase(SYSTEM_DB_NAME) == 0 ? "SHOW DATABASES" : "RETURN 1";
 

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

@@ -3,14 +3,13 @@
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.Metrics;
 import org.neo4j.driver.Session;
-import org.neo4j.driver.SessionParametersTemplate;
 import org.neo4j.driver.async.AsyncSession;
 import org.neo4j.driver.exceptions.Neo4jException;
+import org.neo4j.driver.internal.SessionConfig;
 import org.neo4j.driver.reactive.RxSession;
 import org.neo4j.driver.types.TypeSystem;
 
 import java.util.concurrent.CompletionStage;
-import java.util.function.Consumer;
 
 public class FakeDriver implements Driver {
     @Override
@@ -24,7 +23,7 @@ public Session session() {
     }
 
     @Override
-    public Session session(Consumer<SessionParametersTemplate> templateConsumer) {
+    public Session session( SessionConfig sessionConfig) {
         return new FakeSession();
     }
 
@@ -50,7 +49,7 @@ public RxSession rxSession()
     }
 
     @Override
-    public RxSession rxSession(Consumer<SessionParametersTemplate> templateConsumer)
+    public RxSession rxSession( SessionConfig sessionConfig )
     {
         return null;
     }
@@ -62,7 +61,7 @@ public AsyncSession asyncSession()
     }
 
     @Override
-    public AsyncSession asyncSession(Consumer<SessionParametersTemplate> templateConsumer)
+    public AsyncSession asyncSession( SessionConfig sessionConfig )
     {
         return null;
     }
@@ -72,4 +71,15 @@ public TypeSystem defaultTypeSystem()
     {
         return null;
     }
+
+    @Override
+    public void verifyConnectivity()
+    {
+    }
+
+    @Override
+    public CompletionStage<Void> verifyConnectivityAsync()
+    {
+        return null;
+    }
 }