JPMS support

pom.xml

@@ -123,6 +123,16 @@
                   <annotationProcessor>io.vertx.codegen.CodeGenProcessor</annotationProcessor>
                   <annotationProcessor>io.vertx.docgen.JavaDocGenProcessor</annotationProcessor>
                 </annotationProcessors>
+                <annotationProcessorPaths>
+                  <annotationProcessorPath>
+                    <groupId>io.vertx</groupId>
+                    <artifactId>vertx-codegen</artifactId>
+                  </annotationProcessorPath>
+                  <annotationProcessorPath>
+                    <groupId>io.vertx</groupId>
+                    <artifactId>vertx-docgen</artifactId>
+                  </annotationProcessorPath>
+                </annotationProcessorPaths>
                 <compilerArgs>
                   <!-- Configure the docgen processor -->
                   <compilerArg>-Adocgen.source=${docgen.source}</compilerArg>
@@ -133,8 +143,20 @@
                 </compilerArgs>
               </configuration>
             </execution>
+            <execution>
+              <id>default-testCompile</id>
+              <configuration>
+                <useModulePath>false</useModulePath>
+              </configuration>
+            </execution>
           </executions>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <configuration>
+            <useModulePath>false</useModulePath>
+          </configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>

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

@@ -26,7 +26,7 @@
 import io.vertx.core.spi.metrics.VertxMetrics;
 import io.vertx.db2client.DB2ConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
-import io.vertx.sqlclient.impl.Connection;
+import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.impl.ConnectionFactoryBase;
 
 import java.util.Map;

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

@@ -23,8 +23,8 @@
 import io.vertx.db2client.DB2Connection;
 import io.vertx.db2client.impl.command.PingCommand;
 import io.vertx.db2client.spi.DB2Driver;
-import io.vertx.sqlclient.impl.Connection;
-import io.vertx.sqlclient.impl.SqlConnectionBase;
+import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.SqlConnectionBase;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 
 public class DB2ConnectionImpl extends SqlConnectionBase<DB2ConnectionImpl> implements DB2Connection {

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

@@ -15,7 +15,6 @@
  */
 package io.vertx.db2client.impl;
 
-import java.math.BigDecimal;
 import java.sql.RowId;
 import java.time.Duration;
 import java.time.LocalDate;
@@ -29,11 +28,9 @@
 
 import io.vertx.core.buffer.Buffer;
 import io.vertx.db2client.impl.drda.DB2RowId;
-import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.data.Numeric;
-import io.vertx.sqlclient.impl.ArrayTuple;
 import io.vertx.sqlclient.impl.RowBase;
-import io.vertx.sqlclient.impl.RowDesc;
+import io.vertx.sqlclient.internal.RowDesc;
 
 public class DB2RowImpl extends RowBase {
 

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

@@ -27,10 +27,10 @@
 import io.vertx.db2client.impl.command.InitialHandshakeCommand;
 import io.vertx.db2client.impl.drda.ConnectionMetaData;
 import io.vertx.sqlclient.SqlConnectOptions;
-import io.vertx.sqlclient.impl.Connection;
-import io.vertx.sqlclient.impl.QueryResultHandler;
+import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.QueryResultHandler;
 import io.vertx.sqlclient.impl.SocketConnectionBase;
-import io.vertx.sqlclient.impl.command.*;
+import io.vertx.sqlclient.internal.command.*;
 import io.vertx.sqlclient.spi.DatabaseMetadata;
 
 import java.util.Map;

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

@@ -18,7 +18,7 @@
 import io.netty.buffer.ByteBuf;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
-import io.vertx.sqlclient.impl.command.CloseConnectionCommand;
+import io.vertx.sqlclient.internal.command.CloseConnectionCommand;
 
 class CloseConnectionCommandCodec extends CommandCodec<Void, CloseConnectionCommand> {
 

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

@@ -21,8 +21,8 @@
 import io.vertx.db2client.impl.codec.DB2PreparedStatement.QueryInstance;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
-import io.vertx.sqlclient.impl.command.CloseCursorCommand;
-import io.vertx.sqlclient.impl.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.CloseCursorCommand;
+import io.vertx.sqlclient.internal.command.CommandResponse;
 
 class CloseCursorCommandCodec extends CommandCodec<Void, CloseCursorCommand> {
 

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

@@ -16,8 +16,8 @@
 package io.vertx.db2client.impl.codec;
 
 import io.netty.buffer.ByteBuf;
-import io.vertx.sqlclient.impl.command.CloseStatementCommand;
-import io.vertx.sqlclient.impl.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.CloseStatementCommand;
+import io.vertx.sqlclient.internal.command.CommandResponse;
 
 class CloseStatementCommandCodec extends CommandCodec<Void, CloseStatementCommand> {
 

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

@@ -17,8 +17,8 @@
 
 import io.netty.buffer.ByteBuf;
 import io.vertx.core.Handler;
-import io.vertx.sqlclient.impl.command.CommandBase;
-import io.vertx.sqlclient.impl.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.CommandBase;
+import io.vertx.sqlclient.internal.command.CommandResponse;
 
 abstract class CommandCodec<R, C extends CommandBase<R>> {
 

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

@@ -25,7 +25,7 @@
 import io.vertx.core.internal.logging.Logger;
 import io.vertx.core.internal.logging.LoggerFactory;
 import io.vertx.db2client.DB2Exception;
-import io.vertx.sqlclient.impl.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.CommandResponse;
 
 class DB2Decoder extends ByteToMessageDecoder {
 

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

@@ -25,14 +25,14 @@
 import io.vertx.db2client.impl.DB2SocketConnection;
 import io.vertx.db2client.impl.command.InitialHandshakeCommand;
 import io.vertx.db2client.impl.command.PingCommand;
-import io.vertx.sqlclient.impl.command.CloseConnectionCommand;
-import io.vertx.sqlclient.impl.command.CloseCursorCommand;
-import io.vertx.sqlclient.impl.command.CloseStatementCommand;
-import io.vertx.sqlclient.impl.command.CommandBase;
-import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.ExtendedQueryCommand;
-import io.vertx.sqlclient.impl.command.PrepareStatementCommand;
-import io.vertx.sqlclient.impl.command.SimpleQueryCommand;
+import io.vertx.sqlclient.internal.command.CloseConnectionCommand;
+import io.vertx.sqlclient.internal.command.CloseCursorCommand;
+import io.vertx.sqlclient.internal.command.CloseStatementCommand;
+import io.vertx.sqlclient.internal.command.CommandBase;
+import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
+import io.vertx.sqlclient.internal.command.PrepareStatementCommand;
+import io.vertx.sqlclient.internal.command.SimpleQueryCommand;
 
 class DB2Encoder extends ChannelOutboundHandlerAdapter {
 

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

@@ -20,8 +20,8 @@
 import io.vertx.db2client.impl.drda.ColumnMetaData;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.impl.ErrorMessageFactory;
-import io.vertx.sqlclient.impl.ParamDesc;
-import io.vertx.sqlclient.impl.TupleInternal;
+import io.vertx.sqlclient.internal.ParamDesc;
+import io.vertx.sqlclient.internal.TupleInternal;
 
 class DB2ParamDesc extends ParamDesc {
 

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

@@ -23,10 +23,10 @@
 import io.vertx.core.internal.logging.LoggerFactory;
 import io.vertx.db2client.impl.drda.Cursor;
 import io.vertx.db2client.impl.drda.Section;
-import io.vertx.sqlclient.impl.ParamDesc;
-import io.vertx.sqlclient.impl.PreparedStatement;
-import io.vertx.sqlclient.impl.RowDesc;
-import io.vertx.sqlclient.impl.TupleInternal;
+import io.vertx.sqlclient.internal.ParamDesc;
+import io.vertx.sqlclient.internal.PreparedStatement;
+import io.vertx.sqlclient.internal.RowDesc;
+import io.vertx.sqlclient.internal.TupleInternal;
 
 class DB2PreparedStatement implements PreparedStatement {
 

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

@@ -16,7 +16,7 @@
 package io.vertx.db2client.impl.codec;
 
 import io.vertx.db2client.impl.drda.ColumnMetaData;
-import io.vertx.sqlclient.impl.RowDesc;
+import io.vertx.sqlclient.internal.RowDesc;
 
 import java.sql.JDBCType;
 import java.util.List;

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

@@ -27,9 +27,9 @@
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
 import io.vertx.sqlclient.Tuple;
-import io.vertx.sqlclient.impl.TupleInternal;
-import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.ExtendedQueryCommand;
+import io.vertx.sqlclient.internal.TupleInternal;
+import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 
 class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
 

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

@@ -27,8 +27,8 @@
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.Tuple;
 import io.vertx.sqlclient.data.Numeric;
-import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.ExtendedQueryCommand;
+import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 
 abstract class ExtendedQueryCommandBaseCodec<R, C extends ExtendedQueryCommand<R>>
     extends QueryCommandBaseCodec<R, C> {

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

@@ -19,8 +19,8 @@
 import io.vertx.db2client.impl.codec.DB2PreparedStatement.QueryInstance;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
-import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.ExtendedQueryCommand;
+import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
 
 class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
 

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

@@ -25,8 +25,8 @@
 import io.vertx.db2client.impl.drda.DRDAConstants;
 import io.vertx.db2client.impl.drda.SQLState;
 import io.vertx.db2client.impl.drda.SqlCode;
-import io.vertx.sqlclient.impl.Connection;
-import io.vertx.sqlclient.impl.command.CommandResponse;
+import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.command.CommandResponse;
 
 /**
  * InitialHandshakeCommandCodec encodes the packets to get a connection from the database.
@@ -118,7 +118,7 @@ void decodePayload(ByteBuf payload, int payloadLength) {
         sendPacket(packet, lenOfPayload);
         status = ConnectionState.AUTHENTICATING;
         break;
-        
+
       case AUTHENTICATING:
         response.readSecurityCheck();
         RDBAccessData accData = response.readAccessDatabase();
@@ -128,12 +128,12 @@ void decodePayload(ByteBuf payload, int payloadLength) {
         status = ConnectionState.CONNECTED;
         completionHandler.handle(CommandResponse.success(cmd.connection()));
         break;
-        
+
       default:
         cmd.fail(new DB2Exception("The connection was unable to be established. Invalid connection state.", SqlCode.CONNECTION_REFUSED,
           SQLState.AUTH_DATABASE_CONNECTION_REFUSED));
         break;
-           
+
     }
   }
 

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

@@ -22,7 +22,7 @@
 import io.vertx.db2client.impl.drda.DRDAConnectResponse;
 import io.vertx.db2client.impl.drda.DRDAConstants;
 import io.vertx.db2client.impl.drda.ConnectionMetaData;
-import io.vertx.sqlclient.impl.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.CommandResponse;
 
 class PingCommandCodec extends CommandCodec<Void, PingCommand> {
 

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

@@ -22,9 +22,9 @@
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
 import io.vertx.db2client.impl.drda.Section;
-import io.vertx.sqlclient.impl.PreparedStatement;
-import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.PrepareStatementCommand;
+import io.vertx.sqlclient.internal.PreparedStatement;
+import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.PrepareStatementCommand;
 
 class PrepareStatementCodec extends CommandCodec<PreparedStatement, PrepareStatementCommand> {
 

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

@@ -18,8 +18,8 @@
 import io.netty.buffer.ByteBuf;
 import io.vertx.db2client.impl.drda.ColumnMetaData;
 import io.vertx.db2client.impl.drda.DRDAQueryRequest;
-import io.vertx.sqlclient.impl.RowDesc;
-import io.vertx.sqlclient.impl.command.QueryCommandBase;
+import io.vertx.sqlclient.internal.RowDesc;
+import io.vertx.sqlclient.internal.command.QueryCommandBase;
 
 abstract class QueryCommandBaseCodec<T, C extends QueryCommandBase<T>> extends CommandCodec<Boolean, C> {
 

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

@@ -27,7 +27,7 @@
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.data.Numeric;
 import io.vertx.sqlclient.impl.RowDecoder;
-import io.vertx.sqlclient.impl.RowInternal;
+import io.vertx.sqlclient.internal.RowInternal;
 
 class RowResultDecoder<C, R> extends RowDecoder<C, R> {
 

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

@@ -23,8 +23,8 @@
 import io.vertx.db2client.impl.drda.DRDAQueryResponse;
 import io.vertx.db2client.impl.drda.Section;
 import io.vertx.sqlclient.Row;
-import io.vertx.sqlclient.impl.command.CommandResponse;
-import io.vertx.sqlclient.impl.command.SimpleQueryCommand;
+import io.vertx.sqlclient.internal.command.CommandResponse;
+import io.vertx.sqlclient.internal.command.SimpleQueryCommand;
 
 class SimpleQueryCommandCodec<T> extends QueryCommandBaseCodec<T, SimpleQueryCommand<T>> {
 

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

@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-import io.vertx.sqlclient.impl.command.CommandBase;
+import io.vertx.sqlclient.internal.command.CommandBase;
 
 public class AuthenticationCommandBase<R> extends CommandBase<R> {
 

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

@@ -17,11 +17,11 @@
 
 import java.util.Map;
 
-import io.vertx.sqlclient.impl.Connection;
+import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.impl.SocketConnectionBase;
 
 public class InitialHandshakeCommand extends AuthenticationCommandBase<Connection> {
-  
+
   private final SocketConnectionBase conn;
 
   public InitialHandshakeCommand(SocketConnectionBase conn, String username, String password, String database,

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

@@ -15,7 +15,7 @@
  */
 package io.vertx.db2client.impl.command;
 
-import io.vertx.sqlclient.impl.command.CommandBase;
+import io.vertx.sqlclient.internal.command.CommandBase;
 
 public class PingCommand extends CommandBase<Void> {
 }

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

@@ -29,10 +29,10 @@
 import io.vertx.sqlclient.PoolOptions;
 import io.vertx.sqlclient.SqlConnectOptions;
 import io.vertx.sqlclient.SqlConnection;
-import io.vertx.sqlclient.impl.Connection;
-import io.vertx.sqlclient.impl.CloseablePool;
-import io.vertx.sqlclient.impl.PoolImpl;
-import io.vertx.sqlclient.impl.SqlConnectionInternal;
+import io.vertx.sqlclient.internal.Connection;
+import io.vertx.sqlclient.internal.pool.CloseablePool;
+import io.vertx.sqlclient.internal.pool.PoolImpl;
+import io.vertx.sqlclient.internal.SqlConnectionInternal;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.Driver;
 
@@ -58,7 +58,7 @@ public Pool newPool(Vertx vertx, Supplier<Future<DB2ConnectOptions>> databases,
     } else {
       pool = newPoolImpl(vx, connectHandler, databases, poolOptions, transportOptions, closeFuture);
     }
-    return new CloseablePool<>(vx, closeFuture, pool);
+    return new CloseablePool(vx, closeFuture, pool);
   }
 
   private PoolImpl newPoolImpl(VertxInternal vertx, Handler<SqlConnection> connectHandler, Supplier<Future<DB2ConnectOptions>> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) {