Merge branch '1.7' into 4.0

Author: Zhen Li

driver/src/test/java/org/neo4j/driver/stress/AbstractStressTestBase.java

@@ -111,14 +111,13 @@ void setUp()
     {
         logging = new LoggerNameTrackingLogging();
 
-        Config config = Config.builder()
+         Config.ConfigBuilder builder = Config.builder()
                 .withLogging( logging )
                 .withMaxConnectionPoolSize( 100 )
                 .withConnectionAcquisitionTimeout( 1, MINUTES )
-                .withDriverMetrics()
-                .build();
+                .withDriverMetrics();
 
-        driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config );
+        driver = (InternalDriver) GraphDatabase.driver( databaseUri(), authToken(), config( builder )  );
 
         ThreadFactory threadFactory = new DaemonThreadFactory( getClass().getSimpleName() + "-worker-" );
         executor = Executors.newCachedThreadPool( threadFactory );
@@ -217,6 +216,8 @@ private void runStressTest( Function<C,List<Future<?>>> threadLauncher ) throws
 
     abstract AuthToken authToken();
 
+    abstract Config config( Config.ConfigBuilder builder );
+
     abstract C createContext();
 
     abstract List<BlockingCommand<C>> createTestSpecificBlockingCommands();

driver/src/test/java/org/neo4j/driver/stress/CausalClusteringStressIT.java

@@ -33,6 +33,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.neo4j.driver.AuthToken;
+import org.neo4j.driver.Config;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.exceptions.SessionExpiredException;
 import org.neo4j.driver.internal.BoltServerAddress;
@@ -65,6 +66,12 @@ AuthToken authToken()
         return clusterRule.getAuthToken();
     }
 
+    @Override
+    Config config( Config.ConfigBuilder builder )
+    {
+        return clusterRule.getDriverConfig( builder );
+    }
+
     @Override
     Context createContext()
     {

driver/src/test/java/org/neo4j/driver/stress/SingleInstanceStressIT.java

@@ -26,6 +26,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.neo4j.driver.AuthToken;
+import org.neo4j.driver.Config;
 import org.neo4j.driver.summary.ResultSummary;
 import org.neo4j.driver.util.DatabaseExtension;
 import org.neo4j.driver.util.ParallelizableIT;
@@ -52,6 +53,12 @@ AuthToken authToken()
         return neo4j.authToken();
     }
 
+    @Override
+    Config config( Config.ConfigBuilder builder )
+    {
+        return builder.build();
+    }
+
     @Override
     Context createContext()
     {

driver/src/test/java/org/neo4j/driver/util/cc/LocalOrRemoteClusterExtension.java

@@ -27,6 +27,7 @@
 
 import org.neo4j.driver.AuthToken;
 import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Config;
 import org.neo4j.driver.Driver;
 import org.neo4j.driver.internal.util.DriverFactoryWithOneEventLoopThread;
 import org.neo4j.driver.util.TestUtil;
@@ -61,6 +62,20 @@ public AuthToken getAuthToken()
         return localClusterExtension.getDefaultAuthToken();
     }
 
+    public Config getDriverConfig( Config.ConfigBuilder builder )
+    {
+        if ( remoteClusterExists() )
+        {
+            builder.withEncryption();
+        }
+        else
+        {
+            builder.withoutEncryption();
+        }
+
+        return builder.build();
+    }
+
     @Override
     public void beforeAll( ExtensionContext context ) throws Exception
     {