More cleanups, introduced a RowDescriptor interface to expose what is already there on the SqlResult.

Author: vietj

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

@@ -29,11 +29,11 @@
 import io.vertx.db2client.impl.drda.DB2RowId;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.impl.RowBase;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
 public class DB2Row extends RowBase {
 
-  public DB2Row(RowDescriptor rowDescriptor) {
+  public DB2Row(RowDescriptorBase rowDescriptor) {
     super(rowDescriptor);
   }
 

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

@@ -24,7 +24,7 @@
 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.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 import io.vertx.sqlclient.internal.TupleBase;
 
 public class DB2PreparedStatement implements PreparedStatement {
@@ -58,7 +58,7 @@ public static class QueryInstance {
   }
 
   @Override
-  public RowDescriptor rowDesc() {
+  public RowDescriptorBase rowDesc() {
     return rowDesc;
   }
 

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

@@ -16,12 +16,12 @@
 package io.vertx.db2client.impl.codec;
 
 import io.vertx.db2client.impl.drda.ColumnMetaData;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
 import java.sql.JDBCType;
 import java.util.List;
 
-class DB2RowDescriptor extends RowDescriptor {
+class DB2RowDescriptor extends RowDescriptorBase {
 
   private final ColumnMetaData columnMetaData;
 

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.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 import io.vertx.sqlclient.spi.protocol.QueryCommandBase;
 
 abstract class QueryCommandBaseCodec<T, C extends QueryCommandBase<T>> extends CommandCodec<Boolean, C> {
@@ -79,7 +79,7 @@ void decodePayload(ByteBuf payload, int payloadLength) {
   void handleQueryResult(RowResultDecoder<?, T> decoder) {
     Throwable failure = decoder.complete();
     T result = decoder.result();
-    RowDescriptor rowDescriptor = decoder.rowDesc;
+    RowDescriptorBase rowDescriptor = decoder.rowDesc;
     int size = decoder.size();
     int updatedCount = decoder.size();
     decoder.reset();

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

@@ -13,7 +13,7 @@
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.sqlclient.impl.RowBase;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -25,7 +25,7 @@
 
 public class MSSQLRow extends RowBase {
 
-  public MSSQLRow(RowDescriptor rowDescriptor) {
+  public MSSQLRow(RowDescriptorBase rowDescriptor) {
     super(rowDescriptor);
   }
 

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

@@ -12,7 +12,7 @@
 package io.vertx.mssqlclient.impl.codec;
 
 import io.vertx.sqlclient.internal.PreparedStatement;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
 public class MSSQLPreparedStatement implements PreparedStatement {
 
@@ -24,7 +24,7 @@ public MSSQLPreparedStatement(String sql) {
   }
 
   @Override
-  public RowDescriptor rowDesc() {
+  public RowDescriptorBase rowDesc() {
     throw new UnsupportedOperationException();
   }
 

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

@@ -11,17 +11,17 @@
 
 package io.vertx.mssqlclient.impl.codec;
 
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
 import java.util.Arrays;
 
 /**
- * An implementation of {@link RowDescriptor} for MSSQL.
+ * An implementation of {@link RowDescriptorBase} for MSSQL.
  * <p>
  * When reading rows with a cursor, an extra column named {@code ROWSTAT} is returned by the server.
  * This column should not be conveyed to the user so this class filters it out.
  */
-public class MSSQLRowDescriptor extends RowDescriptor {
+public class MSSQLRowDescriptor extends RowDescriptorBase {
 
   private final ColumnData[] columnDatas;
   private final boolean rowStat;

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

@@ -13,7 +13,7 @@
 
 import io.netty.buffer.ByteBuf;
 import io.vertx.sqlclient.Row;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 import io.vertx.sqlclient.spi.protocol.QueryCommandBase;
 
 import java.util.stream.Collector;
@@ -58,7 +58,7 @@ protected void handleResultSetDone() {
     T result;
     Throwable failure;
     int size;
-    RowDescriptor rowDescriptor;
+    RowDescriptorBase rowDescriptor;
     if (rowResultDecoder != null) {
       failure = rowResultDecoder.complete();
       result = rowResultDecoder.result();

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

@@ -18,9 +18,9 @@
 
 import io.vertx.mysqlclient.impl.datatype.DataFormat;
 import io.vertx.mysqlclient.impl.protocol.ColumnDefinition;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 
-public class MySQLRowDescriptor extends RowDescriptor {
+public class MySQLRowDescriptor extends RowDescriptorBase {
 
   private final ColumnDefinition[] columnDefinitions;
   private final DataFormat dataFormat;

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

@@ -25,7 +25,7 @@
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.impl.*;
 import io.vertx.sqlclient.internal.PreparedStatement;
-import io.vertx.sqlclient.internal.RowDescriptor;
+import io.vertx.sqlclient.internal.RowDescriptorBase;
 import io.vertx.sqlclient.internal.TupleBase;
 
 import java.util.Arrays;
@@ -56,7 +56,7 @@ public class MySQLPreparedStatement implements PreparedStatement {
   }
 
   @Override
-  public RowDescriptor rowDesc() {
+  public RowDescriptorBase rowDesc() {
     return rowDesc;
   }