Rename GenericDriver to DriverBase

Author: vietj

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

@@ -33,19 +33,18 @@
 import io.vertx.sqlclient.impl.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.connection.ConnectionFactory;
-import io.vertx.sqlclient.spi.GenericDriver;
+import io.vertx.sqlclient.spi.DriverBase;
 
 import java.util.function.Supplier;
 
-public class DB2Driver extends GenericDriver<DB2ConnectOptions> {
+public class DB2Driver extends DriverBase<DB2ConnectOptions> {
 
   private static final String DISCRIMINANT = "db2client";
 
   public static final DB2Driver INSTANCE = new DB2Driver();
 
-  @Override
-  protected String discriminant() {
-    return DISCRIMINANT;
+  public DB2Driver() {
+    super(DISCRIMINANT);
   }
 
   @Override

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

@@ -28,17 +28,16 @@
 import io.vertx.sqlclient.spi.connection.Connection;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.connection.ConnectionFactory;
-import io.vertx.sqlclient.spi.GenericDriver;
+import io.vertx.sqlclient.spi.DriverBase;
 
-public class MSSQLDriver extends GenericDriver<MSSQLConnectOptions> {
+public class MSSQLDriver extends DriverBase<MSSQLConnectOptions> {
 
   private static final String DISCRIMINANT = "mssqlclient";
 
   public static final MSSQLDriver INSTANCE = new MSSQLDriver();
 
-  @Override
-  protected String discriminant() {
-    return DISCRIMINANT;
+  public MSSQLDriver() {
+    super(DISCRIMINANT);
   }
 
   @Override

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

@@ -33,19 +33,18 @@
 import io.vertx.sqlclient.impl.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.connection.ConnectionFactory;
-import io.vertx.sqlclient.spi.GenericDriver;
+import io.vertx.sqlclient.spi.DriverBase;
 
 import java.util.function.Supplier;
 
-public class MySQLDriver extends GenericDriver<MySQLConnectOptions> {
+public class MySQLDriver extends DriverBase<MySQLConnectOptions> {
 
   private static final String DISCRIMINANT = "mysqlclient";
 
   public static final MySQLDriver INSTANCE = new MySQLDriver();
 
-  @Override
-  protected String discriminant() {
-    return DISCRIMINANT;
+  public MySQLDriver() {
+    super(DISCRIMINANT);
   }
 
   @Override

vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java

@@ -22,11 +22,11 @@
 import io.vertx.sqlclient.spi.connection.Connection;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.connection.ConnectionFactory;
-import io.vertx.sqlclient.spi.GenericDriver;
+import io.vertx.sqlclient.spi.DriverBase;
 
 import java.util.function.Function;
 
-public class OracleDriver extends GenericDriver<OracleConnectOptions> {
+public class OracleDriver extends DriverBase<OracleConnectOptions> {
 
   private static final String DISCRIMINANT = "oracleclient";
 
@@ -36,12 +36,7 @@ public class OracleDriver extends GenericDriver<OracleConnectOptions> {
   public static final OracleDriver INSTANCE = new OracleDriver();
 
   public OracleDriver() {
-    super(AFTER_ACQUIRE, BEFORE_RECYCLE);
-  }
-
-  @Override
-  protected String discriminant() {
-    return DISCRIMINANT;
+    super(DISCRIMINANT, AFTER_ACQUIRE, BEFORE_RECYCLE);
   }
 
   @Override

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

@@ -21,19 +21,18 @@
 import io.vertx.sqlclient.impl.pool.PoolImpl;
 import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.connection.ConnectionFactory;
-import io.vertx.sqlclient.spi.GenericDriver;
+import io.vertx.sqlclient.spi.DriverBase;
 
 import java.util.function.Supplier;
 
-public class PgDriver extends GenericDriver<PgConnectOptions> {
+public class PgDriver extends DriverBase<PgConnectOptions> {
 
   private static final String DISCRIMINANT = "pgclient";
 
   public static final PgDriver INSTANCE = new PgDriver();
 
-  @Override
-  protected String discriminant() {
-    return DISCRIMINANT;
+  public PgDriver() {
+    super(DISCRIMINANT);
   }
 
   @Override

vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/GenericDriver.java renamed to vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/DriverBase.java

@@ -21,25 +21,29 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-public abstract class GenericDriver<O extends SqlConnectOptions> implements Driver<O> {
+/**
+ * A generic driver.
+ * @param <O>
+ */
+public abstract class DriverBase<O extends SqlConnectOptions> implements Driver<O> {
 
   private static final String SHARED_CLIENT_KEY_PREFIX = "__vertx.shared.";
 
-  private final String sharedClientKey = SHARED_CLIENT_KEY_PREFIX + "." + discriminant();
-
-  protected abstract String discriminant();
 
+  private final String discriminant;
+  private final String sharedClientKey;
   private final Function<Connection, Future<Void>> afterAcquire;
   private final Function<Connection, Future<Void>> beforeRecycle;
 
-  public GenericDriver() {
-    this.afterAcquire = null;
-    this.beforeRecycle = null;
+  public DriverBase(String discriminant) {
+    this(discriminant, null, null);
   }
 
-  public GenericDriver(Function<Connection, Future<Void>> afterAcquire, Function<Connection, Future<Void>> beforeRecycle) {
+  public DriverBase(String discriminant, Function<Connection, Future<Void>> afterAcquire, Function<Connection, Future<Void>> beforeRecycle) {
     this.afterAcquire = afterAcquire;
     this.beforeRecycle = beforeRecycle;
+    this.discriminant = discriminant;
+    this.sharedClientKey = SHARED_CLIENT_KEY_PREFIX + "." + discriminant;
   }
 
   /**

vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/connection/package-info.java

@@ -13,6 +13,6 @@
 /**
  * <p>The Connection Service Provider Interface (SPI).</p>
  *
- * <p>This SPI is the contract between a {@link io.vertx.sqlclient.spi.GenericDriver} and a database backend.</p>
+ * <p>This SPI is the contract between a {@link io.vertx.sqlclient.spi.DriverBase} and a database backend.</p>
  */
 package io.vertx.sqlclient.spi.connection;

vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/spi/backend/GenericDriverTest.java renamed to vertx-sql-client/src/test/java/io/vertx/tests/sqlclient/spi/backend/DriverBaseTest.java

@@ -24,7 +24,7 @@
 import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
 import io.vertx.sqlclient.spi.connection.ConnectionFactory;
 import io.vertx.sqlclient.spi.DatabaseMetadata;
-import io.vertx.sqlclient.spi.GenericDriver;
+import io.vertx.sqlclient.spi.DriverBase;
 import org.junit.Test;
 
 import java.sql.JDBCType;
@@ -33,7 +33,7 @@
 
 import static org.junit.Assert.*;
 
-public class GenericDriverTest {
+public class DriverBaseTest {
 
   private static class VarcharColumnDescriptor implements ColumnDescriptor {
 
@@ -64,11 +64,7 @@ public JDBCType jdbcType() {
   @Test
   public void testSimple() {
 
-    GenericDriver<SqlConnectOptions> driver = new GenericDriver<SqlConnectOptions>() {
-      @Override
-      protected String discriminant() {
-        return "generic";
-      }
+    DriverBase<SqlConnectOptions> driver = new DriverBase<SqlConnectOptions>("generic") {
       @Override
       public ConnectionFactory<SqlConnectOptions> createConnectionFactory(Vertx vertx, NetClientOptions transportOptions) {
         return new ConnectionFactory<>() {