Change use of deprecated API

Author: henriknyman

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

@@ -8,7 +8,7 @@ public class ConnectionConfig {
     private final String scheme;
     private final String host;
     private final int port;
-    private final Config.EncryptionLevel encryption;
+    private final boolean encryption;
     private String username;
     private String password;
     private String database;
@@ -20,7 +20,7 @@ public ConnectionConfig(@Nonnull String scheme, @Nonnull String host, int port,
         this.port = port;
         this.username = fallbackToEnvVariable(username, "NEO4J_USERNAME");
         this.password = fallbackToEnvVariable(password, "NEO4J_PASSWORD");
-        this.encryption = encryption ? Config.EncryptionLevel.REQUIRED : Config.EncryptionLevel.NONE;
+        this.encryption = encryption;
         this.scheme = scheme;
         this.database = database;
     }
@@ -67,7 +67,7 @@ public String driverUrl() {
     }
 
     @Nonnull
-    public Config.EncryptionLevel encryption() {
+    public boolean encryption() {
         return encryption;
     }
 

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

@@ -250,10 +250,13 @@ private void clearTransactionStatements() {
     }
 
     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.build().withLogging(NullLogging.NULL_LOGGING);
+        if (connectionConfig.encryption()) {
+            configBuilder = configBuilder.withEncryption();
+        } else {
+            configBuilder = configBuilder.withoutEncryption();
+        }
+        return driverProvider.apply(connectionConfig.driverUrl(), authToken, configBuilder.toConfig());
     }
 
     private Optional<List<BoltResult>> captureResults(@Nonnull List<Statement> transactionStatements) {

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

@@ -45,9 +45,9 @@ public void driverUrlDefaultScheme() throws Exception {
 
     @Test
     public void encryption() {
-        assertEquals(Config.EncryptionLevel.REQUIRED,
+        assertEquals(true,
                 new ConnectionConfig("bolt://", "", -1, "", "", true, ABSENT_DB_NAME).encryption());
-        assertEquals(Config.EncryptionLevel.NONE,
+        assertEquals(false,
                 new ConnectionConfig("bolt://", "", -1, "", "", false, ABSENT_DB_NAME).encryption());
     }
 }