Make SqlConnectOptions abstract again so that Driver#createConnectOpt…

…ions is the only generic path

vertx-db2-client/src/main/java/io/vertx/db2client/DB2ConnectOptions.java

@@ -76,14 +76,6 @@ public DB2ConnectOptions(JsonObject json) {
     DB2ConnectOptionsConverter.fromJson(json, this);
   }
 
-  public DB2ConnectOptions(SqlConnectOptions other) {
-    super(other);
-    if (other instanceof DB2ConnectOptions) {
-      DB2ConnectOptions opts = (DB2ConnectOptions) other;
-      this.pipeliningLimit = opts.pipeliningLimit;
-    }
-  }
-
   public DB2ConnectOptions(DB2ConnectOptions other) {
     super(other);
     this.pipeliningLimit = other.pipeliningLimit;

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

@@ -38,8 +38,6 @@ public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolO
   private static DB2ConnectOptions wrap(SqlConnectOptions options) {
     if (options instanceof DB2ConnectOptions) {
       return (DB2ConnectOptions) options;
-    } else if (options.getClass().equals(SqlConnectOptions.class)) {
-      return new DB2ConnectOptions(options);
     } else {
       throw new IllegalArgumentException("Unsupported option type: " + options.getClass());
     }

vertx-mssql-client/src/main/java/io/vertx/mssqlclient/MSSQLConnectOptions.java

@@ -61,10 +61,6 @@ public MSSQLConnectOptions(JsonObject json) {
     MSSQLConnectOptionsConverter.fromJson(json, this);
   }
 
-  public MSSQLConnectOptions(SqlConnectOptions other) {
-    super(other);
-  }
-
   public MSSQLConnectOptions(MSSQLConnectOptions other) {
     super(other);
   }

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

@@ -38,8 +38,6 @@ public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolO
   private static MSSQLConnectOptions wrap(SqlConnectOptions options) {
     if (options instanceof MSSQLConnectOptions) {
       return (MSSQLConnectOptions) options; 
-    } else if (SqlConnectOptions.class.equals(options.getClass())) {
-      return new MSSQLConnectOptions(options);
     } else {
       throw new IllegalArgumentException("Unsupported option type: " + options.getClass());
     }

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/MySQLConnectOptions.java

@@ -76,16 +76,6 @@ public MySQLConnectOptions(JsonObject json) {
     MySQLConnectOptionsConverter.fromJson(json, this);
   }
 
-  public MySQLConnectOptions(SqlConnectOptions other) {
-    super(other);
-    if (other instanceof MySQLConnectOptions) {
-      MySQLConnectOptions opts = (MySQLConnectOptions) other;
-      this.collation = opts.collation;
-      this.serverRsaPublicKeyPath = opts.serverRsaPublicKeyPath;
-      this.serverRsaPublicKeyValue = opts.serverRsaPublicKeyValue != null ? opts.serverRsaPublicKeyValue.copy() : null;
-    }
-  }
-
   public MySQLConnectOptions(MySQLConnectOptions other) {
     super(other);
     this.collation = other.collation;

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

@@ -38,8 +38,6 @@ public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolO
   private static MySQLConnectOptions wrap(SqlConnectOptions options) {
     if (options instanceof MySQLConnectOptions) {
       return (MySQLConnectOptions) options;
-    } else if (options.getClass().equals(SqlConnectOptions.class)) {
-      return new MySQLConnectOptions(options);
     } else {
       throw new IllegalArgumentException("Unsupported option type: " + options.getClass());
     }

vertx-pg-client/src/main/java/io/vertx/pgclient/PgConnectOptions.java

@@ -121,15 +121,6 @@ public PgConnectOptions(JsonObject json) {
     PgConnectOptionsConverter.fromJson(json, this);
   }
 
-  public PgConnectOptions(SqlConnectOptions other) {
-    super(other);
-    if (other instanceof PgConnectOptions) {
-      PgConnectOptions opts = (PgConnectOptions) other;
-      pipeliningLimit = opts.pipeliningLimit;
-      sslMode = opts.sslMode;
-    }
-  }
-
   public PgConnectOptions(PgConnectOptions other) {
     super(other);
     pipeliningLimit = other.pipeliningLimit;

vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java

@@ -23,8 +23,6 @@ public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolO
   private static PgConnectOptions wrap(SqlConnectOptions options) {
     if (options instanceof PgConnectOptions) {
       return (PgConnectOptions) options;
-    } else if (options.getClass().equals(SqlConnectOptions.class)) {
-      return new PgConnectOptions(options);
     } else {
       throw new IllegalArgumentException("Unsupported option type: " + options.getClass());
     }

vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java

@@ -22,6 +22,7 @@
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 
+import io.vertx.codegen.annotations.GenIgnore;
 import io.vertx.codegen.annotations.VertxGen;
 import io.vertx.core.AsyncResult;
 import io.vertx.core.Future;
@@ -46,6 +47,7 @@ public interface Pool extends SqlClient {
    * @return the connection pool
    * @throws ServiceConfigurationError if no compatible drivers are found, or if multiple compatible drivers are found
    */
+  @GenIgnore
   static Pool pool(SqlConnectOptions connectOptions) {
     return pool(connectOptions, new PoolOptions());
   }
@@ -58,6 +60,7 @@ static Pool pool(SqlConnectOptions connectOptions) {
    * @return the connection pool
    * @throws ServiceConfigurationError if no compatible drivers are found, or if multiple compatible drivers are found
    */
+  @GenIgnore
   static Pool pool(SqlConnectOptions connectOptions, PoolOptions poolOptions) {
     List<Driver> candidates = new ArrayList<>(1);
     for (Driver d : ServiceLoader.load(Driver.class)) {
@@ -83,6 +86,7 @@ static Pool pool(SqlConnectOptions connectOptions, PoolOptions poolOptions) {
    * @return the connection pool
    * @throws ServiceConfigurationError if no compatible drivers are found, or if multiple compatible drivers are found
    */
+  @GenIgnore
   static Pool pool(Vertx vertx, SqlConnectOptions connectOptions, PoolOptions poolOptions) {
     List<Driver> candidates = new ArrayList<>(1);
     for (Driver d : ServiceLoader.load(Driver.class)) {

vertx-sql-client/src/main/java/io/vertx/sqlclient/SqlConnectOptions.java

@@ -25,7 +25,7 @@
  * Connect options for configuring {@link SqlConnection} or {@link Pool}.
  */
 @DataObject(generateConverter = true)
-public class SqlConnectOptions extends NetClientOptions {
+public abstract class SqlConnectOptions extends NetClientOptions {
 
   public static final boolean DEFAULT_CACHE_PREPARED_STATEMENTS = false;
   public static final int DEFAULT_PREPARED_STATEMENT_CACHE_MAX_SIZE = 256;
@@ -41,32 +41,17 @@ public class SqlConnectOptions extends NetClientOptions {
   private int preparedStatementCacheSqlLimit = DEFAULT_PREPARED_STATEMENT_CACHE_SQL_LIMIT;
   private Map<String, String> properties = new HashMap<>(4);
 
-  /**
-   * @deprecated This constructor will be removed in the next release.
-   * Instead, use {@link Driver#createConnectOptions()}
-   */
-  @Deprecated
   public SqlConnectOptions() {
     super();
     init();
   }
 
-  /**
-   * @deprecated This constructor will be removed in the next release.
-   * Instead, use {@link Driver#createConnectOptions()}
-   */
-  @Deprecated
   public SqlConnectOptions(JsonObject json) {
     super(json);
     init();
     SqlConnectOptionsConverter.fromJson(json, this);
   }
 
-  /**
-   * @deprecated This constructor will be removed in the next release.
-   * Instead, use {@link Driver#createConnectOptions()}
-   */
-  @Deprecated
   public SqlConnectOptions(SqlConnectOptions other) {
     super(other);
     this.host = other.host;
@@ -294,8 +279,7 @@ public JsonObject toJson() {
   /**
    * Initialize with the default options.
    */
-  protected void init() {
-  }
+  protected abstract void init();
 
   @Override
   public boolean equals(Object obj) {

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

@@ -133,8 +133,7 @@ default Pool createPool(SqlConnectOptions connectOptions) {
    * @return true if the driver accepts the {@code connectOptions}, false otherwise
    */
   default boolean acceptsOptions(SqlConnectOptions connectOptions) {
-    return createConnectOptions().getClass().isAssignableFrom(connectOptions.getClass()) ||
-        SqlConnectOptions.class.equals(connectOptions.getClass());
+    return createConnectOptions().getClass().isAssignableFrom(connectOptions.getClass());
   }
 
   /**

vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/DriverTestBase.java

@@ -138,6 +138,9 @@ public void testRejectCreatePool03(TestContext ctx) {
   }
 
   public static class BogusOptions extends SqlConnectOptions {
+    @Override
+    protected void init() {
+    }
   }
 
   private Driver getDriver() {