Rolled back cluster feature

Author: technige

driver/src/main/java/org/neo4j/driver/internal/ClusterDriver.java

@@ -18,18 +18,17 @@
  */
 package org.neo4j.driver.v1;
 
-import java.io.IOException;
-import java.net.URI;
-import java.security.GeneralSecurityException;
-
-import org.neo4j.driver.internal.ClusterDriver;
 import org.neo4j.driver.internal.DirectDriver;
 import org.neo4j.driver.internal.SessionParameters;
+import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.net.pooling.PoolSettings;
 import org.neo4j.driver.internal.security.SecurityPlan;
-import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.v1.exceptions.ClientException;
 
+import java.io.IOException;
+import java.net.URI;
+import java.security.GeneralSecurityException;
+
 import static java.lang.String.format;
 import static org.neo4j.driver.v1.Config.EncryptionLevel.REQUIRED;
 import static org.neo4j.driver.v1.Config.EncryptionLevel.REQUIRED_NON_LOCAL;
@@ -152,7 +151,7 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
         SecurityPlan securityPlan;
         try
         {
-            securityPlan = createSecurityPlan( address, authToken, config );
+            securityPlan = createSecurityPlan( address, config );
         }
         catch ( GeneralSecurityException | IOException ex )
         {
@@ -169,8 +168,6 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
         {
         case "bolt":
             return new DirectDriver( address, sessionParameters, securityPlan, poolSettings, config.logging() );
-        case "bolt+discovery":
-            return new ClusterDriver( address, sessionParameters, securityPlan, poolSettings, config.logging() );
         default:
             throw new ClientException( format( "Unsupported URI scheme: %s", scheme ) );
         }
@@ -180,7 +177,7 @@ public static Driver driver( URI uri, AuthToken authToken, Config config )
      * Establish a complete SecurityPlan based on the details provided for
      * driver construction.
      */
-    private static SecurityPlan createSecurityPlan( BoltServerAddress address, AuthToken authToken, Config config )
+    private static SecurityPlan createSecurityPlan( BoltServerAddress address, Config config )
             throws GeneralSecurityException, IOException
     {
         Config.EncryptionLevel encryptionLevel = config.encryptionLevel();

driver/src/main/java/org/neo4j/driver/v1/GraphDatabase.java

@@ -21,19 +21,13 @@
 
 import org.junit.Rule;
 import org.junit.Test;
-import org.neo4j.driver.internal.ClusterDriver;
 import org.neo4j.driver.internal.DirectDriver;
-import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.v1.util.TestNeo4jSession;
 
 import java.net.URI;
-import java.util.Collection;
-import java.util.Set;
 
-import static org.hamcrest.core.IsEqual.equalTo;
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.Assert.*;
-import static org.neo4j.driver.v1.Values.parameters;
 
 public class GraphDatabaseTest
 {
@@ -54,18 +48,4 @@ public void boltSchemeShouldInstantiateDirectDriver()
 
     }
 
-    @Test
-    public void boltPlusDiscoverySchemeShouldInstantiateClusterDriver()
-    {
-        // Given
-        URI uri = URI.create( "bolt+discovery://localhost:7687" );
-
-        // When
-        Driver driver = GraphDatabase.driver( uri );
-
-        // Then
-        assertThat( driver, instanceOf( ClusterDriver.class ) );
-
-    }
-
 }