Removed cluster artifacts from Driver classes

Author: technige

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

@@ -19,27 +19,19 @@
 
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.security.SecurityPlan;
 import org.neo4j.driver.v1.Driver;
 import org.neo4j.driver.v1.Logger;
 import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.Session;
 
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-
 abstract class BaseDriver implements Driver
 {
-    private final ConnectionSettings connectionSettings;
     private final SecurityPlan securityPlan;
-    protected final List<BoltServerAddress> servers = new LinkedList<>();
     protected final Logger log;
 
-    BaseDriver( BoltServerAddress address, ConnectionSettings connectionSettings, SecurityPlan securityPlan, Logging logging )
+    BaseDriver( SecurityPlan securityPlan, Logging logging )
     {
-        this.servers.add( address );
-        this.connectionSettings = connectionSettings;
         this.securityPlan = securityPlan;
         this.log = logging.getLog( Session.LOG_NAME );
     }
@@ -50,15 +42,4 @@ public boolean isEncrypted()
         return securityPlan.requiresEncryption();
     }
 
-    @Override
-    public List<BoltServerAddress> servers()
-    {
-        return Collections.unmodifiableList( servers );
-    }
-
-    protected BoltServerAddress randomServer()
-    {
-        return servers.get( ThreadLocalRandom.current().nextInt( 0, servers.size() ) );
-    }
-
 }

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

@@ -19,31 +19,33 @@
 
 package org.neo4j.driver.internal;
 
-import org.neo4j.driver.internal.net.pooling.SocketConnectionPool;
+import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.internal.net.pooling.PoolSettings;
+import org.neo4j.driver.internal.net.pooling.SocketConnectionPool;
 import org.neo4j.driver.internal.security.SecurityPlan;
 import org.neo4j.driver.internal.spi.ConnectionPool;
-import org.neo4j.driver.internal.net.BoltServerAddress;
 import org.neo4j.driver.v1.Logging;
 import org.neo4j.driver.v1.Session;
 
 import static java.lang.String.format;
 
 public class DirectDriver extends BaseDriver
 {
+    private final BoltServerAddress address;
     private final ConnectionPool connections;
 
     public DirectDriver( BoltServerAddress address, ConnectionSettings connectionSettings, SecurityPlan securityPlan,
                          PoolSettings poolSettings, Logging logging )
     {
-        super( address, connectionSettings, securityPlan, logging );
+        super( securityPlan, logging );
+        this.address = address;
         this.connections = new SocketConnectionPool( connectionSettings, securityPlan, poolSettings, logging );
     }
 
     @Override
     public Session session()
     {
-        return new InternalSession( connections.acquire( randomServer() ), log );
+        return new InternalSession( connections.acquire( address ), log );
     }
 
     @Override

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

@@ -19,9 +19,6 @@
 package org.neo4j.driver.v1;
 
 import java.net.URI;
-import java.util.List;
-
-import org.neo4j.driver.internal.net.BoltServerAddress;
 
 /**
  * A Neo4j database driver, through which you can create {@link Session sessions} to run statements against the database.
@@ -73,13 +70,6 @@
  */
 public interface Driver extends AutoCloseable
 {
-    /**
-     * Return a collection of the server addresses known by this driver.
-     *
-     * @return list of server addresses
-     */
-    List<BoltServerAddress> servers();
-
     /**
      * Return a flag to indicate whether or not encryption is used for this driver.
      *