Review comments for driver service

Author: aguibert

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

@@ -13,29 +13,39 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.vertx.db2client;
+package io.vertx.db2client.spi;
 
 import io.vertx.core.Vertx;
-import io.vertx.sqlclient.Driver;
+import io.vertx.db2client.DB2ConnectOptions;
+import io.vertx.db2client.DB2Pool;
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
+import io.vertx.sqlclient.spi.Driver;
 
 public class DB2Driver implements Driver {
 
   @Override
   public Pool createPool(SqlConnectOptions options, PoolOptions poolOptions) {
-    return DB2Pool.pool(new DB2ConnectOptions(options), poolOptions);
+    return DB2Pool.pool(wrap(options), poolOptions);
   }
 
   @Override
   public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolOptions) {
-    return DB2Pool.pool(vertx, new DB2ConnectOptions(options), poolOptions);
+    return DB2Pool.pool(vertx, wrap(options), poolOptions);
   }
 
   @Override
   public boolean acceptsOptions(SqlConnectOptions options) {
     return options instanceof DB2ConnectOptions || SqlConnectOptions.class.equals(options.getClass());
   }
+  
+  private static DB2ConnectOptions wrap(SqlConnectOptions options) {
+    if (options instanceof DB2ConnectOptions) {
+      return (DB2ConnectOptions) options; 
+    } else {
+      return new DB2ConnectOptions(options);
+    }
+  }
 
 }

vertx-db2-client/src/main/resources/META-INF/services/io.vertx.sqlclient.Driver

@@ -0,0 +1 @@
+io.vertx.db2client.spi.DB2Driver

vertx-db2-client/src/main/resources/META-INF/services/io.vertx.sqlclient.spi.Driver

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vertx.mssqlclient.spi;
+
+import io.vertx.core.Vertx;
+import io.vertx.mssqlclient.MSSQLConnectOptions;
+import io.vertx.mssqlclient.MSSQLPool;
+import io.vertx.sqlclient.Pool;
+import io.vertx.sqlclient.PoolOptions;
+import io.vertx.sqlclient.SqlConnectOptions;
+import io.vertx.sqlclient.spi.Driver;
+
+public class MSSQLDriver implements Driver {
+
+  @Override
+  public Pool createPool(SqlConnectOptions options, PoolOptions poolOptions) {
+    return MSSQLPool.pool(wrap(options), poolOptions);
+  }
+
+  @Override
+  public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolOptions) {
+    return MSSQLPool.pool(vertx, wrap(options), poolOptions);
+  }
+
+  @Override
+  public boolean acceptsOptions(SqlConnectOptions options) {
+    return options instanceof MSSQLConnectOptions || SqlConnectOptions.class.equals(options.getClass());
+  }
+  
+  private static MSSQLConnectOptions wrap(SqlConnectOptions options) {
+    if (options instanceof MSSQLConnectOptions) {
+      return (MSSQLConnectOptions) options; 
+    } else {
+      return new MSSQLConnectOptions(options);
+    }
+  }
+
+}

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

@@ -0,0 +1 @@
+io.vertx.mssqlclient.spi.MSSQLDriver

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 IBM Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.vertx.mysqlclient.spi;
+
+import io.vertx.core.Vertx;
+import io.vertx.mysqlclient.MySQLConnectOptions;
+import io.vertx.mysqlclient.MySQLPool;
+import io.vertx.sqlclient.Pool;
+import io.vertx.sqlclient.PoolOptions;
+import io.vertx.sqlclient.SqlConnectOptions;
+import io.vertx.sqlclient.spi.Driver;
+
+public class MySQLDriver implements Driver {
+
+  @Override
+  public Pool createPool(SqlConnectOptions options, PoolOptions poolOptions) {
+    return MySQLPool.pool(wrap(options), poolOptions);
+  }
+
+  @Override
+  public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions poolOptions) {
+    return MySQLPool.pool(vertx, wrap(options), poolOptions);
+  }
+
+  @Override
+  public boolean acceptsOptions(SqlConnectOptions options) {
+    return options instanceof MySQLConnectOptions || SqlConnectOptions.class.equals(options.getClass());
+  }
+  
+  private static MySQLConnectOptions wrap(SqlConnectOptions options) {
+    if (options instanceof MySQLConnectOptions) {
+      return (MySQLConnectOptions) options; 
+    } else {
+      return new MySQLConnectOptions(options);
+    }
+  }
+
+}