Make RowBase and RowDesc usable without creating subclasses.

Motivation:

RowBase is abstract and does not implement a couple of methods from its contract, such implementation actually relies on a description field present in each of its subclasses. Instead we can have RowBase carry the description field and implement those methods, as consequence RowBase can be reused as such and does not need to be abstract.

RowDesc is simply abstract but is usable out of the box, just make it not abstract so it can be instantiated right away.

Author: vietj

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

@@ -34,11 +34,8 @@
 
 public class DB2RowImpl extends RowBase {
 
-  private final RowDesc rowDesc;
-
   public DB2RowImpl(RowDesc rowDesc) {
-    super(rowDesc.columnNames().size());
-    this.rowDesc = rowDesc;
+    super(rowDesc);
   }
 
   @Override
@@ -82,23 +79,14 @@ public <T> T get(Class<T> type, int position) {
     }
   }
 
-  @Override
-  public String getColumnName(int pos) {
-    List<String> columnNames = rowDesc.columnNames();
-    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
-  }
-
   @Override
   public int getColumnIndex(String name) {
-    if (name == null) {
-      throw new NullPointerException();
-    }
-    int idx = rowDesc.columnIndex(name);
+    int idx = super.getColumnIndex(name);
     if (idx >= 0) {
       return idx;
     }
     // Unless the column is renamed in the SQL query, the column name will be uppercase
-    return rowDesc.columnIndex(name.toUpperCase());
+    return super.getColumnIndex(name.toUpperCase());
   }
 
   @Override

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

@@ -25,25 +25,9 @@
 import java.util.UUID;
 
 public class MSSQLRowImpl extends RowBase {
-  private final RowDesc rowDesc;
 
   public MSSQLRowImpl(RowDesc rowDesc) {
-    super(rowDesc.columnNames().size());
-    this.rowDesc = rowDesc;
-  }
-
-  @Override
-  public String getColumnName(int pos) {
-    List<String> columnNames = rowDesc.columnNames();
-    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
-  }
-
-  @Override
-  public int getColumnIndex(String column) {
-    if (column == null) {
-      throw new IllegalArgumentException("Column name can not be null");
-    }
-    return rowDesc.columnNames().indexOf(column);
+    super(rowDesc);
   }
 
   @Override

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

@@ -28,11 +28,8 @@
 
 public class MySQLRowImpl extends RowBase {
 
-  private final MySQLRowDesc rowDesc;
-
   public MySQLRowImpl(MySQLRowDesc rowDesc) {
-    super(rowDesc.columnNames().size());
-    this.rowDesc = rowDesc;
+    super(rowDesc);
   }
 
   @Override
@@ -92,20 +89,6 @@ public <T> T get(Class<T> type, int position) {
     }
   }
 
-  @Override
-  public String getColumnName(int pos) {
-    List<String> columnNames = rowDesc.columnNames();
-    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
-  }
-
-  @Override
-  public int getColumnIndex(String name) {
-    if (name == null) {
-      throw new NullPointerException();
-    }
-    return rowDesc.columnNames().indexOf(name);
-  }
-
   @Override
   public Temporal getTemporal(int pos) {
     throw new UnsupportedOperationException(buildIllegalAccessMessage(getValue(pos), getColumnName(pos), Temporal.class));
@@ -241,7 +224,7 @@ private GeometryCollection getGeometryCollection(int pos) {
 
   @Override
   public LocalTime getLocalTime(int pos) {
-    ColumnDefinition columnDefinition = rowDesc.get(pos);
+    ColumnDefinition columnDefinition = ((MySQLRowDesc)desc).get(pos);
     Object val = getValue(pos);
     if (columnDefinition.type() == DataType.TIME && val instanceof Duration) {
       // map MySQL TIME data type to java.time.LocalTime

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

@@ -18,35 +18,24 @@
 import io.vertx.sqlclient.internal.RowDesc;
 
 import java.time.*;
-import java.util.List;
 import java.util.UUID;
 
 public class OracleRow extends RowBase {
 
-  private final RowDesc desc;
-
   public OracleRow(RowDesc desc) {
-    super(desc.columnNames().size());
-    this.desc = desc;
+    super(desc);
   }
 
   public OracleRow(OracleRow row) {
-    super(row);
-    this.desc = row.desc;
-  }
-
-  @Override
-  public String getColumnName(int pos) {
-    List<String> columnNames = desc.columnNames();
-    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
+    super(row.desc, row);
   }
 
   @Override
   public int getColumnIndex(String name) {
     if (name == null) {
       throw new NullPointerException();
     }
-    return desc.columnNames().indexOf(name.toUpperCase());
+    return super.getColumnIndex(name.toUpperCase());
   }
 
   @Override

vertx-pg-client/src/main/java/io/vertx/pgclient/impl/RowImpl.java

@@ -33,30 +33,12 @@
 
 public class RowImpl extends RowBase {
 
-  private final RowDesc desc;
-
   public RowImpl(RowDesc desc) {
-    super(desc.columnNames().size());
-    this.desc = desc;
+    super(desc);
   }
 
   public RowImpl(RowImpl row) {
-    super(row);
-    this.desc = row.desc;
-  }
-
-  @Override
-  public String getColumnName(int pos) {
-    List<String> columnNames = desc.columnNames();
-    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
-  }
-
-  @Override
-  public int getColumnIndex(String name) {
-    if (name == null) {
-      throw new NullPointerException();
-    }
-    return desc.columnNames().indexOf(name);
+    super(row.desc, row);
   }
 
   @Override

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowBase.java

@@ -2,27 +2,50 @@
 
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.internal.ArrayTuple;
+import io.vertx.sqlclient.internal.RowDesc;
 import io.vertx.sqlclient.internal.RowInternal;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * Base class for rows.
  */
-public abstract class RowBase extends ArrayTuple implements RowInternal {
+public class RowBase extends ArrayTuple implements RowInternal {
 
   private boolean released;
+  protected final RowDesc desc;
 
-  public RowBase(int len) {
-    super(len);
+  public RowBase(RowDesc desc) {
+    super(desc.columnNames().size());
+
+    this.desc = desc;
   }
 
-  public RowBase(Collection<?> c) {
+  public RowBase(RowDesc desc, Collection<?> c) {
     super(c);
+
+    this.desc = desc;
   }
 
-  public RowBase(Tuple tuple) {
+  public RowBase(RowDesc desc, Tuple tuple) {
     super(tuple);
+
+    this.desc = desc;
+  }
+
+  @Override
+  public String getColumnName(int pos) {
+    List<String> columnNames = desc.columnNames();
+    return pos < 0 || columnNames.size() - 1 < pos ? null : columnNames.get(pos);
+  }
+
+  @Override
+  public int getColumnIndex(String name) {
+    if (name == null) {
+      throw new NullPointerException();
+    }
+    return desc.columnIndex(name);
   }
 
   @Override

vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowDesc.java

@@ -26,12 +26,12 @@
 /**
  * @author <a href="mailto:[email protected]">Emad Alblueshi</a>
  */
-public abstract class RowDesc {
+public class RowDesc {
 
   private final ColumnNames columnNames;
   private final ColumnDescriptors columnDescriptors;
 
-  protected RowDesc(ColumnDescriptor[] columnDescriptors) {
+  public RowDesc(ColumnDescriptor[] columnDescriptors) {
     this.columnNames = new ColumnNames(columnDescriptors);
     this.columnDescriptors = new ColumnDescriptors(columnDescriptors);
   }

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

@@ -34,13 +34,6 @@
 
 public class GenericDriverTest {
 
-  private static class GenericRowDesc extends RowDesc {
-    public GenericRowDesc(ColumnDescriptor[] columnDescriptors) {
-      super(columnDescriptors);
-    }
-  }
-
-
   private static class VarcharColumnDescriptor implements ColumnDescriptor {
 
     private final String name;
@@ -67,31 +60,6 @@ public JDBCType jdbcType() {
     }
   }
 
-  private static class GenericRow extends RowBase {
-    public GenericRow() {
-      super(10);
-    }
-    @Override
-    public String getColumnName(int pos) {
-      switch (pos) {
-        case 0:
-          return "value";
-        default:
-          return null;
-      }
-    }
-
-    @Override
-    public int getColumnIndex(String column) {
-      switch (column) {
-        case "value":
-          return 0;
-        default:
-          return -1;
-      }
-    }
-  }
-
   @Test
   public void testSimple() {
 
@@ -171,11 +139,12 @@ private <T, A> void scheduleQueryCommand(SimpleQueryCommand<T> simpleQuery, Comp
                 Collector<Row, A, T> collector = (Collector<Row, A, T>) simpleQuery.collector();
                 A container = collector.supplier().get();
                 BiConsumer<A, Row> accumulator = collector.accumulator();
-                Row row = new GenericRow();
+                RowDesc rowDesc = new RowDesc(new ColumnDescriptor[]{new VarcharColumnDescriptor("value")});
+                Row row = new RowBase(rowDesc);
                 row.addValue("Hello " + simpleQuery.sql());
                 accumulator.accept(container, row);
                 T result = collector.finisher().apply(container);
-                qrh.handleResult(0, 1, new GenericRowDesc(new ColumnDescriptor[] { new VarcharColumnDescriptor("value") })
+                qrh.handleResult(0, 1, rowDesc
                   , result, null);
                 handler.succeed(true);
               }