Use SqlConnectOptions generic type

Author: vietj

vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java

@@ -36,7 +36,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-public class DB2ConnectionFactory extends ConnectionFactoryBase {
+public class DB2ConnectionFactory extends ConnectionFactoryBase<DB2ConnectOptions> {
 
   public DB2ConnectionFactory(VertxInternal vertx, Supplier<DB2ConnectOptions> options) {
     super(vertx, options);
@@ -53,7 +53,7 @@ protected void configureNetClientOptions(NetClientOptions netClientOptions) {
   }
 
   @Override
-  protected Future<Connection> doConnectInternal(SqlConnectOptions options, EventLoopContext context) {
+  protected Future<Connection> doConnectInternal(DB2ConnectOptions options, EventLoopContext context) {
     SocketAddress server = options.getSocketAddress();
     boolean cachePreparedStatements = options.getCachePreparedStatements();
     int preparedStatementCacheSize = options.getPreparedStatementCacheMaxSize();
@@ -62,7 +62,7 @@ protected Future<Connection> doConnectInternal(SqlConnectOptions options, EventL
     String password = options.getPassword();
     String database = options.getDatabase();
     Map<String, String> properties = options.getProperties();
-    int pipeliningLimit = ((DB2ConnectOptions) options).getPipeliningLimit();
+    int pipeliningLimit = options.getPipeliningLimit();
     NetClient netClient = netClient(options);
     return netClient.connect(server).flatMap(so -> {
       DB2SocketConnection conn = new DB2SocketConnection((NetSocketInternal) so, cachePreparedStatements,
@@ -73,7 +73,7 @@ protected Future<Connection> doConnectInternal(SqlConnectOptions options, EventL
   }
 
   @Override
-  public Future<SqlConnection> connect(Context context, SqlConnectOptions options) {
+  public Future<SqlConnection> connect(Context context, DB2ConnectOptions options) {
     ContextInternal contextInternal = (ContextInternal) context;
     QueryTracer tracer = contextInternal.tracer() == null ? null : new QueryTracer(contextInternal.tracer(), options);
     Promise<SqlConnection> promise = contextInternal.promise();

vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java

@@ -36,14 +36,14 @@
 
 import java.util.function.Supplier;
 
-public class DB2Driver implements Driver {
+public class DB2Driver implements Driver<DB2ConnectOptions> {
 
   private static final String SHARED_CLIENT_KEY = "__vertx.shared.db2client";
 
   public static final DB2Driver INSTANCE = new DB2Driver();
 
   @Override
-  public Pool newPool(Vertx vertx, Supplier<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  public Pool newPool(Vertx vertx, Supplier<DB2ConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
@@ -54,15 +54,15 @@ public Pool newPool(Vertx vertx, Supplier<? extends SqlConnectOptions> databases
     return new DB2PoolImpl(vx, closeFuture, pool);
   }
 
-  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<DB2ConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
     DB2ConnectOptions baseConnectOptions = DB2ConnectOptions.wrap(databases.get());
     QueryTracer tracer = vertx.tracer() == null ? null : new QueryTracer(vertx.tracer(), baseConnectOptions);
     VertxMetrics vertxMetrics = vertx.metricsSPI();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(baseConnectOptions.getSocketAddress(), "sql", baseConnectOptions.getMetricsName()) : null;
     boolean pipelinedPool = options instanceof Db2PoolOptions && ((Db2PoolOptions) options).isPipelined();
     int pipeliningLimit = pipelinedPool ? baseConnectOptions.getPipeliningLimit() : 1;
     PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, pipeliningLimit, options, null, null, closeFuture);
-    ConnectionFactory factory = createConnectionFactory(vertx, databases);
+    ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx, databases);
     pool.connectionProvider(factory::connect);
     pool.init();
     closeFuture.add(factory);
@@ -81,17 +81,17 @@ public boolean acceptsOptions(SqlConnectOptions options) {
   }
 
   @Override
-  public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {
+  public ConnectionFactory<DB2ConnectOptions> createConnectionFactory(Vertx vertx, DB2ConnectOptions database) {
     return new DB2ConnectionFactory((VertxInternal) vertx, () -> DB2ConnectOptions.wrap(database));
   }
 
   @Override
-  public ConnectionFactory createConnectionFactory(Vertx vertx, Supplier<? extends SqlConnectOptions> database) {
+  public ConnectionFactory<DB2ConnectOptions> createConnectionFactory(Vertx vertx, Supplier<DB2ConnectOptions> database) {
     return new DB2ConnectionFactory((VertxInternal) vertx, () -> DB2ConnectOptions.wrap(database.get()));
   }
 
   @Override
-  public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
+  public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<DB2ConnectOptions> factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
     return new DB2ConnectionImpl(context, factory, conn, tracer, metrics);
   }
 }

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java

@@ -34,7 +34,7 @@
 
 import static io.vertx.mssqlclient.impl.codec.EncryptionLevel.*;
 
-public class MSSQLConnectionFactory extends ConnectionFactoryBase {
+public class MSSQLConnectionFactory extends ConnectionFactoryBase<MSSQLConnectOptions> {
 
   public MSSQLConnectionFactory(VertxInternal vertx, Supplier<MSSQLConnectOptions> options) {
     super(vertx, options);
@@ -51,8 +51,8 @@ protected void configureNetClientOptions(NetClientOptions netClientOptions) {
   }
 
   @Override
-  protected Future<Connection> doConnectInternal(SqlConnectOptions options, EventLoopContext context) {
-    return connectOrRedirect((MSSQLConnectOptions) options, context, 0);
+  protected Future<Connection> doConnectInternal(MSSQLConnectOptions options, EventLoopContext context) {
+    return connectOrRedirect(options, context, 0);
   }
 
   private Future<Connection> connectOrRedirect(MSSQLConnectOptions options, EventLoopContext context, int redirections) {
@@ -97,7 +97,7 @@ private Future<Connection> login(MSSQLSocketConnection conn, MSSQLConnectOptions
     Future<Void> future;
     if (encryptionLevel != ENCRYPT_NOT_SUP) {
       // Start connection encryption ...
-      future = conn.enableSsl(clientSslConfig, encryptionLevel, (MSSQLConnectOptions) options);
+      future = conn.enableSsl(clientSslConfig, encryptionLevel, options);
     } else {
       // ... unless the client did not require encryption and the server does not support it
       future = context.succeededFuture();
@@ -110,7 +110,7 @@ private Future<Connection> login(MSSQLSocketConnection conn, MSSQLConnectOptions
   }
 
   @Override
-  public Future<SqlConnection> connect(Context context, SqlConnectOptions options) {
+  public Future<SqlConnection> connect(Context context, MSSQLConnectOptions options) {
     ContextInternal ctx = (ContextInternal) context;
     QueryTracer tracer = ctx.tracer() == null ? null : new QueryTracer(ctx.tracer(), options);
     Promise<SqlConnection> promise = ctx.promise();

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java

@@ -39,14 +39,14 @@
 
 import java.util.function.Supplier;
 
-public class MSSQLDriver implements Driver {
+public class MSSQLDriver implements Driver<MSSQLConnectOptions> {
 
   private static final String SHARED_CLIENT_KEY = "__vertx.shared.mssqlclient";
 
   public static final MSSQLDriver INSTANCE = new MSSQLDriver();
 
   @Override
-  public Pool newPool(Vertx vertx, Supplier<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  public Pool newPool(Vertx vertx, Supplier<MSSQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
@@ -57,13 +57,13 @@ public Pool newPool(Vertx vertx, Supplier<? extends SqlConnectOptions> databases
     return new MSSQLPoolImpl(vx, closeFuture, pool);
   }
 
-  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<MSSQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
     MSSQLConnectOptions baseConnectOptions = MSSQLConnectOptions.wrap(databases.get());
     QueryTracer tracer = vertx.tracer() == null ? null : new QueryTracer(vertx.tracer(), baseConnectOptions);
     VertxMetrics vertxMetrics = vertx.metricsSPI();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(baseConnectOptions.getSocketAddress(), "sql", baseConnectOptions.getMetricsName()) : null;
     PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, 1, options, null, null, closeFuture);
-    ConnectionFactory factory = createConnectionFactory(vertx, databases);
+    ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx, databases);
     pool.connectionProvider(factory::connect);
     pool.init();
     closeFuture.add(factory);
@@ -82,12 +82,12 @@ public boolean acceptsOptions(SqlConnectOptions options) {
   }
 
   @Override
-  public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {
+  public ConnectionFactory<MSSQLConnectOptions> createConnectionFactory(Vertx vertx, MSSQLConnectOptions database) {
     return new MSSQLConnectionFactory((VertxInternal) vertx, () -> MSSQLConnectOptions.wrap(database));
   }
 
   @Override
-  public ConnectionFactory createConnectionFactory(Vertx vertx, Supplier<? extends SqlConnectOptions> database) {
+  public ConnectionFactory<MSSQLConnectOptions> createConnectionFactory(Vertx vertx, Supplier<MSSQLConnectOptions> database) {
     return new MSSQLConnectionFactory((VertxInternal) vertx, () -> MSSQLConnectOptions.wrap(database.get()));
   }
 
@@ -98,7 +98,7 @@ public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int cur
   }
 
   @Override
-  public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
+  public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<MSSQLConnectOptions> factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
     return new MSSQLConnectionImpl(context, factory, conn, tracer, metrics);
   }
 }

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java

@@ -36,7 +36,7 @@
 
 import static io.vertx.mysqlclient.impl.protocol.CapabilitiesFlag.*;
 
-public class MySQLConnectionFactory extends ConnectionFactoryBase {
+public class MySQLConnectionFactory extends ConnectionFactoryBase<MySQLConnectOptions> {
 
   public MySQLConnectionFactory(VertxInternal vertx, Supplier<MySQLConnectOptions> options) {
     super(vertx, options);
@@ -51,9 +51,8 @@ protected void configureNetClientOptions(NetClientOptions netClientOptions) {
   }
 
   @Override
-  protected Future<Connection> doConnectInternal(SqlConnectOptions options, EventLoopContext context) {
-    MySQLConnectOptions mySQLOptions = (MySQLConnectOptions) options;
-    SslMode sslMode = mySQLOptions.isUsingDomainSocket() ? SslMode.DISABLED : mySQLOptions.getSslMode();
+  protected Future<Connection> doConnectInternal(MySQLConnectOptions options, EventLoopContext context) {
+    SslMode sslMode = options.isUsingDomainSocket() ? SslMode.DISABLED : options.getSslMode();
     switch (sslMode) {
       case VERIFY_IDENTITY:
         String hostnameVerificationAlgorithm = options.getHostnameVerificationAlgorithm();
@@ -68,12 +67,12 @@ protected Future<Connection> doConnectInternal(SqlConnectOptions options, EventL
         }
         break;
     }
-    int capabilitiesFlag = capabilitiesFlags(mySQLOptions);
+    int capabilitiesFlag = capabilitiesFlags(options);
     options.setSsl(false);
     if (sslMode == SslMode.PREFERRED) {
-      return doConnect(mySQLOptions, sslMode, capabilitiesFlag, context).recover(err -> doConnect(mySQLOptions, SslMode.DISABLED, capabilitiesFlag, context));
+      return doConnect(options, sslMode, capabilitiesFlag, context).recover(err -> doConnect(options, SslMode.DISABLED, capabilitiesFlag, context));
     } else {
-      return doConnect(mySQLOptions, sslMode, capabilitiesFlag, context);
+      return doConnect(options, sslMode, capabilitiesFlag, context);
     }
   }
 
@@ -140,7 +139,7 @@ private Future<Connection> doConnect(MySQLConnectOptions options, SslMode sslMod
   }
 
   @Override
-  public Future<SqlConnection> connect(Context context, SqlConnectOptions options) {
+  public Future<SqlConnection> connect(Context context, MySQLConnectOptions options) {
     ContextInternal contextInternal = (ContextInternal) context;
     QueryTracer tracer = contextInternal.tracer() == null ? null : new QueryTracer(contextInternal.tracer(), options);
     Promise<SqlConnection> promise = contextInternal.promise();

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.java

@@ -36,14 +36,14 @@
 
 import java.util.function.Supplier;
 
-public class MySQLDriver implements Driver {
+public class MySQLDriver implements Driver<MySQLConnectOptions> {
 
   private static final String SHARED_CLIENT_KEY = "__vertx.shared.mysqlclient";
 
   public static final MySQLDriver INSTANCE = new MySQLDriver();
 
   @Override
-  public Pool newPool(Vertx vertx, Supplier<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  public Pool newPool(Vertx vertx, Supplier<MySQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
     VertxInternal vx = (VertxInternal) vertx;
     PoolImpl pool;
     if (options.isShared()) {
@@ -54,15 +54,15 @@ public Pool newPool(Vertx vertx, Supplier<? extends SqlConnectOptions> databases
     return new MySQLPoolImpl(vx, closeFuture, pool);
   }
 
-  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<? extends SqlConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
+  private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<MySQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
     MySQLConnectOptions baseConnectOptions = MySQLConnectOptions.wrap(databases.get());
     QueryTracer tracer = vertx.tracer() == null ? null : new QueryTracer(vertx.tracer(), baseConnectOptions);
     VertxMetrics vertxMetrics = vertx.metricsSPI();
     ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(baseConnectOptions.getSocketAddress(), "sql", baseConnectOptions.getMetricsName()) : null;
     boolean pipelinedPool = options instanceof MySQLPoolOptions && ((MySQLPoolOptions) options).isPipelined();
     int pipeliningLimit = pipelinedPool ? baseConnectOptions.getPipeliningLimit() : 1;
     PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, pipeliningLimit, options, null, null, closeFuture);
-    ConnectionFactory factory = createConnectionFactory(vertx, databases);
+    ConnectionFactory<MySQLConnectOptions> factory = createConnectionFactory(vertx, databases);
     pool.connectionProvider(factory::connect);
     pool.init();
     closeFuture.add(factory);
@@ -81,17 +81,17 @@ public boolean acceptsOptions(SqlConnectOptions options) {
   }
 
   @Override
-  public ConnectionFactory createConnectionFactory(Vertx vertx, SqlConnectOptions database) {
+  public ConnectionFactory<MySQLConnectOptions> createConnectionFactory(Vertx vertx, MySQLConnectOptions database) {
     return new MySQLConnectionFactory((VertxInternal) vertx, () -> MySQLConnectOptions.wrap(database));
   }
 
   @Override
-  public ConnectionFactory createConnectionFactory(Vertx vertx, Supplier<? extends SqlConnectOptions> database) {
+  public ConnectionFactory<MySQLConnectOptions> createConnectionFactory(Vertx vertx, Supplier<MySQLConnectOptions> database) {
     return new MySQLConnectionFactory((VertxInternal) vertx, () -> MySQLConnectOptions.wrap(database.get()));
   }
 
   @Override
-  public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
+  public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<MySQLConnectOptions> factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
     return new MySQLConnectionImpl(context, factory, conn, tracer, metrics);
   }
 }

vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionFactory.java

@@ -31,7 +31,7 @@
 import static io.vertx.oracleclient.impl.Helper.executeBlocking;
 import static io.vertx.oracleclient.impl.OracleDatabaseHelper.createDataSource;
 
-public class OracleConnectionFactory implements ConnectionFactory {
+public class OracleConnectionFactory implements ConnectionFactory<OracleConnectOptions> {
 
   private final Supplier<OracleConnectOptions> options;
   private final Map<JsonObject, OracleDataSource> datasources;
@@ -65,15 +65,14 @@ private OracleDataSource getDatasource(SqlConnectOptions options) {
   }
 
   @Override
-  public Future<SqlConnection> connect(Context context, SqlConnectOptions options) {
+  public Future<SqlConnection> connect(Context context, OracleConnectOptions options) {
     OracleDataSource datasource = getDatasource(options);
-    OracleConnectOptions oracleOptions = (OracleConnectOptions) options;
     ContextInternal ctx = (ContextInternal) context;
     QueryTracer tracer = ctx.tracer() == null ? null : new QueryTracer(ctx.tracer(), options);
     return executeBlocking(context, () -> {
       OracleConnection orac = datasource.createConnectionBuilder().build();
       OracleMetadata metadata = new OracleMetadata(orac.getMetaData());
-      OracleJdbcConnection conn = new OracleJdbcConnection(ctx, oracleOptions, orac, metadata);
+      OracleJdbcConnection conn = new OracleJdbcConnection(ctx, options, orac, metadata);
       OracleConnectionImpl msConn = new OracleConnectionImpl(ctx, this, conn, tracer, null);
       conn.init(msConn);
       return msConn;