Merge pull request #618 from aguibert/driver-service-master

Driver service for generic API entry point

Author: aguibert

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

@@ -59,7 +59,7 @@ public static DB2ConnectOptions fromUri(String connectionUri) throws IllegalArgu
         DEFAULT_CONNECTION_ATTRIBUTES = Collections.unmodifiableMap(defaultAttributes);
     }
 
-    private int pipeliningLimit;
+    private int pipeliningLimit = DEFAULT_PIPELINING_LIMIT;
 
     public DB2ConnectOptions() {
         super();
@@ -74,6 +74,14 @@ public DB2ConnectOptions(JsonObject json) {
         super(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);
@@ -170,7 +178,6 @@ public DB2ConnectOptions addProperty(String key, String value) {
     protected void init() {
         this.setHost(DEFAULT_HOST);
         this.setPort(DEFAULT_PORT);
-        this.setPipeliningLimit(DEFAULT_PIPELINING_LIMIT);
         this.setProperties(new HashMap<>(DEFAULT_CONNECTION_ATTRIBUTES));
     }
 

vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.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.db2client.spi;
+
+import io.vertx.core.Vertx;
+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(wrap(options), poolOptions);
+  }
+
+  @Override
+  public Pool createPool(Vertx vertx, SqlConnectOptions options, PoolOptions 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.spi.Driver

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

vertx-db2-client/src/test/java/io/vertx/db2client/tck/DB2DriverTest.java

@@ -0,0 +1,49 @@
+/*
+ * 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.db2client.tck;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+
+import io.vertx.db2client.junit.DB2Resource;
+import io.vertx.ext.unit.TestContext;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import io.vertx.sqlclient.SqlConnectOptions;
+import io.vertx.sqlclient.tck.DriverTestBase;
+
+@RunWith(VertxUnitRunner.class)
+public class DB2DriverTest extends DriverTestBase {
+  @ClassRule
+  public static DB2Resource rule = DB2Resource.SHARED_INSTANCE;
+  
+  @Rule
+  public TestName testName = new TestName();
+
+  @Before
+  public void printTestName(TestContext ctx) throws Exception {
+      System.out.println(">>> BEGIN " + getClass().getSimpleName() + "." + testName.getMethodName());
+  }
+
+  @Override
+  protected SqlConnectOptions defaultOptions() {
+    return rule.options();
+  }
+
+}

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

@@ -58,6 +58,10 @@ public MSSQLConnectOptions(JsonObject json) {
     super(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

@@ -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/resources/META-INF/services/io.vertx.sqlclient.spi.Driver

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

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/tck/MSSQLDriverTest.java

@@ -0,0 +1,37 @@
+/*
+ * 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.tck;
+
+import io.vertx.sqlclient.SqlConnectOptions;
+import io.vertx.sqlclient.tck.DriverTestBase;
+import io.vertx.ext.unit.junit.VertxUnitRunner;
+import io.vertx.mssqlclient.junit.MSSQLRule;
+
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+
+@RunWith(VertxUnitRunner.class)
+public class MSSQLDriverTest extends DriverTestBase {
+  @ClassRule
+  public static MSSQLRule rule = MSSQLRule.SHARED_INSTANCE;
+
+  @Override
+  protected SqlConnectOptions defaultOptions() {
+    return rule.options();
+  }
+
+}

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

@@ -60,39 +60,37 @@ public static MySQLConnectOptions fromUri(String connectionUri) throws IllegalAr
   }
 
   private String collation;
-  private String charset;
-  private Boolean useAffectedRows;
-  private SslMode sslMode;
+  private String charset = DEFAULT_CHARSET;
+  private Boolean useAffectedRows = DEFAULT_USE_AFFECTED_ROWS;
+  private SslMode sslMode = DEFAULT_SSL_MODE;
   private String serverRsaPublicKeyPath;
   private Buffer serverRsaPublicKeyValue;
-  private String characterEncoding;
+  private String characterEncoding = DEFAULT_CHARACTER_ENCODING;
 
   public MySQLConnectOptions() {
     super();
-    this.charset = DEFAULT_CHARSET;
-    this.sslMode = DEFAULT_SSL_MODE;
-    this.useAffectedRows = DEFAULT_USE_AFFECTED_ROWS;
-    this.characterEncoding = DEFAULT_CHARACTER_ENCODING;
   }
 
   public MySQLConnectOptions(JsonObject json) {
     super(json);
-    this.charset = DEFAULT_CHARSET;
-    this.sslMode = DEFAULT_SSL_MODE;
-    this.useAffectedRows = DEFAULT_USE_AFFECTED_ROWS;
-    this.characterEncoding = DEFAULT_CHARACTER_ENCODING;
     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;
-    this.charset = other.charset;
-    this.useAffectedRows = other.useAffectedRows;
-    this.sslMode = other.sslMode;
     this.serverRsaPublicKeyPath = other.serverRsaPublicKeyPath;
     this.serverRsaPublicKeyValue = other.serverRsaPublicKeyValue != null ? other.serverRsaPublicKeyValue.copy() : null;
-    this.characterEncoding = other.characterEncoding;
   }
 
   /**

vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.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);
+    }
+  }
+
+}