Various cleanups/renames

Author: vietj

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

@@ -23,19 +23,18 @@
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 import java.time.temporal.Temporal;
-import java.util.List;
 import java.util.UUID;
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.db2client.impl.drda.DB2RowId;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.impl.RowBase;
-import io.vertx.sqlclient.internal.RowDesc;
+import io.vertx.sqlclient.internal.RowDescriptor;
 
-public class DB2RowImpl extends RowBase {
+public class DB2Row extends RowBase {
 
-  public DB2RowImpl(RowDesc rowDesc) {
-    super(rowDesc);
+  public DB2Row(RowDescriptor rowDescriptor) {
+    super(rowDescriptor);
   }
 
   @Override

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

@@ -21,7 +21,7 @@
 import io.vertx.db2client.impl.drda.ColumnMetaData;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.impl.ErrorMessageFactory;
-import io.vertx.sqlclient.internal.TupleInternal;
+import io.vertx.sqlclient.internal.TupleBase;
 
 class DB2ParamDesc {
 
@@ -35,7 +35,7 @@ ColumnMetaData paramDefinitions() {
     return paramDefinitions;
   }
 
-  public TupleInternal prepare(TupleInternal values) {
+  public TupleBase prepare(TupleBase values) {
     if (values.size() != paramDefinitions.columns_) {
       throw new VertxException(ErrorMessageFactory.buildWhenArgumentsLengthNotMatched(paramDefinitions.columns_, values.size()), true);
     }

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

@@ -24,16 +24,16 @@
 import io.vertx.db2client.impl.drda.Cursor;
 import io.vertx.db2client.impl.drda.Section;
 import io.vertx.sqlclient.internal.PreparedStatement;
-import io.vertx.sqlclient.internal.RowDesc;
-import io.vertx.sqlclient.internal.TupleInternal;
+import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.TupleBase;
 
 public class DB2PreparedStatement implements PreparedStatement {
 
   private static final Logger LOG = LoggerFactory.getLogger(DB2PreparedStatement.class);
 
   final String sql;
   final DB2ParamDesc paramDesc;
-  final DB2RowDesc rowDesc;
+  final DB2RowDescriptor rowDesc;
   final Section section;
 
   private final Map<String, QueryInstance> activeQueries = new ConcurrentHashMap<>(4);
@@ -50,15 +50,15 @@ public static class QueryInstance {
     }
   }
 
-  DB2PreparedStatement(String sql, DB2ParamDesc paramDesc, DB2RowDesc rowDesc, Section section) {
+  DB2PreparedStatement(String sql, DB2ParamDesc paramDesc, DB2RowDescriptor rowDesc, Section section) {
     this.paramDesc = paramDesc;
     this.rowDesc = rowDesc;
     this.sql = sql;
     this.section = section;
   }
 
   @Override
-  public RowDesc rowDesc() {
+  public RowDescriptor rowDesc() {
     return rowDesc;
   }
 
@@ -68,7 +68,7 @@ public String sql() {
   }
 
   @Override
-  public TupleInternal prepare(TupleInternal values) {
+  public TupleBase prepare(TupleBase values) {
     return paramDesc.prepare(values);
   }
 

vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2RowDesc.java renamed to vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2RowDescriptor.java

@@ -16,16 +16,16 @@
 package io.vertx.db2client.impl.codec;
 
 import io.vertx.db2client.impl.drda.ColumnMetaData;
-import io.vertx.sqlclient.internal.RowDesc;
+import io.vertx.sqlclient.internal.RowDescriptor;
 
 import java.sql.JDBCType;
 import java.util.List;
 
-class DB2RowDesc extends RowDesc {
+class DB2RowDescriptor extends RowDescriptor {
 
   private final ColumnMetaData columnMetaData;
 
-  private DB2RowDesc(DB2ColumnDesc[] columnDescs, ColumnMetaData columnMetaData) {
+  private DB2RowDescriptor(DB2ColumnDesc[] columnDescs, ColumnMetaData columnMetaData) {
     super(columnDescs);
     this.columnMetaData = columnMetaData;
   }
@@ -34,13 +34,13 @@ ColumnMetaData columnDefinitions() {
     return columnMetaData;
   }
 
-  static DB2RowDesc create(ColumnMetaData md) {
+  static DB2RowDescriptor create(ColumnMetaData md) {
     List<String> names = md.getColumnNames();
     List<JDBCType> types = md.getJdbcTypes();
     DB2ColumnDesc[] columns = new DB2ColumnDesc[names.size()];
     for (int i = 0; i < columns.length; i++) {
       columns[i] = new DB2ColumnDesc(names.get(i), types.get(i));
     }
-    return new DB2RowDesc(columns, md);
+    return new DB2RowDescriptor(columns, md);
   }
 }

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

@@ -27,15 +27,15 @@
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
 import io.vertx.sqlclient.Tuple;
-import io.vertx.sqlclient.internal.TupleInternal;
+import io.vertx.sqlclient.internal.TupleBase;
 import io.vertx.sqlclient.codec.CommandResponse;
 import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
 
 public class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
 
   private static final Logger LOG = LoggerFactory.getLogger(ExtendedBatchQueryCommandCodec.class);
 
-  private final List<TupleInternal> params;
+  private final List<TupleBase> params;
   private final List<QueryInstance> queryInstances;
   private final String baseCursorId;
 

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

@@ -72,7 +72,7 @@ RowResultDecoder<?, R> decodePreparedQuery(ByteBuf payload, DRDAQueryResponse re
     if (queryInstance.cursor == null) {
       resp.setOutputColumnMetaData(columnDefinitions);
       resp.readBeginOpenQuery();
-      decoder = new RowResultDecoder<>(cmd.collector(), DB2RowDesc.create(columnDefinitions), resp.getCursor(), resp);
+      decoder = new RowResultDecoder<>(cmd.collector(), DB2RowDescriptor.create(columnDefinitions), resp.getCursor(), resp);
       queryInstance.cursor = resp.getCursor();
       queryInstance.queryInstanceId = resp.getQueryInstanceId();
     } else {

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

@@ -89,7 +89,7 @@ void decodePayload(ByteBuf payload, int payloadLength) {
 
   private void handleReadyForQuery() {
     completionHandler.handle(CommandResponse.success(new DB2PreparedStatement(cmd.sql(), new DB2ParamDesc(paramDesc),
-      DB2RowDesc.create(rowDesc), section)));
+      DB2RowDescriptor.create(rowDesc), section)));
   }
 
   private void resetIntermediaryResult() {

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

@@ -18,7 +18,7 @@
 import io.netty.buffer.ByteBuf;
 import io.vertx.db2client.impl.drda.ColumnMetaData;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
-import io.vertx.sqlclient.internal.RowDesc;
+import io.vertx.sqlclient.internal.RowDescriptor;
 import io.vertx.sqlclient.spi.protocol.QueryCommandBase;
 
 abstract class QueryCommandBaseCodec<T, C extends QueryCommandBase<T>> extends CommandCodec<Boolean, C> {
@@ -79,11 +79,11 @@ void decodePayload(ByteBuf payload, int payloadLength) {
   void handleQueryResult(RowResultDecoder<?, T> decoder) {
     Throwable failure = decoder.complete();
     T result = decoder.result();
-    RowDesc rowDesc = decoder.rowDesc;
+    RowDescriptor rowDescriptor = decoder.rowDesc;
     int size = decoder.size();
     int updatedCount = decoder.size();
     decoder.reset();
-    cmd.resultHandler().handleResult(updatedCount, size, rowDesc, result, failure);
+    cmd.resultHandler().handleResult(updatedCount, size, rowDescriptor, result, failure);
   }
 
 }

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

@@ -21,7 +21,7 @@
 import io.netty.buffer.ByteBuf;
 import io.vertx.core.internal.logging.Logger;
 import io.vertx.core.internal.logging.LoggerFactory;
-import io.vertx.db2client.impl.DB2RowImpl;
+import io.vertx.db2client.impl.DB2Row;
 import io.vertx.db2client.impl.drda.Cursor;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
 import io.vertx.sqlclient.Row;
@@ -33,11 +33,11 @@ class RowResultDecoder<C, R> extends RowDecoder<C, R> {
 
   private static final Logger LOG = LoggerFactory.getLogger(RowResultDecoder.class);
 
-  final DB2RowDesc rowDesc;
+  final DB2RowDescriptor rowDesc;
   final Cursor cursor;
   final DRDAQueryResponse response;
 
-  RowResultDecoder(Collector<Row, C, R> collector, DB2RowDesc rowDesc, Cursor cursor, DRDAQueryResponse resp) {
+  RowResultDecoder(Collector<Row, C, R> collector, DB2RowDescriptor rowDesc, Cursor cursor, DRDAQueryResponse resp) {
     super(collector);
     this.rowDesc = rowDesc;
     this.cursor = cursor;
@@ -55,7 +55,7 @@ public boolean next() {
 
   @Override
   protected RowInternal row() {
-    return new DB2RowImpl(rowDesc);
+    return new DB2Row(rowDesc);
   }
 
   @Override

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

@@ -75,7 +75,7 @@ void decodeQuery(ByteBuf payload) {
     resp.readPrepareDescribeOutput();
     resp.readBeginOpenQuery();
     columnDefinitions = resp.getOutputColumnMetaData();
-    RowResultDecoder<?, T> decoder = new RowResultDecoder<>(cmd.collector(), DB2RowDesc.create(columnDefinitions), resp.getCursor(), resp);
+    RowResultDecoder<?, T> decoder = new RowResultDecoder<>(cmd.collector(), DB2RowDescriptor.create(columnDefinitions), resp.getCursor(), resp);
 
     while (decoder.next()) {
       decoder.handleRow(columnDefinitions.columns_, payload);