Move the round robin supplier to an internal class

Author: vietj

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/Utils.java

@@ -1,11 +1,15 @@
 package io.vertx.sqlclient.impl;
 
+import io.vertx.core.Future;
 import io.vertx.core.buffer.Buffer;
 import io.vertx.core.json.JsonArray;
 import io.vertx.core.json.JsonObject;
 
 import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Supplier;
 
 import static io.vertx.sqlclient.Tuple.JSON_NULL;
 
@@ -39,4 +43,16 @@ public static Object toJson(Object value) {
       return value.toString();
     }
   }
+
+  public static <T> Supplier<Future<T>> roundRobinSupplier(List<T> factories) {
+    return new Supplier<Future<T>>() {
+      final AtomicLong idx = new AtomicLong();
+      @Override
+      public Future<T> get() {
+        long val = idx.getAndIncrement();
+        T f = factories.get((int)val % factories.size());
+        return Future.succeededFuture(f);
+      }
+    };
+  }
 }

vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/ConnectionFactory.java

@@ -5,66 +5,11 @@
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.function.Supplier;
-
 /**
  * A connection factory, can be obtained from {@link Driver#createConnectionFactory}
  */
 public interface ConnectionFactory extends Closeable {
 
-  static <T> Supplier<Future<T>> roundRobinSupplier(List<T> factories) {
-    return new Supplier<Future<T>>() {
-      AtomicLong idx = new AtomicLong();
-      @Override
-      public Future<T> get() {
-        long val = idx.getAndIncrement();
-        T f = factories.get((int)val % factories.size());
-        return Future.succeededFuture(f);
-      }
-    };
-  }
-
-  /**
-   * @return a connection factory that connects with a round-robin policy
-   */
-  static ConnectionFactory roundRobinSelector(List<ConnectionFactory> factories) {
-    if (factories.size() == 1) {
-      return factories.get(0);
-    } else {
-      return new ConnectionFactory() {
-        int idx = 0;
-        @Override
-        public Future<SqlConnection> connect(Context context) {
-          ConnectionFactory f = factories.get(idx);
-          idx = (idx + 1) % factories.size();
-          return f.connect(context);
-        }
-        @Override
-        public Future<SqlConnection> connect(Context context, SqlConnectOptions options) {
-          ConnectionFactory f = factories.get(idx);
-          idx = (idx + 1) % factories.size();
-          return f.connect(context, options);
-        }
-        @Override
-        public void close(Promise<Void> promise) {
-          List<Future> list = new ArrayList<>(factories.size());
-          for (ConnectionFactory factory : factories) {
-            Promise<Void> p = Promise.promise();
-            factory.close(p);
-            list.add(p.future());
-          }
-          CompositeFuture.all(list)
-            .<Void>mapEmpty()
-            .onComplete(promise);
-        }
-      };
-    }
-  }
-
   default Future<SqlConnection> connect(Context context, Future<? extends SqlConnectOptions> fut) {
     // The future might be on any context or context-less
     // So we need to use a specific context promise

vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java

@@ -25,10 +25,7 @@
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
-import io.vertx.sqlclient.impl.Connection;
-import io.vertx.sqlclient.impl.SingletonSupplier;
-import io.vertx.sqlclient.impl.SqlConnectionBase;
-import io.vertx.sqlclient.impl.SqlConnectionInternal;
+import io.vertx.sqlclient.impl.*;
 
 import java.util.List;
 import java.util.function.Supplier;
@@ -100,7 +97,7 @@ default Pool createPool(Vertx vertx, Supplier<? extends Future<? extends SqlConn
    * @return the connection pool
    */
   default Pool createPool(Vertx vertx, List<? extends SqlConnectOptions> databases, PoolOptions options) {
-    return createPool(vertx, ConnectionFactory.roundRobinSupplier(databases), options);
+    return createPool(vertx, Utils.roundRobinSupplier(databases), options);
   }
 
   /**
@@ -115,7 +112,7 @@ default Pool createPool(Vertx vertx, List<? extends SqlConnectOptions> databases
    * @return the connection pool
    */
   default Pool newPool(Vertx vertx, List<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
-    return newPool(vertx, ConnectionFactory.roundRobinSupplier(databases), options, closeFuture);
+    return newPool(vertx, Utils.roundRobinSupplier(databases), options, closeFuture);
   }
 
   /**