diff --git a/pom.xml b/pom.xml index f96a83dd6..59360e1c9 100644 --- a/pom.xml +++ b/pom.xml @@ -123,6 +123,16 @@ io.vertx.codegen.CodeGenProcessor io.vertx.docgen.JavaDocGenProcessor + + + io.vertx + vertx-codegen + + + io.vertx + vertx-docgen + + -Adocgen.source=${docgen.source} @@ -133,8 +143,20 @@ + + default-testCompile + + false + + + + maven-surefire-plugin + + false + + diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java index 46f67532d..a6912e432 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java +++ b/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; diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java index 26a50b6fb..8bdb1280e 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java +++ b/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 implements DB2Connection { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2RowImpl.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2RowImpl.java index 603c6ebb9..a575ed1a5 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2RowImpl.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java index 14c027835..63d8f4ffb 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java +++ b/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; diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseConnectionCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseConnectionCommandCodec.java index 57482ab95..cf2d04d7f 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseConnectionCommandCodec.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseCursorCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseCursorCommandCodec.java index 526825996..fedb4a205 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseCursorCommandCodec.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseStatementCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseStatementCommandCodec.java index c2111a7c1..f7934c96e 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CloseStatementCommandCodec.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CommandCodec.java index e89dd830c..343a0a08a 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/CommandCodec.java +++ b/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> { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Decoder.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Decoder.java index d9b45acfc..1266e65c8 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Decoder.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Encoder.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Encoder.java index 6c7e7d60e..6ebd0a00c 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2Encoder.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2ParamDesc.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2ParamDesc.java index 92c270e61..88cecc1c8 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2ParamDesc.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2PreparedStatement.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2PreparedStatement.java index 59a702fb4..9eb1185c9 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2PreparedStatement.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2RowDesc.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2RowDesc.java index e31685018..f29947bdd 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/DB2RowDesc.java +++ b/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; diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedBatchQueryCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedBatchQueryCommandCodec.java index ab2525103..f6cd00391 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedBatchQueryCommandCodec.java +++ b/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 extends ExtendedQueryCommandBaseCodec> { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandBaseCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandBaseCodec.java index e28aa9e9f..24ee7f989 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandBaseCodec.java +++ b/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> extends QueryCommandBaseCodec { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandCodec.java index d93384342..ea6f3be90 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/ExtendedQueryCommandCodec.java +++ b/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 extends ExtendedQueryCommandBaseCodec> { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/InitialHandshakeCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/InitialHandshakeCommandCodec.java index 49ed031b4..8b1fee817 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/InitialHandshakeCommandCodec.java +++ b/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; - + } } diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/PingCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/PingCommandCodec.java index 3b606205e..3866a7553 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/PingCommandCodec.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/PrepareStatementCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/PrepareStatementCodec.java index 1d4325936..18fe425e9 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/PrepareStatementCodec.java +++ b/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 { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/QueryCommandBaseCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/QueryCommandBaseCodec.java index 67f862cda..859b43b34 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/QueryCommandBaseCodec.java +++ b/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> extends CommandCodec { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/RowResultDecoder.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/RowResultDecoder.java index f416ac489..bcb4658d1 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/RowResultDecoder.java +++ b/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 extends RowDecoder { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/SimpleQueryCommandCodec.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/SimpleQueryCommandCodec.java index 3d85d230c..3a1e8cc08 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/codec/SimpleQueryCommandCodec.java +++ b/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 extends QueryCommandBaseCodec> { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/AuthenticationCommandBase.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/AuthenticationCommandBase.java index e87b2fdfe..b87668fd3 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/AuthenticationCommandBase.java +++ b/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 extends CommandBase { diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/InitialHandshakeCommand.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/InitialHandshakeCommand.java index 96722f566..f6ce353aa 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/InitialHandshakeCommand.java +++ b/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 { - + private final SocketConnectionBase conn; public InitialHandshakeCommand(SocketConnectionBase conn, String username, String password, String database, diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/PingCommand.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/PingCommand.java index a5306aa72..e9193113e 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/command/PingCommand.java +++ b/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 { } diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java b/vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java index ebc790aaf..f86ce5615 100644 --- a/vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java +++ b/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> 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 connectHandler, Supplier> databases, PoolOptions options, NetClientOptions transportOptions, CloseFuture closeFuture) { diff --git a/vertx-db2-client/src/main/java/module-info.java b/vertx-db2-client/src/main/java/module-info.java new file mode 100644 index 000000000..689baf110 --- /dev/null +++ b/vertx-db2-client/src/main/java/module-info.java @@ -0,0 +1,21 @@ +module io.vertx.client.sql.db2 { + + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.common; + requires io.netty.handler; + requires io.netty.transport; + requires io.vertx.client.sql; + requires io.vertx.core; + requires io.vertx.core.logging; + requires java.sql; + + exports io.vertx.db2client; + exports io.vertx.db2client.spi; + + requires static vertx.docgen; + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + + +} diff --git a/vertx-db2-client/src/main/resources/META-INF/MANIFEST.MF b/vertx-db2-client/src/main/resources/META-INF/MANIFEST.MF index 393f81aa1..e69de29bb 100644 --- a/vertx-db2-client/src/main/resources/META-INF/MANIFEST.MF +++ b/vertx-db2-client/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +0,0 @@ -Automatic-Module-Name: io.vertx.client.sql.db2 - diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java index f682259b9..2f683d47f 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java @@ -21,12 +21,11 @@ import io.vertx.core.net.NetSocket; import io.vertx.core.net.SocketAddress; import io.vertx.core.internal.net.NetSocketInternal; -import io.vertx.core.net.impl.NetServerImpl; import io.vertx.core.spi.metrics.ClientMetrics; import io.vertx.core.spi.metrics.VertxMetrics; import io.vertx.mssqlclient.MSSQLConnectOptions; 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; @@ -39,7 +38,7 @@ public class MSSQLConnectionFactory extends ConnectionFactoryBase implements MSSQLConnection { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLRowImpl.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLRowImpl.java index f24bae180..cf46c0d9a 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLRowImpl.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLRowImpl.java @@ -12,10 +12,8 @@ package io.vertx.mssqlclient.impl; import io.vertx.core.buffer.Buffer; -import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.ArrayTuple; import io.vertx.sqlclient.impl.RowBase; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; import java.math.BigDecimal; import java.time.LocalDate; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java index bc81b52ab..e4a6ae308 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java @@ -34,16 +34,16 @@ import io.vertx.mssqlclient.impl.codec.TdsSslHandshakeCodec; import io.vertx.mssqlclient.impl.command.PreLoginCommand; 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; import java.util.function.Predicate; -import static io.vertx.sqlclient.impl.command.TxCommand.Kind.BEGIN; +import static io.vertx.sqlclient.internal.command.TxCommand.Kind.BEGIN; public class MSSQLSocketConnection extends SocketConnectionBase { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseConnectionCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseConnectionCommandCodec.java index 30880be91..7dc4a4553 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseConnectionCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseConnectionCommandCodec.java @@ -11,7 +11,7 @@ package io.vertx.mssqlclient.impl.codec; -import io.vertx.sqlclient.impl.command.CloseConnectionCommand; +import io.vertx.sqlclient.internal.command.CloseConnectionCommand; class CloseConnectionCommandCodec extends MSSQLCommandCodec { CloseConnectionCommandCodec(TdsMessageCodec tdsMessageCodec, CloseConnectionCommand cmd) { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseCursorCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseCursorCommandCodec.java index e2ea7a717..fa6071e18 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseCursorCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseCursorCommandCodec.java @@ -12,8 +12,8 @@ package io.vertx.mssqlclient.impl.codec; import io.netty.buffer.ByteBuf; -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; import static io.vertx.mssqlclient.impl.codec.DataType.INTN; import static io.vertx.mssqlclient.impl.codec.MessageType.RPC; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseStatementCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseStatementCommandCodec.java index 3e865d0e9..020c07b28 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseStatementCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/CloseStatementCommandCodec.java @@ -12,8 +12,8 @@ package io.vertx.mssqlclient.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; import static io.vertx.mssqlclient.impl.codec.DataType.INTN; import static io.vertx.mssqlclient.impl.codec.MessageType.RPC; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java index 57ac2a7f4..9f26d6ac1 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java @@ -12,9 +12,9 @@ package io.vertx.mssqlclient.impl.codec; import io.netty.buffer.ByteBuf; -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; import java.util.List; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedCursorQueryCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedCursorQueryCommandCodec.java index 4efb59618..da1b68023 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedCursorQueryCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedCursorQueryCommandCodec.java @@ -12,8 +12,8 @@ package io.vertx.mssqlclient.impl.codec; import io.netty.buffer.ByteBuf; -import io.vertx.sqlclient.impl.TupleInternal; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.TupleInternal; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import static io.vertx.mssqlclient.impl.codec.DataType.INTN; import static io.vertx.mssqlclient.impl.codec.DataType.NVARCHAR; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java index eaf2538a0..c4cb2b849 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java @@ -13,8 +13,8 @@ import io.netty.buffer.ByteBuf; import io.vertx.sqlclient.data.NullValue; -import io.vertx.sqlclient.impl.TupleInternal; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.TupleInternal; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import static io.vertx.mssqlclient.impl.codec.DataType.*; import static io.vertx.mssqlclient.impl.codec.MessageType.RPC; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandCodec.java index 8d4b8a594..002ad57dd 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/ExtendedQueryCommandCodec.java @@ -11,8 +11,8 @@ package io.vertx.mssqlclient.impl.codec; -import io.vertx.sqlclient.impl.TupleInternal; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.TupleInternal; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; class ExtendedQueryCommandCodec extends ExtendedQueryCommandBaseCodec { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/InitCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/InitCommandCodec.java index 44d919302..454a185c5 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/InitCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/InitCommandCodec.java @@ -17,8 +17,8 @@ import io.vertx.mssqlclient.impl.MSSQLSocketConnection; import io.vertx.mssqlclient.impl.protocol.client.login.LoginPacket; import io.vertx.mssqlclient.impl.utils.Utils; -import io.vertx.sqlclient.impl.Connection; -import io.vertx.sqlclient.impl.command.InitCommand; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.command.InitCommand; import java.util.Map; @@ -93,7 +93,7 @@ void encode() { content.writeShortLE(appName.length()); // ServerName - String serverName = cmd.connection().socket().remoteAddress().host(); + String serverName = ((MSSQLSocketConnection)cmd.connection()).socket().remoteAddress().host(); int serverNameOffsetLengthIdx = content.writerIndex(); content.writeZero(2); // offset content.writeShortLE(serverName.length()); diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLCommandCodec.java index 6acb22d81..b195e4d11 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLCommandCodec.java @@ -16,8 +16,8 @@ import io.netty.handler.ssl.SslHandler; import io.vertx.mssqlclient.MSSQLException; import io.vertx.mssqlclient.MSSQLInfo; -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; import static io.vertx.mssqlclient.impl.codec.EnvChange.*; import static io.vertx.mssqlclient.impl.codec.TokenType.*; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLParamDesc.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLParamDesc.java index e86c15aa5..c7b62223e 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLParamDesc.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLParamDesc.java @@ -12,8 +12,8 @@ package io.vertx.mssqlclient.impl.codec; 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 MSSQLParamDesc extends ParamDesc { private final ColumnData[] paramDescriptions; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLPreparedStatement.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLPreparedStatement.java index fe426ecf9..957fe4efb 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLPreparedStatement.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLPreparedStatement.java @@ -11,10 +11,10 @@ package io.vertx.mssqlclient.impl.codec; -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; public class MSSQLPreparedStatement implements PreparedStatement { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLRowDesc.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLRowDesc.java index e74e50bfe..e8485e16c 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLRowDesc.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/MSSQLRowDesc.java @@ -11,7 +11,7 @@ package io.vertx.mssqlclient.impl.codec; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; import java.util.Arrays; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PreLoginCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PreLoginCommandCodec.java index 0e9b73e5e..485657ef4 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PreLoginCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PreLoginCommandCodec.java @@ -15,7 +15,7 @@ import io.vertx.mssqlclient.impl.MSSQLDatabaseMetadata; import io.vertx.mssqlclient.impl.command.PreLoginCommand; import io.vertx.mssqlclient.impl.command.PreLoginResponse; -import io.vertx.sqlclient.impl.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CommandResponse; import static io.vertx.mssqlclient.impl.codec.EncryptionLevel.ENCRYPT_OFF; import static io.vertx.mssqlclient.impl.codec.EncryptionLevel.ENCRYPT_ON; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PrepareStatementCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PrepareStatementCodec.java index 6262e10bb..4379d5834 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PrepareStatementCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/PrepareStatementCodec.java @@ -11,9 +11,9 @@ package io.vertx.mssqlclient.impl.codec; -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 MSSQLCommandCodec { PrepareStatementCodec(TdsMessageCodec tdsMessageCodec, PrepareStatementCommand cmd) { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/QueryCommandBaseCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/QueryCommandBaseCodec.java index c20e89538..6d83b241c 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/QueryCommandBaseCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/QueryCommandBaseCodec.java @@ -13,8 +13,8 @@ import io.netty.buffer.ByteBuf; import io.vertx.sqlclient.Row; -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; import java.util.stream.Collector; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/RowResultDecoder.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/RowResultDecoder.java index 8b4a2efd8..6673433d3 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/RowResultDecoder.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/RowResultDecoder.java @@ -15,7 +15,7 @@ import io.vertx.mssqlclient.impl.MSSQLRowImpl; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.impl.RowDecoder; -import io.vertx.sqlclient.impl.RowInternal; +import io.vertx.sqlclient.internal.RowInternal; import java.util.stream.Collector; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/SQLBatchCommandCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/SQLBatchCommandCodec.java index 440105b77..9a8039b2c 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/SQLBatchCommandCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/SQLBatchCommandCodec.java @@ -12,7 +12,7 @@ package io.vertx.mssqlclient.impl.codec; import io.netty.buffer.ByteBuf; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; import java.nio.charset.StandardCharsets; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageCodec.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageCodec.java index d5aa91367..c6a44ae29 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageCodec.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageCodec.java @@ -15,8 +15,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.CombinedChannelDuplexHandler; import io.vertx.sqlclient.ClosedConnectionException; -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; import java.util.ArrayDeque; import java.util.HashMap; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageDecoder.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageDecoder.java index af3682c11..8283a3047 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageDecoder.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageDecoder.java @@ -14,8 +14,8 @@ import io.netty.buffer.ByteBufAllocator; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -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; public class TdsMessageDecoder extends ChannelInboundHandlerAdapter { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageEncoder.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageEncoder.java index 9aefd6c0b..7f7385cc1 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageEncoder.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/codec/TdsMessageEncoder.java @@ -16,7 +16,7 @@ import io.netty.channel.ChannelOutboundHandlerAdapter; import io.netty.channel.ChannelPromise; import io.vertx.mssqlclient.impl.command.PreLoginCommand; -import io.vertx.sqlclient.impl.command.*; +import io.vertx.sqlclient.internal.command.*; import static io.vertx.mssqlclient.MSSQLConnectOptions.MIN_PACKET_SIZE; import static io.vertx.mssqlclient.impl.codec.MessageStatus.END_OF_MESSAGE; diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/command/PreLoginCommand.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/command/PreLoginCommand.java index 959431e92..78d67ff71 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/command/PreLoginCommand.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/command/PreLoginCommand.java @@ -11,7 +11,7 @@ package io.vertx.mssqlclient.impl.command; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class PreLoginCommand extends CommandBase { diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java index 5e5615626..0c01516de 100644 --- a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java +++ b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java @@ -31,10 +31,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; @@ -60,7 +60,7 @@ public Pool newPool(Vertx vertx, Supplier> databases } else { pool = newPoolImpl(vx, connectHandler, databases, options, transportOptions, closeFuture); } - return new CloseablePool<>(vx, closeFuture, pool); + return new CloseablePool(vx, closeFuture, pool); } private PoolImpl newPoolImpl(VertxInternal vertx, Handler connectHandler, Supplier> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) { diff --git a/vertx-mssql-client/src/main/java/module-info.java b/vertx-mssql-client/src/main/java/module-info.java new file mode 100644 index 000000000..bf9217442 --- /dev/null +++ b/vertx-mssql-client/src/main/java/module-info.java @@ -0,0 +1,21 @@ +module io.vertx.client.sql.mssql { + + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.common; + requires io.netty.handler; + requires io.netty.transport; + requires io.vertx.client.sql; + requires io.vertx.core; + requires io.vertx.core.logging; + requires java.sql; + + exports io.vertx.mssqlclient; + exports io.vertx.mssqlclient.spi; + + requires static vertx.docgen; + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + + +} diff --git a/vertx-mssql-client/src/main/resources/META-INF/MANIFEST.MF b/vertx-mssql-client/src/main/resources/META-INF/MANIFEST.MF index e899287ad..e69de29bb 100644 --- a/vertx-mssql-client/src/main/resources/META-INF/MANIFEST.MF +++ b/vertx-mssql-client/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +0,0 @@ -Automatic-Module-Name: io.vertx.client.sql.mssql - diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java index 7245312d8..f350fb6ba 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java @@ -29,7 +29,7 @@ import io.vertx.mysqlclient.MySQLConnectOptions; import io.vertx.mysqlclient.SslMode; 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.nio.charset.Charset; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java index a67ef15ed..3b0b31157 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java @@ -21,8 +21,8 @@ import io.vertx.mysqlclient.MySQLSetOption; import io.vertx.mysqlclient.impl.command.*; import io.vertx.mysqlclient.spi.MySQLDriver; -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 MySQLConnectionImpl extends SqlConnectionBase implements MySQLConnection { diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLParamDesc.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLParamDesc.java index ff3ad2c5c..6bd8277aa 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLParamDesc.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLParamDesc.java @@ -12,7 +12,7 @@ package io.vertx.mysqlclient.impl; import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; -import io.vertx.sqlclient.impl.ParamDesc; +import io.vertx.sqlclient.internal.ParamDesc; public class MySQLParamDesc extends ParamDesc { private final ColumnDefinition[] paramDefinitions; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowDesc.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowDesc.java index 290c5f77c..c7906c7dc 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowDesc.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowDesc.java @@ -18,7 +18,7 @@ import io.vertx.mysqlclient.impl.datatype.DataFormat; import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; public class MySQLRowDesc extends RowDesc { diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowImpl.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowImpl.java index 3373af3f7..f461a398e 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowImpl.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLRowImpl.java @@ -17,9 +17,7 @@ import io.vertx.mysqlclient.data.spatial.*; import io.vertx.mysqlclient.impl.datatype.DataType; import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; -import io.vertx.sqlclient.Row; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.impl.ArrayTuple; import io.vertx.sqlclient.impl.RowBase; import java.time.*; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java index fcbf2948d..f9095cd9b 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLSocketConnection.java @@ -35,13 +35,13 @@ import io.vertx.mysqlclient.impl.codec.MySQLPacketDecoder; import io.vertx.mysqlclient.impl.command.InitialHandshakeCommand; 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.CommandBase; -import io.vertx.sqlclient.impl.command.QueryCommandBase; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; -import io.vertx.sqlclient.impl.command.TxCommand; +import io.vertx.sqlclient.internal.command.CommandBase; +import io.vertx.sqlclient.internal.command.QueryCommandBase; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.command.TxCommand; import io.vertx.sqlclient.spi.DatabaseMetadata; import java.nio.charset.Charset; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/AuthenticationCommandBaseCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/AuthenticationCommandBaseCodec.java index 752ba709f..84c96299b 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/AuthenticationCommandBaseCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/AuthenticationCommandBaseCodec.java @@ -16,7 +16,7 @@ import io.vertx.mysqlclient.impl.command.AuthenticationCommandBase; import io.vertx.mysqlclient.impl.util.BufferUtils; import io.vertx.mysqlclient.impl.util.RsaPublicKeyEncryptor; -import io.vertx.sqlclient.impl.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CommandResponse; import java.nio.charset.StandardCharsets; import java.util.Arrays; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ChangeUserCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ChangeUserCommandCodec.java index 66bf19239..ea00cb4d2 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ChangeUserCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ChangeUserCommandCodec.java @@ -18,7 +18,7 @@ import io.vertx.mysqlclient.impl.util.BufferUtils; import io.vertx.mysqlclient.impl.util.CachingSha2Authenticator; import io.vertx.mysqlclient.impl.util.Native41Authenticator; -import io.vertx.sqlclient.impl.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CommandResponse; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseConnectionCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseConnectionCommandCodec.java index 931c8cde6..f62ea556a 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseConnectionCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseConnectionCommandCodec.java @@ -13,7 +13,7 @@ import io.netty.buffer.ByteBuf; import io.vertx.mysqlclient.impl.protocol.CommandType; -import io.vertx.sqlclient.impl.command.CloseConnectionCommand; +import io.vertx.sqlclient.internal.command.CloseConnectionCommand; class CloseConnectionCommandCodec extends CommandCodec { private static final int PAYLOAD_LENGTH = 1; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseStatementCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseStatementCommandCodec.java index ae66755d3..964162212 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseStatementCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CloseStatementCommandCodec.java @@ -13,8 +13,8 @@ import io.netty.buffer.ByteBuf; import io.vertx.mysqlclient.impl.protocol.CommandType; -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 { private static final int PAYLOAD_LENGTH = 5; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CommandCodec.java index 02ee504e8..00eb14862 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/CommandCodec.java @@ -22,8 +22,8 @@ import io.vertx.mysqlclient.impl.protocol.CapabilitiesFlag; import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; import io.vertx.mysqlclient.impl.util.BufferUtils; -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; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java index a86715a99..8f72f10a6 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedBatchQueryCommandCodec.java @@ -16,9 +16,9 @@ import io.vertx.mysqlclient.MySQLBatchException; import io.vertx.mysqlclient.MySQLException; 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; import java.util.BitSet; import java.util.List; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java index ff4bf3b6d..71b4c51b8 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandBaseCodec.java @@ -17,7 +17,7 @@ import io.vertx.mysqlclient.impl.datatype.DataTypeCodec; import io.vertx.mysqlclient.impl.protocol.CommandType; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import static io.vertx.mysqlclient.impl.protocol.Packets.*; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java index 31dae40dc..2b5bd675b 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ExtendedQueryCommandCodec.java @@ -19,8 +19,8 @@ import io.netty.buffer.ByteBuf; import io.vertx.mysqlclient.impl.protocol.CommandType; import io.vertx.sqlclient.Tuple; -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; import static io.vertx.mysqlclient.impl.protocol.Packets.ERROR_PACKET_HEADER; import static io.vertx.mysqlclient.impl.protocol.Packets.EnumCursorType.CURSOR_TYPE_NO_CURSOR; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitialHandshakeCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitialHandshakeCommandCodec.java index d1e3c1186..e623b2c45 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitialHandshakeCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/InitialHandshakeCommandCodec.java @@ -27,8 +27,8 @@ import io.vertx.mysqlclient.impl.util.BufferUtils; import io.vertx.mysqlclient.impl.util.CachingSha2Authenticator; import io.vertx.mysqlclient.impl.util.Native41Authenticator; -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; import java.nio.charset.StandardCharsets; import java.util.Map; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCodec.java index 0a5eff3f1..480199ad5 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLCodec.java @@ -20,8 +20,8 @@ import io.netty.channel.CombinedChannelDuplexHandler; import io.vertx.mysqlclient.impl.MySQLSocketConnection; import io.vertx.sqlclient.ClosedConnectionException; -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; import java.util.ArrayDeque; import java.util.Iterator; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLEncoder.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLEncoder.java index ea36421e7..70d984bf7 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLEncoder.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLEncoder.java @@ -16,7 +16,7 @@ import io.netty.channel.ChannelPromise; import io.vertx.mysqlclient.impl.MySQLSocketConnection; import io.vertx.mysqlclient.impl.command.*; -import io.vertx.sqlclient.impl.command.*; +import io.vertx.sqlclient.internal.command.*; import java.nio.charset.Charset; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLPreparedStatement.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLPreparedStatement.java index c6124e6b4..8e5b77193 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLPreparedStatement.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/MySQLPreparedStatement.java @@ -23,6 +23,10 @@ import io.vertx.mysqlclient.impl.datatype.DataTypeCodec; import io.vertx.sqlclient.Tuple; import io.vertx.sqlclient.impl.*; +import io.vertx.sqlclient.internal.ParamDesc; +import io.vertx.sqlclient.internal.PreparedStatement; +import io.vertx.sqlclient.internal.RowDesc; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.Arrays; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PingCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PingCommandCodec.java index 60f8d5b8f..2a26448dd 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PingCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PingCommandCodec.java @@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf; import io.vertx.mysqlclient.impl.command.PingCommand; import io.vertx.mysqlclient.impl.protocol.CommandType; -import io.vertx.sqlclient.impl.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CommandResponse; class PingCommandCodec extends CommandCodec { private static final int PAYLOAD_LENGTH = 1; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PrepareStatementCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PrepareStatementCodec.java index 6dd78b2c0..24bb73ea3 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PrepareStatementCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/PrepareStatementCodec.java @@ -22,9 +22,9 @@ import io.vertx.mysqlclient.impl.datatype.DataFormat; import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; import io.vertx.mysqlclient.impl.protocol.CommandType; -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; import static io.vertx.mysqlclient.impl.protocol.Packets.ERROR_PACKET_HEADER; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/QueryCommandBaseCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/QueryCommandBaseCodec.java index ab52ced51..37c6aa329 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/QueryCommandBaseCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/QueryCommandBaseCodec.java @@ -23,9 +23,9 @@ import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; import io.vertx.mysqlclient.impl.util.BufferUtils; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.RowDesc; -import io.vertx.sqlclient.impl.command.CommandResponse; -import io.vertx.sqlclient.impl.command.QueryCommandBase; +import io.vertx.sqlclient.internal.RowDesc; +import io.vertx.sqlclient.internal.command.CommandResponse; +import io.vertx.sqlclient.internal.command.QueryCommandBase; import java.util.stream.Collector; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetStatementCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetStatementCommandCodec.java index 7992523f0..0ddc12aa0 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetStatementCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/ResetStatementCommandCodec.java @@ -13,7 +13,7 @@ import io.netty.buffer.ByteBuf; import io.vertx.mysqlclient.impl.protocol.CommandType; -import io.vertx.sqlclient.impl.command.CloseCursorCommand; +import io.vertx.sqlclient.internal.command.CloseCursorCommand; class ResetStatementCommandCodec extends CommandCodec { private static final int PAYLOAD_LENGTH = 5; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/RowResultDecoder.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/RowResultDecoder.java index 103f0774a..4005403c1 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/RowResultDecoder.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/RowResultDecoder.java @@ -20,7 +20,7 @@ import io.vertx.mysqlclient.impl.protocol.ColumnDefinition; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.impl.RowDecoder; -import io.vertx.sqlclient.impl.RowInternal; +import io.vertx.sqlclient.internal.RowInternal; import java.util.stream.Collector; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SimpleQueryCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SimpleQueryCommandCodec.java index 9686a8496..9d7d8d865 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SimpleQueryCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/SimpleQueryCommandCodec.java @@ -20,7 +20,7 @@ import io.vertx.core.Future; import io.vertx.mysqlclient.impl.datatype.DataFormat; import io.vertx.mysqlclient.impl.protocol.CommandType; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; import java.io.File; import java.nio.charset.StandardCharsets; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/StatisticsCommandCodec.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/StatisticsCommandCodec.java index 462a88c65..2ee782f2f 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/StatisticsCommandCodec.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/codec/StatisticsCommandCodec.java @@ -14,7 +14,7 @@ import io.netty.buffer.ByteBuf; import io.vertx.mysqlclient.impl.command.StatisticsCommand; import io.vertx.mysqlclient.impl.protocol.CommandType; -import io.vertx.sqlclient.impl.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CommandResponse; class StatisticsCommandCodec extends CommandCodec { private static final int PAYLOAD_LENGTH = 1; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/AuthenticationCommandBase.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/AuthenticationCommandBase.java index a46f6abe6..85545736e 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/AuthenticationCommandBase.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/AuthenticationCommandBase.java @@ -13,7 +13,7 @@ import io.vertx.core.buffer.Buffer; import io.vertx.mysqlclient.impl.MySQLCollation; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; import java.util.Map; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/DebugCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/DebugCommand.java index 7d3224a19..027038b40 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/DebugCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/DebugCommand.java @@ -11,7 +11,7 @@ package io.vertx.mysqlclient.impl.command; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class DebugCommand extends CommandBase { } diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitDbCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitDbCommand.java index 28d28e765..e9715f1a6 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitDbCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitDbCommand.java @@ -11,7 +11,7 @@ package io.vertx.mysqlclient.impl.command; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class InitDbCommand extends CommandBase { private final String schemaName; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitialHandshakeCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitialHandshakeCommand.java index fe03c0b99..4cb001e2f 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitialHandshakeCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/InitialHandshakeCommand.java @@ -16,7 +16,7 @@ import io.vertx.mysqlclient.MySQLAuthenticationPlugin; import io.vertx.mysqlclient.SslMode; import io.vertx.mysqlclient.impl.MySQLCollation; -import io.vertx.sqlclient.impl.Connection; +import io.vertx.sqlclient.internal.Connection; import io.vertx.sqlclient.impl.SocketConnectionBase; import java.nio.charset.Charset; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/PingCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/PingCommand.java index 90a0ff724..cf2a8045e 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/PingCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/PingCommand.java @@ -11,7 +11,7 @@ package io.vertx.mysqlclient.impl.command; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class PingCommand extends CommandBase { } diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/ResetConnectionCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/ResetConnectionCommand.java index 6a0268990..ba699a660 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/ResetConnectionCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/ResetConnectionCommand.java @@ -11,7 +11,7 @@ package io.vertx.mysqlclient.impl.command; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class ResetConnectionCommand extends CommandBase { } diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/SetOptionCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/SetOptionCommand.java index 6558eaccc..0f8ca98fa 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/SetOptionCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/SetOptionCommand.java @@ -12,7 +12,7 @@ package io.vertx.mysqlclient.impl.command; import io.vertx.mysqlclient.MySQLSetOption; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class SetOptionCommand extends CommandBase { private final MySQLSetOption mySQLSetOption; diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/StatisticsCommand.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/StatisticsCommand.java index e670c1e43..dfe537e14 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/StatisticsCommand.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/command/StatisticsCommand.java @@ -11,7 +11,7 @@ package io.vertx.mysqlclient.impl.command; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandBase; public class StatisticsCommand extends CommandBase { } diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.java index 06eaf234e..76c8422f7 100644 --- a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.java +++ b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/spi/MySQLDriver.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> databases } else { pool = newPoolImpl(vx, connectHandler, databases, options, transportOptions, closeFuture); } - return new CloseablePool<>(vx, closeFuture, pool); + return new CloseablePool(vx, closeFuture, pool); } private PoolImpl newPoolImpl(VertxInternal vertx, Handler connectHandler, Supplier> databases, PoolOptions poolOptions, NetClientOptions transportOptions, CloseFuture closeFuture) { diff --git a/vertx-mysql-client/src/main/java/module-info.java b/vertx-mysql-client/src/main/java/module-info.java new file mode 100644 index 000000000..61f5165c9 --- /dev/null +++ b/vertx-mysql-client/src/main/java/module-info.java @@ -0,0 +1,22 @@ +module io.vertx.client.sql.mysql { + + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.common; + requires io.netty.handler; + requires io.netty.transport; + requires io.vertx.client.sql; + requires io.vertx.core; + requires io.vertx.core.logging; + requires java.sql; + + exports io.vertx.mysqlclient; + exports io.vertx.mysqlclient.spi; + exports io.vertx.mysqlclient.data.spatial; + + requires static vertx.docgen; + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + + +} diff --git a/vertx-mysql-client/src/main/resources/META-INF/MANIFEST.MF b/vertx-mysql-client/src/main/resources/META-INF/MANIFEST.MF index e91bcea35..e69de29bb 100644 --- a/vertx-mysql-client/src/main/resources/META-INF/MANIFEST.MF +++ b/vertx-mysql-client/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +0,0 @@ -Automatic-Module-Name: io.vertx.client.sql.mysql - diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionImpl.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionImpl.java index 454b36265..6c428c0b3 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionImpl.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleConnectionImpl.java @@ -17,8 +17,8 @@ import io.vertx.oracleclient.OracleConnectOptions; import io.vertx.oracleclient.OracleConnection; import io.vertx.oracleclient.spi.OracleDriver; -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 OracleConnectionImpl extends SqlConnectionBase implements OracleConnection { diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java index 2624eab87..783b0f9b9 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java @@ -18,8 +18,8 @@ import io.vertx.core.tracing.TracingPolicy; import io.vertx.oracleclient.OracleConnectOptions; import io.vertx.oracleclient.impl.commands.*; -import io.vertx.sqlclient.impl.Connection; -import io.vertx.sqlclient.impl.command.*; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.command.*; import io.vertx.sqlclient.spi.DatabaseMetadata; import oracle.jdbc.OracleConnection; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRow.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRow.java index 6a4d8202e..e8868543c 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRow.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRow.java @@ -13,11 +13,9 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; -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; import java.time.*; import java.util.List; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRowDesc.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRowDesc.java index b5c848a55..36faba690 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRowDesc.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleRowDesc.java @@ -11,7 +11,7 @@ package io.vertx.oracleclient.impl; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; import java.sql.ResultSetMetaData; import java.sql.SQLException; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/RowReader.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/RowReader.java index a4e9bfac1..051725a30 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/RowReader.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/RowReader.java @@ -19,7 +19,7 @@ import io.vertx.oracleclient.impl.commands.OraclePreparedQueryCommand; import io.vertx.oracleclient.impl.commands.OracleResponse; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; import oracle.jdbc.OracleResultSet; import java.sql.ResultSetMetaData; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCommand.java index c2554db0b..9524b2e12 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCommand.java @@ -14,8 +14,8 @@ import io.vertx.core.Promise; import io.vertx.core.internal.ContextInternal; import io.vertx.oracleclient.impl.Helper.SQLBlockingCodeHandler; -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; import oracle.jdbc.OracleConnection; import java.util.concurrent.Flow; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorFetchCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorFetchCommand.java index 25e4bf030..744c0a563 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorFetchCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorFetchCommand.java @@ -14,8 +14,8 @@ import io.vertx.core.Future; import io.vertx.core.internal.ContextInternal; import io.vertx.oracleclient.impl.RowReader; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import oracle.jdbc.OracleConnection; public class OracleCursorFetchCommand extends OracleCommand { diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorQueryCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorQueryCommand.java index 0d681cf70..7cb756e67 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorQueryCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleCursorQueryCommand.java @@ -17,8 +17,8 @@ import io.vertx.sqlclient.PrepareOptions; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import oracle.jdbc.OracleConnection; import oracle.jdbc.OraclePreparedStatement; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePrepareStatementCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePrepareStatementCommand.java index 908e03111..026df67f2 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePrepareStatementCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePrepareStatementCommand.java @@ -14,8 +14,8 @@ import io.vertx.core.internal.ContextInternal; import io.vertx.core.json.JsonArray; import io.vertx.oracleclient.OraclePrepareOptions; -import io.vertx.sqlclient.impl.PreparedStatement; -import io.vertx.sqlclient.impl.command.PrepareStatementCommand; +import io.vertx.sqlclient.internal.PreparedStatement; +import io.vertx.sqlclient.internal.command.PrepareStatementCommand; import oracle.jdbc.OracleConnection; import java.sql.SQLException; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedBatchQuery.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedBatchQuery.java index e0f18fbb0..7162b5757 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedBatchQuery.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedBatchQuery.java @@ -16,9 +16,9 @@ import io.vertx.oracleclient.OraclePrepareOptions; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.TupleInternal; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.TupleInternal; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import oracle.jdbc.OracleConnection; import oracle.jdbc.OraclePreparedStatement; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedQueryCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedQueryCommand.java index 4eb856fba..4858c03ed 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedQueryCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedQueryCommand.java @@ -16,8 +16,8 @@ import io.vertx.sqlclient.PrepareOptions; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; import oracle.jdbc.OracleConnection; import oracle.jdbc.OraclePreparedStatement; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedStatement.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedStatement.java index 45f06fa99..7adb21dd1 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedStatement.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OraclePreparedStatement.java @@ -11,14 +11,15 @@ package io.vertx.oracleclient.impl.commands; import io.vertx.oracleclient.impl.OracleRowDesc; -import io.vertx.sqlclient.impl.ParamDesc; -import io.vertx.sqlclient.impl.RowDesc; -import io.vertx.sqlclient.impl.TupleInternal; +import io.vertx.sqlclient.internal.ParamDesc; +import io.vertx.sqlclient.internal.RowDesc; +import io.vertx.sqlclient.internal.TupleInternal; +import io.vertx.sqlclient.internal.PreparedStatement; import java.sql.ResultSetMetaData; import java.sql.SQLException; -public class OraclePreparedStatement implements io.vertx.sqlclient.impl.PreparedStatement { +public class OraclePreparedStatement implements PreparedStatement { private final String sql; private final RowDesc rowDesc; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleQueryCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleQueryCommand.java index 4e15d7224..ca87f4d63 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleQueryCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleQueryCommand.java @@ -23,7 +23,7 @@ import io.vertx.oracleclient.impl.OracleRowDesc; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.desc.ColumnDescriptor; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; import oracle.jdbc.OracleConnection; import oracle.jdbc.OraclePreparedStatement; import oracle.sql.TIMESTAMPTZ; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleResponse.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleResponse.java index e8fa44921..79bf72aa5 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleResponse.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleResponse.java @@ -12,8 +12,8 @@ import io.vertx.oracleclient.OracleClient; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.RowDesc; import java.util.ArrayList; import java.util.List; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleSimpleQueryCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleSimpleQueryCommand.java index bf05111ce..ead98af8d 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleSimpleQueryCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleSimpleQueryCommand.java @@ -14,8 +14,8 @@ import io.vertx.core.internal.ContextInternal; import io.vertx.oracleclient.OraclePrepareOptions; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; import oracle.jdbc.OracleConnection; import oracle.jdbc.OraclePreparedStatement; diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleTransactionCommand.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleTransactionCommand.java index 8d1fdb4f0..56ce2b919 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleTransactionCommand.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/commands/OracleTransactionCommand.java @@ -13,11 +13,11 @@ import io.vertx.core.Future; import io.vertx.core.internal.ContextInternal; import io.vertx.oracleclient.impl.Helper.SQLFutureMapper; -import io.vertx.sqlclient.impl.command.TxCommand; +import io.vertx.sqlclient.internal.command.TxCommand; import oracle.jdbc.OracleConnection; -import static io.vertx.sqlclient.impl.command.TxCommand.Kind.BEGIN; -import static io.vertx.sqlclient.impl.command.TxCommand.Kind.COMMIT; +import static io.vertx.sqlclient.internal.command.TxCommand.Kind.BEGIN; +import static io.vertx.sqlclient.internal.command.TxCommand.Kind.COMMIT; public class OracleTransactionCommand extends OracleCommand { diff --git a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java index 8ebd9b641..d7f7083bc 100644 --- a/vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java +++ b/vertx-oracle-client/src/main/java/io/vertx/oracleclient/spi/OracleDriver.java @@ -24,10 +24,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; @@ -54,7 +54,7 @@ public Pool newPool(Vertx vertx, Supplier> database } else { pool = newPoolImpl(vx, connectHandler, databases, options, closeFuture); } - return new CloseablePool<>(vx, closeFuture, pool); + return new CloseablePool(vx, closeFuture, pool); } private PoolImpl newPoolImpl(VertxInternal vertx, Handler connectHandler, Supplier> databases, PoolOptions options, CloseFuture closeFuture) { diff --git a/vertx-oracle-client/src/main/java/module-info.java b/vertx-oracle-client/src/main/java/module-info.java new file mode 100644 index 000000000..ef57152b0 --- /dev/null +++ b/vertx-oracle-client/src/main/java/module-info.java @@ -0,0 +1,23 @@ +module io.vertx.client.sql.db2 { + + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.common; + requires io.netty.handler; + requires io.netty.transport; + requires com.oracle.database.jdbc; + requires io.vertx.client.sql; + requires io.vertx.core; + requires io.vertx.core.logging; + requires java.sql; + + exports io.vertx.oracleclient; + exports io.vertx.oracleclient.data; + exports io.vertx.oracleclient.spi; + + requires static vertx.docgen; + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + + +} diff --git a/vertx-oracle-client/src/main/resources/META-INF/MANIFEST.MF b/vertx-oracle-client/src/main/resources/META-INF/MANIFEST.MF index 2bff83ce9..e69de29bb 100644 --- a/vertx-oracle-client/src/main/resources/META-INF/MANIFEST.MF +++ b/vertx-oracle-client/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +0,0 @@ -Automatic-Module-Name: io.vertx.client.sql.oracle - diff --git a/vertx-pg-client/pom.xml b/vertx-pg-client/pom.xml index 0e2060130..c82536707 100644 --- a/vertx-pg-client/pom.xml +++ b/vertx-pg-client/pom.xml @@ -134,22 +134,6 @@ - diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionFactory.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionFactory.java index 109770ba3..3ea07f7f1 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionFactory.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionFactory.java @@ -29,7 +29,7 @@ import io.vertx.pgclient.PgConnectOptions; import io.vertx.pgclient.SslMode; 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.Collections; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java index c15bd77cd..ed7433fa0 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java @@ -28,10 +28,10 @@ import io.vertx.pgclient.impl.codec.NoticeResponse; import io.vertx.pgclient.impl.codec.TxFailedEvent; import io.vertx.pgclient.spi.PgDriver; -import io.vertx.sqlclient.impl.Connection; +import io.vertx.sqlclient.internal.Connection; import io.vertx.sqlclient.impl.Notification; import io.vertx.sqlclient.impl.SocketConnectionBase; -import io.vertx.sqlclient.impl.SqlConnectionBase; +import io.vertx.sqlclient.internal.SqlConnectionBase; public class PgConnectionImpl extends SqlConnectionBase implements PgConnection { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java index 28b6766a1..0e283e017 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java @@ -33,11 +33,11 @@ import io.vertx.pgclient.impl.codec.NoticeResponse; import io.vertx.pgclient.impl.codec.PgCodec; import io.vertx.pgclient.impl.codec.TxFailedEvent; -import io.vertx.sqlclient.impl.Connection; +import io.vertx.sqlclient.internal.Connection; import io.vertx.sqlclient.impl.Notification; -import io.vertx.sqlclient.impl.QueryResultHandler; +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; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/RowImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/RowImpl.java index 4b42617a9..2875571fb 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/RowImpl.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/RowImpl.java @@ -21,12 +21,9 @@ import io.vertx.core.json.JsonArray; import io.vertx.core.json.JsonObject; import io.vertx.pgclient.data.*; -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.impl.RowInternal; +import io.vertx.sqlclient.internal.RowDesc; import java.lang.reflect.Array; import java.time.*; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseConnectionCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseConnectionCommandCodec.java index b3f149cd6..06dfe7ce9 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseConnectionCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseConnectionCommandCodec.java @@ -16,7 +16,7 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.command.CloseConnectionCommand; +import io.vertx.sqlclient.internal.command.CloseConnectionCommand; class CloseConnectionCommandCodec extends PgCommandCodec { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ClosePortalCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ClosePortalCommandCodec.java index 7f5c27f52..267cc6103 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ClosePortalCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ClosePortalCommandCodec.java @@ -16,7 +16,7 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.command.CloseCursorCommand; +import io.vertx.sqlclient.internal.command.CloseCursorCommand; class ClosePortalCommandCodec extends PgCommandCodec { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseStatementCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseStatementCommandCodec.java index 159788a5a..92dd14df0 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseStatementCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/CloseStatementCommandCodec.java @@ -16,8 +16,7 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.command.CloseStatementCommand; -import io.vertx.sqlclient.impl.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CloseStatementCommand; class CloseStatementCommandCodec extends PgCommandCodec { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ExtendedQueryCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ExtendedQueryCommandCodec.java index 77321ceca..ce0cf91bd 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ExtendedQueryCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ExtendedQueryCommandCodec.java @@ -16,11 +16,11 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.TupleInternal; +import io.vertx.sqlclient.internal.TupleInternal; import io.vertx.sqlclient.impl.codec.InvalidCachedStatementEvent; -import io.vertx.sqlclient.impl.RowDesc; -import io.vertx.sqlclient.impl.command.CommandResponse; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.RowDesc; +import io.vertx.sqlclient.internal.command.CommandResponse; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; class ExtendedQueryCommandCodec> extends QueryCommandBaseCodec { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/InitCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/InitCommandCodec.java index bfc6daefd..2fa0332cb 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/InitCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/InitCommandCodec.java @@ -23,9 +23,9 @@ import io.vertx.pgclient.impl.PgDatabaseMetadata; import io.vertx.pgclient.impl.PgSocketConnection; import io.vertx.pgclient.impl.util.ScramAuthentication; -import io.vertx.sqlclient.impl.Connection; -import io.vertx.sqlclient.impl.command.CommandResponse; -import io.vertx.sqlclient.impl.command.InitCommand; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.command.CommandResponse; +import io.vertx.sqlclient.internal.command.InitCommand; class InitCommandCodec extends PgCommandCodec { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ParamExtractor.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ParamExtractor.java index 994832bdc..7cafd860a 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ParamExtractor.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/ParamExtractor.java @@ -10,7 +10,7 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.TupleInternal; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.Arrays; import java.util.stream.Collectors; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCodec.java index eb4742e17..71d975050 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCodec.java @@ -19,8 +19,8 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.channel.CombinedChannelDuplexHandler; import io.vertx.sqlclient.ClosedConnectionException; -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; import java.util.ArrayDeque; import java.util.Iterator; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCommandCodec.java index ff41cb395..456516661 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgCommandCodec.java @@ -19,8 +19,8 @@ import io.vertx.core.internal.logging.Logger; import io.vertx.core.internal.logging.LoggerFactory; import io.vertx.pgclient.PgException; -import io.vertx.sqlclient.impl.command.CommandResponse; -import io.vertx.sqlclient.impl.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandResponse; +import io.vertx.sqlclient.internal.command.CommandBase; import io.netty.buffer.ByteBuf; import java.util.Arrays; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgDecoder.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgDecoder.java index 5144e37fd..8d52504ee 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgDecoder.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgDecoder.java @@ -25,8 +25,8 @@ import io.vertx.pgclient.impl.util.Util; import io.netty.buffer.ByteBuf; import io.netty.util.ByteProcessor; -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; /** * diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgEncoder.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgEncoder.java index f11f22b02..3e9ae2716 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgEncoder.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgEncoder.java @@ -26,9 +26,9 @@ import io.vertx.sqlclient.Tuple; import io.vertx.pgclient.impl.util.Util; import io.vertx.sqlclient.impl.HexSequence; -import io.vertx.sqlclient.impl.ParamDesc; -import io.vertx.sqlclient.impl.RowDesc; -import io.vertx.sqlclient.impl.command.*; +import io.vertx.sqlclient.internal.ParamDesc; +import io.vertx.sqlclient.internal.RowDesc; +import io.vertx.sqlclient.internal.command.*; import java.util.Map; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgParamDesc.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgParamDesc.java index 87065ee80..2939446c2 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgParamDesc.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgParamDesc.java @@ -17,8 +17,8 @@ package io.vertx.pgclient.impl.codec; 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; import java.util.Arrays; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgPreparedStatement.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgPreparedStatement.java index 5f38ac5ce..be9c5036e 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgPreparedStatement.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgPreparedStatement.java @@ -17,9 +17,9 @@ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.PreparedStatement; -import io.vertx.sqlclient.impl.ParamDesc; -import io.vertx.sqlclient.impl.TupleInternal; +import io.vertx.sqlclient.internal.PreparedStatement; +import io.vertx.sqlclient.internal.ParamDesc; +import io.vertx.sqlclient.internal.TupleInternal; class PgPreparedStatement implements PreparedStatement { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgRowDesc.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgRowDesc.java index 5a07d7fb7..557cc630b 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgRowDesc.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PgRowDesc.java @@ -16,7 +16,7 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.RowDesc; +import io.vertx.sqlclient.internal.RowDesc; class PgRowDesc extends RowDesc { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PrepareStatementCommandCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PrepareStatementCommandCodec.java index f4d5f8df9..57a620a25 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PrepareStatementCommandCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/PrepareStatementCommandCodec.java @@ -16,8 +16,8 @@ */ package io.vertx.pgclient.impl.codec; -import io.vertx.sqlclient.impl.command.PrepareStatementCommand; -import io.vertx.sqlclient.impl.PreparedStatement; +import io.vertx.sqlclient.internal.command.PrepareStatementCommand; +import io.vertx.sqlclient.internal.PreparedStatement; import java.util.List; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/QueryCommandBaseCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/QueryCommandBaseCodec.java index bacbdb659..ec8cac359 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/QueryCommandBaseCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/QueryCommandBaseCodec.java @@ -17,8 +17,8 @@ package io.vertx.pgclient.impl.codec; import io.vertx.sqlclient.Row; -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; import java.util.stream.Collector; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/RowResultDecoder.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/RowResultDecoder.java index 0502870e7..f705516be 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/RowResultDecoder.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/RowResultDecoder.java @@ -21,7 +21,7 @@ import io.vertx.pgclient.impl.RowImpl; import io.netty.buffer.ByteBuf; import io.vertx.sqlclient.impl.RowDecoder; -import io.vertx.sqlclient.impl.RowInternal; +import io.vertx.sqlclient.internal.RowInternal; import java.util.stream.Collector; diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/SimpleQueryCodec.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/SimpleQueryCodec.java index 16bbe7408..22cfab981 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/SimpleQueryCodec.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/codec/SimpleQueryCodec.java @@ -18,7 +18,7 @@ import io.vertx.core.internal.logging.Logger; import io.vertx.core.internal.logging.LoggerFactory; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; class SimpleQueryCodec extends QueryCommandBaseCodec> { diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java index 0a1f0154b..80f899ef5 100644 --- a/vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java +++ b/vertx-pg-client/src/main/java/io/vertx/pgclient/spi/PgDriver.java @@ -17,10 +17,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; diff --git a/vertx-pg-client/src/main/java/module-info.java b/vertx-pg-client/src/main/java/module-info.java new file mode 100644 index 000000000..a7054130e --- /dev/null +++ b/vertx-pg-client/src/main/java/module-info.java @@ -0,0 +1,25 @@ +module io.vertx.client.sql.pg { + + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.common; + requires io.netty.handler; + requires io.netty.transport; + requires io.vertx.client.sql; + requires io.vertx.core; + requires io.vertx.core.logging; + requires java.sql; + + requires static com.ongres.scram.client; + requires static com.ongres.scram.common; + + exports io.vertx.pgclient; + exports io.vertx.pgclient.spi; + exports io.vertx.pgclient.data; + exports io.vertx.pgclient.pubsub; + + requires static vertx.docgen; + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + +} diff --git a/vertx-pg-client/src/main/resources/META-INF/MANIFEST.MF b/vertx-pg-client/src/main/resources/META-INF/MANIFEST.MF index 0b2347374..e69de29bb 100644 --- a/vertx-pg-client/src/main/resources/META-INF/MANIFEST.MF +++ b/vertx-pg-client/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +0,0 @@ -Automatic-Module-Name: io.vertx.client.sql.pg - diff --git a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java b/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java index 0af830721..a19f85e0c 100644 --- a/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java +++ b/vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTest.java @@ -27,7 +27,7 @@ import io.vertx.core.internal.ContextInternal; import io.vertx.pgclient.impl.PgSocketConnection; import io.vertx.sqlclient.*; -import io.vertx.sqlclient.impl.SqlConnectionInternal; +import io.vertx.sqlclient.internal.SqlConnectionInternal; import org.junit.Rule; import org.junit.Test; diff --git a/vertx-sql-client-templates/pom.xml b/vertx-sql-client-templates/pom.xml index 7d1a4c182..bc546782f 100644 --- a/vertx-sql-client-templates/pom.xml +++ b/vertx-sql-client-templates/pom.xml @@ -44,8 +44,13 @@ io.vertx - vertx-codegen - true + vertx-codegen-processor + 5.0.0-SNAPSHOT + + + io.vertx + vertx-codegen-api + 5.0.0-SNAPSHOT io.vertx @@ -99,7 +104,7 @@ default-testCompile - io.vertx.codegen.CodeGenProcessor + io.vertx.codegen.processor.Processor diff --git a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/impl/JsonTuple.java b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/impl/JsonTuple.java index 9a2043187..d868690cd 100644 --- a/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/impl/JsonTuple.java +++ b/vertx-sql-client-templates/src/main/java/io/vertx/sqlclient/templates/impl/JsonTuple.java @@ -12,7 +12,7 @@ import io.vertx.core.json.JsonObject; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.TupleInternal; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.function.Function; diff --git a/vertx-sql-client-templates/src/main/java/module-info.java b/vertx-sql-client-templates/src/main/java/module-info.java new file mode 100644 index 000000000..48e90fcba --- /dev/null +++ b/vertx-sql-client-templates/src/main/java/module-info.java @@ -0,0 +1,9 @@ +module io.vertx.client.sql.templates { + requires io.vertx.client.sql; + requires io.vertx.codegen.processor; + requires io.vertx.codegen.api; + requires io.vertx.core; + requires java.compiler; + requires static vertx.docgen; + +} diff --git a/vertx-sql-client/pom.xml b/vertx-sql-client/pom.xml index bf45e81b0..c24499ae0 100644 --- a/vertx-sql-client/pom.xml +++ b/vertx-sql-client/pom.xml @@ -50,13 +50,26 @@ true - - - io.vertx - vertx-core - test-jar - test - + + + + + maven-compiler-plugin + + + default-compile + + + io.vertx.codegen.CodeGenProcessor + + + + + + + + + diff --git a/vertx-sql-client/src/main/java/examples/SqlClientExamples.java b/vertx-sql-client/src/main/java/examples/SqlClientExamples.java deleted file mode 100644 index d7695e794..000000000 --- a/vertx-sql-client/src/main/java/examples/SqlClientExamples.java +++ /dev/null @@ -1,461 +0,0 @@ -/* - * Copyright (C) 2017 Julien Viet - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package examples; - -import io.vertx.core.AbstractVerticle; -import io.vertx.core.DeploymentOptions; -import io.vertx.core.Future; -import io.vertx.core.Vertx; -import io.vertx.core.tracing.TracingPolicy; -import io.vertx.sqlclient.*; -import io.vertx.sqlclient.spi.Driver; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -@SuppressWarnings("unused") -public class SqlClientExamples { - - public void queries01(SqlClient client) { - client - .query("SELECT * FROM users WHERE id='julien'") - .execute() - .onComplete(ar -> { - if (ar.succeeded()) { - RowSet result = ar.result(); - System.out.println("Got " + result.size() + " rows "); - } else { - System.out.println("Failure: " + ar.cause().getMessage()); - } - }); - } - - - public void queries02(SqlClient client) { - client - .preparedQuery("SELECT * FROM users WHERE id=$1") - .execute(Tuple.of("julien")) - .onComplete(ar -> { - if (ar.succeeded()) { - RowSet rows = ar.result(); - System.out.println("Got " + rows.size() + " rows "); - } else { - System.out.println("Failure: " + ar.cause().getMessage()); - } - }); - } - - public void queries03(SqlClient client) { - client - .preparedQuery("SELECT first_name, last_name FROM users") - .execute() - .onComplete(ar -> { - if (ar.succeeded()) { - RowSet rows = ar.result(); - for (Row row : rows) { - System.out.println("User " + row.getString(0) + " " + row.getString(1)); - } - } else { - System.out.println("Failure: " + ar.cause().getMessage()); - } - }); - } - - public void queries04(SqlClient client) { - client - .preparedQuery("INSERT INTO users (first_name, last_name) VALUES ($1, $2)") - .execute(Tuple.of("Julien", "Viet")) - .onComplete(ar -> { - if (ar.succeeded()) { - RowSet rows = ar.result(); - System.out.println(rows.rowCount()); - } else { - System.out.println("Failure: " + ar.cause().getMessage()); - } - }); - } - - public void queries05(Row row) { - System.out.println("User " + row.getString(0) + " " + row.getString(1)); - } - - public void queries06(Row row) { - System.out.println("User " + row.getString("first_name") + " " + row.getString("last_name")); - } - - public void queries07(Row row) { - - String firstName = row.getString("first_name"); - Boolean male = row.getBoolean("male"); - Integer age = row.getInteger("age"); - - // ... - - } - - public void queries08(SqlClient client) { - - // Add commands to the batch - List batch = new ArrayList<>(); - batch.add(Tuple.of("julien", "Julien Viet")); - batch.add(Tuple.of("emad", "Emad Alblueshi")); - - // Execute the prepared batch - client - .preparedQuery("INSERT INTO USERS (id, name) VALUES ($1, $2)") - .executeBatch(batch) - .onComplete(res -> { - if (res.succeeded()) { - - // Process rows - RowSet rows = res.result(); - } else { - System.out.println("Batch failed " + res.cause()); - } - }); - } - - public void queries09(SqlClient client, SqlConnectOptions connectOptions) { - - // Enable prepare statements caching - connectOptions.setCachePreparedStatements(true); - client - .preparedQuery("SELECT * FROM users WHERE id=$1") - .execute(Tuple.of("julien")) - .onComplete(ar -> { - if (ar.succeeded()) { - RowSet rows = ar.result(); - System.out.println("Got " + rows.size() + " rows "); - } else { - System.out.println("Failure: " + ar.cause().getMessage()); - } - }); - } - - public void queries10(SqlConnection sqlConnection) { - sqlConnection - .prepare("SELECT * FROM users WHERE id=$1") - .onComplete(ar -> { - if (ar.succeeded()) { - PreparedStatement preparedStatement = ar.result(); - preparedStatement.query() - .execute(Tuple.of("julien")) - .onComplete(ar2 -> { - if (ar2.succeeded()) { - RowSet rows = ar2.result(); - System.out.println("Got " + rows.size() + " rows "); - preparedStatement.close(); - } else { - System.out.println("Failure: " + ar2.cause().getMessage()); - } - }); - } else { - System.out.println("Failure: " + ar.cause().getMessage()); - } - }); - } - - public void usingConnections01(Vertx vertx, Pool pool) { - - pool.getConnection() - .onComplete(ar1 -> { - if (ar1.succeeded()) { - SqlConnection connection = ar1.result(); - - connection - .query("SELECT * FROM users WHERE id='julien'") - .execute() - .onComplete(ar2 -> { - if (ar1.succeeded()) { - connection - .query("SELECT * FROM users WHERE id='paulo'") - .execute() - .onComplete(ar3 -> { - // Do something with rows and return the connection to the pool - connection.close(); - }); - } else { - // Return the connection to the pool - connection.close(); - } - }); - } - }); - } - - public void usingConnections02(SqlConnection connection) { - connection.prepare("SELECT * FROM users WHERE first_name LIKE $1") - .onComplete(ar1 -> { - if (ar1.succeeded()) { - PreparedStatement pq = ar1.result(); - pq.query() - .execute(Tuple.of("julien")) - .onComplete(ar2 -> { - if (ar2.succeeded()) { - // All rows - RowSet rows = ar2.result(); - } - }); - } - }); - } - - public void usingConnections03(Pool pool) { - Future future = pool.withConnection(conn -> conn - .query("SELECT id FROM USERS WHERE name = 'Julien'") - .execute() - .flatMap(rowSet -> { - Iterator rows = rowSet.iterator(); - if (rows.hasNext()) { - Row row = rows.next(); - return Future.succeededFuture(row.getInteger("id")); - } else { - return Future.failedFuture("No results"); - } - })); - future.onSuccess(id -> { - System.out.println("User id: " + id); - }); - } - - public void transaction01(Pool pool) { - pool - .getConnection() - .onComplete(res -> { - if (res.succeeded()) { - - // Transaction must use a connection - SqlConnection conn = res.result(); - - // Begin the transaction - conn - .begin() - .onComplete(ar0 -> { - if (ar0.succeeded()) { - Transaction tx = ar0.result(); - - // Various statements - conn - .query("INSERT INTO Users (first_name,last_name) VALUES ('Julien','Viet')") - .execute() - .onComplete(ar1 -> { - if (ar1.succeeded()) { - conn - .query("INSERT INTO Users (first_name,last_name) VALUES ('Emad','Alblueshi')") - .execute() - .onComplete(ar2 -> { - if (ar2.succeeded()) { - // Commit the transaction - tx.commit() - .onComplete(ar3 -> { - if (ar3.succeeded()) { - System.out.println("Transaction succeeded"); - } else { - System.out.println("Transaction failed " + ar3.cause().getMessage()); - } - // Return the connection to the pool - conn.close(); - }); - } else { - // Return the connection to the pool - conn.close(); - } - }); - } else { - // Return the connection to the pool - conn.close(); - } - }); - } else { - // Return the connection to the pool - conn.close(); - } - }); - } - }); - } - - public void transaction02(Transaction tx) { - tx.completion().onFailure(err -> { - System.out.println("Transaction failed => rollbacked"); - }); - } - - public void transaction03(Pool pool) { - - // Acquire a transaction and begin the transaction - pool.withTransaction(client -> client - .query("INSERT INTO Users (first_name,last_name) VALUES ('Julien','Viet')") - .execute() - .flatMap(res -> client - .query("INSERT INTO Users (first_name,last_name) VALUES ('Julien','Viet')") - .execute() - // Map to a message result - .map("Users inserted")) - ).onComplete(ar -> { - // The connection was automatically return to the pool - if (ar.succeeded()) { - // Transaction was committed - String message = ar.result(); - System.out.println("Transaction succeeded: " + message); - } else { - // Transaction was rolled back - System.out.println("Transaction failed " + ar.cause().getMessage()); - } - }); - } - - public void usingCursors01(SqlConnection connection) { - connection - .prepare("SELECT * FROM users WHERE first_name LIKE $1") - .onComplete(ar0 -> { - if (ar0.succeeded()) { - PreparedStatement pq = ar0.result(); - - // Cursors require to run within a transaction - connection - .begin() - .onComplete(ar1 -> { - if (ar1.succeeded()) { - Transaction tx = ar1.result(); - - // Create a cursor - Cursor cursor = pq.cursor(Tuple.of("julien")); - - // Read 50 rows - cursor - .read(50) - .onComplete(ar2 -> { - if (ar2.succeeded()) { - RowSet rows = ar2.result(); - - // Check for more ? - if (cursor.hasMore()) { - // Repeat the process... - } else { - // No more rows - commit the transaction - tx.commit(); - } - } - }); - } - }); - } - }); - } - - public void usingCursors02(Cursor cursor) { - cursor - .read(50) - .onComplete(ar2 -> { - if (ar2.succeeded()) { - // Close the cursor - cursor.close(); - } - }); - } - - public void usingCursors03(SqlConnection connection) { - connection - .prepare("SELECT * FROM users WHERE first_name LIKE $1") - .onComplete(ar0 -> { - if (ar0.succeeded()) { - PreparedStatement pq = ar0.result(); - - // Streams require to run within a transaction - connection - .begin() - .onComplete(ar1 -> { - if (ar1.succeeded()) { - Transaction tx = ar1.result(); - - // Fetch 50 rows at a time - RowStream stream = pq.createStream(50, Tuple.of("julien")); - - // Use the stream - stream.exceptionHandler(err -> { - System.out.println("Error: " + err.getMessage()); - }); - stream.endHandler(v -> { - tx.commit(); - System.out.println("End of stream"); - }); - stream.handler(row -> { - System.out.println("User: " + row.getString("last_name")); - }); - } - }); - } - }); - } - - public void tracing01(SqlConnectOptions options) { - options.setTracingPolicy(TracingPolicy.ALWAYS); - } - - public void poolConfig01(SqlConnectOptions server1, SqlConnectOptions server2, SqlConnectOptions server3, PoolOptions options) { - // Not generic - } - - public void poolConfig02(ClientBuilder builder, String sql) { - builder.withConnectHandler(conn -> { - conn.query(sql).execute().onSuccess(res -> { - // Release the connection to the pool, ready to be used by the application - conn.close(); - }); - }); - } - - public void poolSharing1(Vertx vertx, SqlConnectOptions database, int maxSize) { - Pool pool = Pool.pool(database, new PoolOptions().setMaxSize(maxSize)); - vertx.deployVerticle(() -> new AbstractVerticle() { - @Override - public void start() throws Exception { - // Use the pool - } - }, new DeploymentOptions().setInstances(4)); - } - - public void poolSharing2(Vertx vertx, SqlConnectOptions database, int maxSize) { - vertx.deployVerticle(() -> new AbstractVerticle() { - Pool pool; - @Override - public void start() { - // Get or create a shared pool - // this actually creates a lease to the pool - // when the verticle is undeployed, the lease will be released automaticaly - pool = Pool.pool(database, new PoolOptions() - .setMaxSize(maxSize) - .setShared(true) - .setName("my-pool")); - } - }, new DeploymentOptions().setInstances(4)); - } - - public static void poolSharing3(Vertx vertx, SqlConnectOptions database, int maxSize) { - Pool pool = Pool.pool(database, new PoolOptions() - .setMaxSize(maxSize) - .setShared(true) - .setName("my-pool") - .setEventLoopSize(4)); - } - - - public void dynamicPoolConfig(Vertx vertx, Pool pool, Driver driver) { - } -} diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java index d53e988c6..2700336ce 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Pool.java @@ -28,13 +28,13 @@ import io.vertx.core.Vertx; import io.vertx.core.net.NetClientOptions; import io.vertx.core.internal.ContextInternal; -import io.vertx.sqlclient.impl.PoolImpl; +import io.vertx.sqlclient.internal.pool.PoolImpl; import io.vertx.sqlclient.impl.Utils; import io.vertx.sqlclient.spi.Driver; import java.util.function.Function; -import static io.vertx.sqlclient.impl.PoolImpl.startPropagatableConnection; +import static io.vertx.sqlclient.internal.pool.PoolImpl.startPropagatableConnection; /** * A connection pool which reuses a number of SQL connections. diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedStatement.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedStatement.java index 2d91a8d99..030733992 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedStatement.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/PreparedStatement.java @@ -19,7 +19,7 @@ import io.vertx.codegen.annotations.VertxGen; import io.vertx.core.Future; -import io.vertx.sqlclient.impl.ArrayTuple; +import io.vertx.sqlclient.internal.ArrayTuple; /** * A prepared statement, the statement is pre-compiled and it's more efficient to execute the statement for multiple times. diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Tuple.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Tuple.java index 5cab1f6bd..34d5df480 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/Tuple.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/Tuple.java @@ -20,7 +20,7 @@ import io.vertx.core.json.JsonObject; import io.vertx.sqlclient.data.NullValue; import io.vertx.sqlclient.data.Numeric; -import io.vertx.sqlclient.impl.ArrayTuple; +import io.vertx.sqlclient.internal.ArrayTuple; import io.vertx.sqlclient.impl.ListTuple; import io.vertx.core.internal.buffer.BufferInternal; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java index 35612b2b4..dfa02a34e 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ConnectionFactoryBase.java @@ -19,6 +19,7 @@ import io.vertx.core.internal.PromiseInternal; import io.vertx.core.internal.VertxInternal; import io.vertx.sqlclient.SqlConnectOptions; +import io.vertx.sqlclient.internal.Connection; import io.vertx.sqlclient.spi.ConnectionFactory; /** diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CursorImpl.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CursorImpl.java index ee3460d88..1c02524a9 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CursorImpl.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CursorImpl.java @@ -24,6 +24,9 @@ import io.vertx.sqlclient.Cursor; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.RowSet; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.PreparedStatement; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.UUID; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ListTuple.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ListTuple.java index 1591fe6f9..a38e1e3ca 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ListTuple.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ListTuple.java @@ -18,6 +18,7 @@ package io.vertx.sqlclient.impl; import io.vertx.sqlclient.Tuple; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.List; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatementImpl.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatementImpl.java index d5de6c23a..582fd1c8a 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatementImpl.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatementImpl.java @@ -21,8 +21,10 @@ import io.vertx.core.internal.PromiseInternal; import io.vertx.sqlclient.PrepareOptions; import io.vertx.sqlclient.PreparedQuery; -import io.vertx.sqlclient.impl.command.CloseCursorCommand; -import io.vertx.sqlclient.impl.command.CloseStatementCommand; +import io.vertx.sqlclient.internal.ArrayTuple; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.command.CloseCursorCommand; +import io.vertx.sqlclient.internal.command.CloseStatementCommand; import io.vertx.sqlclient.Cursor; import io.vertx.sqlclient.PreparedStatement; import io.vertx.sqlclient.SqlResult; @@ -31,7 +33,8 @@ import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; import io.vertx.core.*; -import io.vertx.sqlclient.impl.command.PrepareStatementCommand; +import io.vertx.sqlclient.internal.command.PrepareStatementCommand; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; @@ -41,13 +44,13 @@ /** * @author Julien Viet */ -class PreparedStatementImpl implements PreparedStatement { +public class PreparedStatementImpl implements PreparedStatement { - static PreparedStatement create(Connection conn, ContextInternal context, io.vertx.sqlclient.impl.PreparedStatement ps, boolean autoCommit) { + public static PreparedStatement create(Connection conn, ContextInternal context, io.vertx.sqlclient.internal.PreparedStatement ps, boolean autoCommit) { return new PreparedStatementImpl(conn, context, ps, autoCommit); } - static PreparedStatement create(Connection conn, ContextInternal context, PrepareOptions options, String sql, boolean autoCommit) { + public static PreparedStatement create(Connection conn, ContextInternal context, PrepareOptions options, String sql, boolean autoCommit) { return new PreparedStatementImpl(conn, context, sql, options, autoCommit); } @@ -55,12 +58,12 @@ static PreparedStatement create(Connection conn, ContextInternal context, Prepar private final ContextInternal context; private final String sql; private final PrepareOptions options; - private Promise promise; - private Future future; + private Promise promise; + private Future future; private final boolean autoCommit; private final AtomicBoolean closed = new AtomicBoolean(); - private PreparedStatementImpl(Connection conn, ContextInternal context, io.vertx.sqlclient.impl.PreparedStatement ps, boolean autoCommit) { + private PreparedStatementImpl(Connection conn, ContextInternal context, io.vertx.sqlclient.internal.PreparedStatement ps, boolean autoCommit) { this.conn = conn; this.context = context; this.sql = null; @@ -93,7 +96,7 @@ public PreparedQuery> query() { return new PreparedStatementQuery<>(builder); } - void withPreparedStatement(PrepareOptions options, Tuple args, Handler> handler) { + void withPreparedStatement(PrepareOptions options, Tuple args, Handler> handler) { if (context == Vertx.currentContext()) { if (future == null) { // Lazy statement; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryBase.java index fb78b26b1..2461b7a29 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryBase.java @@ -29,7 +29,7 @@ /** * @author Julien Viet */ -abstract class QueryBase> implements Query { +public abstract class QueryBase> implements Query { protected final QueryExecutor builder; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryExecutor.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryExecutor.java index ed3d13493..fb9a094cb 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryExecutor.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryExecutor.java @@ -23,9 +23,11 @@ import io.vertx.sqlclient.Row; import io.vertx.sqlclient.SqlResult; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.command.CommandScheduler; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.command.CommandScheduler; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.PreparedStatement; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.List; import java.util.function.Function; @@ -34,7 +36,7 @@ /** * Executes query. */ -class QueryExecutor, L extends SqlResult> { +public class QueryExecutor, L extends SqlResult> { private final Function factory; private final Collector collector; @@ -49,7 +51,7 @@ private QueryResultBuilder createHandler(PromiseInternal promise) { return new QueryResultBuilder<>(factory, promise); } - void executeSimpleQuery(CommandScheduler scheduler, + public void executeSimpleQuery(CommandScheduler scheduler, String sql, boolean autoCommit, boolean singleton, @@ -90,7 +92,7 @@ QueryResultBuilder executeExtendedQuery(CommandScheduler scheduler, return handler; } - void executeExtendedQuery(CommandScheduler scheduler, String sql, PrepareOptions options, boolean autoCommit, Tuple arguments, PromiseInternal promise) { + public void executeExtendedQuery(CommandScheduler scheduler, String sql, PrepareOptions options, boolean autoCommit, Tuple arguments, PromiseInternal promise) { ContextInternal context = (ContextInternal) promise.context(); QueryResultBuilder handler = this.createHandler(promise); ExtendedQueryCommand cmd = createExtendedQueryCommand(sql, options, autoCommit, arguments, handler); @@ -131,7 +133,7 @@ void executeBatchQuery(CommandScheduler scheduler, scheduler.schedule(context, cmd).onComplete(handler); } - void executeBatchQuery(CommandScheduler scheduler, String sql, PrepareOptions options, boolean autoCommit, List batch, PromiseInternal promise) { + public void executeBatchQuery(CommandScheduler scheduler, String sql, PrepareOptions options, boolean autoCommit, List batch, PromiseInternal promise) { ContextInternal context = promise.context(); QueryResultBuilder handler = createHandler(promise); ExtendedQueryCommand cmd = createBatchQueryCommand(sql, options, autoCommit, batch, handler); diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultBuilder.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultBuilder.java index c5eedb955..8998ccdb0 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultBuilder.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultBuilder.java @@ -22,6 +22,8 @@ import io.vertx.core.internal.PromiseInternal; import io.vertx.sqlclient.PropertyKind; import io.vertx.sqlclient.SqlResult; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.RowDesc; import java.util.function.Function; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowBase.java index e48f515ce..cb21b48f2 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowBase.java @@ -1,6 +1,8 @@ package io.vertx.sqlclient.impl; import io.vertx.sqlclient.Tuple; +import io.vertx.sqlclient.internal.ArrayTuple; +import io.vertx.sqlclient.internal.RowInternal; import java.util.Collection; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDecoder.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDecoder.java index 8336094e7..eb4b70592 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDecoder.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDecoder.java @@ -19,6 +19,7 @@ import io.netty.buffer.ByteBuf; import io.vertx.sqlclient.Row; +import io.vertx.sqlclient.internal.RowInternal; import java.util.function.BiConsumer; import java.util.stream.Collector; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowSetImpl.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowSetImpl.java index 69e07438e..4af7f564d 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowSetImpl.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowSetImpl.java @@ -27,9 +27,9 @@ import java.util.function.Function; import java.util.stream.Collector; -class RowSetImpl extends SqlResultBase> implements RowSet { +public class RowSetImpl extends SqlResultBase> implements RowSet { - static Collector, RowSet> COLLECTOR = Collector.of( + public static Collector, RowSet> COLLECTOR = Collector.of( RowSetImpl::new, RowSetImpl::add, (set1, set2) -> null, // Shall not be invoked as this is sequential @@ -45,7 +45,7 @@ static Collector, RowSet> collector(Function m ); } - static Function, RowSetImpl> FACTORY = rs -> (RowSetImpl) rs; + public static Function, RowSetImpl> FACTORY = rs -> (RowSetImpl) rs; static Function, RowSetImpl> factory() { return rs -> (RowSetImpl) rs; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java index d3db7b324..06bffd800 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java @@ -38,7 +38,9 @@ import io.vertx.sqlclient.SqlConnectOptions; import io.vertx.sqlclient.impl.cache.PreparedStatementCache; import io.vertx.sqlclient.impl.codec.InvalidCachedStatementEvent; -import io.vertx.sqlclient.impl.command.*; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.command.*; +import io.vertx.sqlclient.internal.PreparedStatement; import io.vertx.sqlclient.spi.DatabaseMetadata; import java.util.ArrayDeque; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TransactionImpl.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TransactionImpl.java index dd149f9b4..d2e81933a 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TransactionImpl.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TransactionImpl.java @@ -24,8 +24,9 @@ import io.vertx.core.internal.PromiseInternal; import io.vertx.sqlclient.Transaction; import io.vertx.sqlclient.TransactionRollbackException; -import io.vertx.sqlclient.impl.command.CommandBase; -import io.vertx.sqlclient.impl.command.TxCommand; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.command.CommandBase; +import io.vertx.sqlclient.internal.command.TxCommand; public class TransactionImpl implements Transaction { @@ -38,14 +39,14 @@ public class TransactionImpl implements Transaction { private boolean failed; private TxCommand endCommand; - TransactionImpl(ContextInternal context, Handler endHandler, Connection connection) { + public TransactionImpl(ContextInternal context, Handler endHandler, Connection connection) { this.context = context; this.connection = connection; this.completion = context.promise(); this.endHandler = endHandler; } - Future begin() { + public Future begin() { PromiseInternal promise = context.promise(); TxCommand begin = new TxCommand<>(TxCommand.Kind.BEGIN, this); begin.handler = wrap(begin, promise); diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/cache/PreparedStatementCache.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/cache/PreparedStatementCache.java index 4c9232f1f..445b224b1 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/cache/PreparedStatementCache.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/cache/PreparedStatementCache.java @@ -11,7 +11,7 @@ package io.vertx.sqlclient.impl.cache; -import io.vertx.sqlclient.impl.PreparedStatement; +import io.vertx.sqlclient.internal.PreparedStatement; import java.util.List; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java index 5cb812792..e9534bfcb 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java @@ -22,10 +22,10 @@ import io.vertx.core.internal.ContextInternal; import io.vertx.core.internal.VertxInternal; import io.vertx.sqlclient.SqlConnection; -import io.vertx.sqlclient.impl.Connection; -import io.vertx.sqlclient.impl.SqlConnectionBase; -import io.vertx.sqlclient.impl.command.CommandBase; -import io.vertx.sqlclient.impl.command.QueryCommandBase; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.SqlConnectionBase; +import io.vertx.sqlclient.internal.command.CommandBase; +import io.vertx.sqlclient.internal.command.QueryCommandBase; import io.vertx.sqlclient.impl.tracing.QueryReporter; import io.vertx.sqlclient.spi.ConnectionFactory; import io.vertx.sqlclient.spi.DatabaseMetadata; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/tracing/QueryReporter.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/tracing/QueryReporter.java index 3b837612a..0ffc983c9 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/tracing/QueryReporter.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/tracing/QueryReporter.java @@ -8,11 +8,11 @@ import io.vertx.core.tracing.TracingPolicy; import io.vertx.core.internal.ContextInternal; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.Connection; +import io.vertx.sqlclient.internal.Connection; import io.vertx.sqlclient.impl.QueryResultBuilder; -import io.vertx.sqlclient.impl.command.ExtendedQueryCommand; -import io.vertx.sqlclient.impl.command.QueryCommandBase; -import io.vertx.sqlclient.impl.command.SimpleQueryCommand; +import io.vertx.sqlclient.internal.command.ExtendedQueryCommand; +import io.vertx.sqlclient.internal.command.QueryCommandBase; +import io.vertx.sqlclient.internal.command.SimpleQueryCommand; import java.util.Collections; import java.util.List; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ArrayTuple.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/ArrayTuple.java similarity index 98% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ArrayTuple.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/ArrayTuple.java index 46e2fcf90..49301095e 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ArrayTuple.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/ArrayTuple.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.sqlclient.Tuple; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/Connection.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/Connection.java similarity index 82% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/Connection.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/Connection.java index 6ec903c05..c564b7960 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/Connection.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/Connection.java @@ -15,15 +15,18 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.core.Promise; import io.vertx.core.net.SocketAddress; import io.vertx.core.spi.metrics.ClientMetrics; import io.vertx.core.tracing.TracingPolicy; -import io.vertx.sqlclient.impl.command.CommandScheduler; +import io.vertx.sqlclient.internal.command.CommandScheduler; import io.vertx.sqlclient.spi.DatabaseMetadata; +/** + * A connection capable of scheduling command execution. + */ public interface Connection extends CommandScheduler { /** @@ -63,6 +66,9 @@ default String system() { int getSecretKey(); + /** + * The connection holder that handles connection interactions with the outer world, e.g. handling an event. + */ interface Holder { void handleEvent(Object event); @@ -73,6 +79,9 @@ interface Holder { } + /** + * @return the most unwrapped connection (e.g. for pooled connections) + */ default Connection unwrap() { return this; } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ParamDesc.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/ParamDesc.java similarity index 95% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ParamDesc.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/ParamDesc.java index 39529a928..ec6dd3793 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/ParamDesc.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/ParamDesc.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; /** * @author Emad Alblueshi diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatement.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/PreparedStatement.java similarity index 95% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatement.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/PreparedStatement.java index 853173b2f..c22372835 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PreparedStatement.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/PreparedStatement.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; public interface PreparedStatement { diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultHandler.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/QueryResultHandler.java similarity index 96% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultHandler.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/QueryResultHandler.java index e676a24d0..ddaae2347 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultHandler.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/QueryResultHandler.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.sqlclient.PropertyKind; @@ -24,7 +24,7 @@ */ public interface QueryResultHandler { - QueryResultHandler NOOP_HANDLER = new QueryResultHandler() { + QueryResultHandler NOOP_HANDLER = new QueryResultHandler<>() { @Override public void addProperty(PropertyKind property, V value) { } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDesc.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowDesc.java similarity index 98% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDesc.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowDesc.java index d0671c45a..a71f3feee 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowDesc.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowDesc.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.sqlclient.desc.ColumnDescriptor; @@ -26,7 +26,6 @@ /** * @author Emad Alblueshi */ - public abstract class RowDesc { private final ColumnNames columnNames; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowInternal.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowInternal.java similarity index 90% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowInternal.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowInternal.java index a5ec91be0..1609bface 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/RowInternal.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/RowInternal.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.sqlclient.Row; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlClientBase.java similarity index 93% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientBase.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlClientBase.java index 83371932a..bf65e2109 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlClientBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlClientBase.java @@ -15,15 +15,19 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.core.internal.ContextInternal; import io.vertx.core.internal.PromiseInternal; import io.vertx.sqlclient.PrepareOptions; import io.vertx.sqlclient.PreparedQuery; import io.vertx.sqlclient.Query; -import io.vertx.sqlclient.impl.command.CommandBase; -import io.vertx.sqlclient.impl.command.CommandScheduler; +import io.vertx.sqlclient.impl.QueryBase; +import io.vertx.sqlclient.impl.QueryExecutor; +import io.vertx.sqlclient.impl.RowSetImpl; +import io.vertx.sqlclient.impl.SqlClientInternal; +import io.vertx.sqlclient.internal.command.CommandBase; +import io.vertx.sqlclient.internal.command.CommandScheduler; import io.vertx.sqlclient.SqlResult; import io.vertx.sqlclient.RowSet; import io.vertx.sqlclient.Row; @@ -31,7 +35,7 @@ import io.vertx.sqlclient.Tuple; import io.vertx.core.Future; import io.vertx.core.Handler; -import io.vertx.sqlclient.impl.command.CompositeCommand; +import io.vertx.sqlclient.internal.command.CompositeCommand; import io.vertx.sqlclient.spi.Driver; import java.util.List; @@ -72,7 +76,7 @@ public PreparedQuery> preparedQuery(String sql, PrepareOptions optio return new PreparedQueryImpl<>(autoCommit(), false, sql, options, builder); } - boolean autoCommit() { + protected boolean autoCommit() { return true; } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java similarity index 94% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionBase.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java index da78b9c33..2b37009ca 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.core.*; import io.vertx.core.spi.metrics.ClientMetrics; @@ -26,9 +26,11 @@ import io.vertx.sqlclient.PreparedStatement; import io.vertx.sqlclient.SqlConnection; import io.vertx.sqlclient.Transaction; -import io.vertx.sqlclient.impl.command.CommandBase; -import io.vertx.sqlclient.impl.command.PrepareStatementCommand; -import io.vertx.sqlclient.impl.command.QueryCommandBase; +import io.vertx.sqlclient.impl.PreparedStatementImpl; +import io.vertx.sqlclient.impl.TransactionImpl; +import io.vertx.sqlclient.internal.command.CommandBase; +import io.vertx.sqlclient.internal.command.PrepareStatementCommand; +import io.vertx.sqlclient.internal.command.QueryCommandBase; import io.vertx.sqlclient.impl.pool.SqlConnectionPool; import io.vertx.sqlclient.impl.tracing.QueryReporter; import io.vertx.sqlclient.spi.ConnectionFactory; @@ -38,7 +40,7 @@ /** * @author Julien Viet */ -public class SqlConnectionBase> extends SqlClientBase implements SqlConnectionInternal, Closeable { +public class SqlConnectionBase> extends SqlClientBase implements SqlConnectionInternal, Closeable, Connection.Holder { private volatile Handler exceptionHandler; private volatile Handler closeHandler; @@ -182,7 +184,7 @@ public Transaction transaction() { } @Override - boolean autoCommit() { + protected boolean autoCommit() { return tx == null; } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionInternal.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionInternal.java similarity index 72% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionInternal.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionInternal.java index 957eb799d..bf2f1a7b4 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlConnectionInternal.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionInternal.java @@ -8,12 +8,15 @@ * * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.sqlclient.SqlConnection; -public interface SqlConnectionInternal extends SqlConnection, Connection.Holder { +public interface SqlConnectionInternal extends SqlConnection { + /** + * @return the {@link Connection} out of this user-facing connection + */ Connection unwrap(); } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TupleInternal.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/TupleInternal.java similarity index 97% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TupleInternal.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/TupleInternal.java index c45a6111c..4d9120353 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/TupleInternal.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/TupleInternal.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal; import io.vertx.sqlclient.Tuple; import io.vertx.sqlclient.data.NullValue; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseConnectionCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseConnectionCommand.java similarity index 94% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseConnectionCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseConnectionCommand.java index 04cadb17a..9cfa3606f 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseConnectionCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseConnectionCommand.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; public class CloseConnectionCommand extends CommandBase { @@ -23,5 +23,4 @@ public class CloseConnectionCommand extends CommandBase { private CloseConnectionCommand() { } - } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseCursorCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseCursorCommand.java similarity index 91% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseCursorCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseCursorCommand.java index b71b3d7e1..f1f2bdee7 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseCursorCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseCursorCommand.java @@ -15,9 +15,9 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; -import io.vertx.sqlclient.impl.PreparedStatement; +import io.vertx.sqlclient.internal.PreparedStatement; /** * @author Julien Viet diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseStatementCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseStatementCommand.java similarity index 90% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseStatementCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseStatementCommand.java index d74ad42eb..03eb2bcfa 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CloseStatementCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CloseStatementCommand.java @@ -15,9 +15,9 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; -import io.vertx.sqlclient.impl.PreparedStatement; +import io.vertx.sqlclient.internal.PreparedStatement; /** * @author Julien Viet diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandBase.java similarity index 96% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandBase.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandBase.java index 2e3e7360d..c591c96f8 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandBase.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.core.AsyncResult; import io.vertx.core.Future; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandResponse.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandResponse.java similarity index 96% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandResponse.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandResponse.java index 6c2bcfce6..85c123f6f 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandResponse.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandResponse.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.core.Future; import io.vertx.core.AsyncResult; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandScheduler.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandScheduler.java similarity index 94% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandScheduler.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandScheduler.java index ba04f4718..087cbdbcc 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CommandScheduler.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CommandScheduler.java @@ -14,7 +14,7 @@ * limitations under the License. * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.core.Future; import io.vertx.core.internal.ContextInternal; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CompositeCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CompositeCommand.java similarity index 92% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CompositeCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CompositeCommand.java index 7944b93d1..87b7a38e2 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/CompositeCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/CompositeCommand.java @@ -1,4 +1,4 @@ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.core.Future; import io.vertx.core.internal.ContextInternal; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/ExtendedQueryCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/ExtendedQueryCommand.java similarity index 95% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/ExtendedQueryCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/ExtendedQueryCommand.java index 3d70a8fed..dd44fb5b0 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/ExtendedQueryCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/ExtendedQueryCommand.java @@ -15,14 +15,14 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.sqlclient.PrepareOptions; import io.vertx.sqlclient.Row; import io.vertx.sqlclient.Tuple; -import io.vertx.sqlclient.impl.PreparedStatement; -import io.vertx.sqlclient.impl.QueryResultHandler; -import io.vertx.sqlclient.impl.TupleInternal; +import io.vertx.sqlclient.internal.PreparedStatement; +import io.vertx.sqlclient.internal.QueryResultHandler; +import io.vertx.sqlclient.internal.TupleInternal; import java.util.List; import java.util.stream.Collector; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/InitCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/InitCommand.java similarity index 88% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/InitCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/InitCommand.java index 5e17ea846..6f27d4bdd 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/InitCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/InitCommand.java @@ -15,9 +15,9 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; -import io.vertx.sqlclient.impl.Connection; +import io.vertx.sqlclient.internal.Connection; import io.vertx.sqlclient.impl.SocketConnectionBase; import java.util.Map; @@ -29,14 +29,14 @@ */ public class InitCommand extends CommandBase { - private final SocketConnectionBase conn; + private final Connection conn; private final String username; private final String password; private final String database; private final Map properties; public InitCommand( - SocketConnectionBase conn, + Connection conn, String username, String password, String database, @@ -48,7 +48,7 @@ public InitCommand( this.properties = properties; } - public SocketConnectionBase connection() { + public Connection connection() { return conn; } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/PrepareStatementCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/PrepareStatementCommand.java similarity index 95% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/PrepareStatementCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/PrepareStatementCommand.java index eb9f50b16..0b2e8409e 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/PrepareStatementCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/PrepareStatementCommand.java @@ -15,10 +15,10 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.sqlclient.PrepareOptions; -import io.vertx.sqlclient.impl.PreparedStatement; +import io.vertx.sqlclient.internal.PreparedStatement; import java.util.List; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/QueryCommandBase.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/QueryCommandBase.java similarity index 94% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/QueryCommandBase.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/QueryCommandBase.java index 132e5eb0a..90b3604ae 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/QueryCommandBase.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/QueryCommandBase.java @@ -15,10 +15,10 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.QueryResultHandler; +import io.vertx.sqlclient.internal.QueryResultHandler; import java.util.function.Function; import java.util.stream.Collector; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/SimpleQueryCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/SimpleQueryCommand.java similarity index 93% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/SimpleQueryCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/SimpleQueryCommand.java index 8e673eb9b..ff224fbb4 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/SimpleQueryCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/SimpleQueryCommand.java @@ -15,10 +15,10 @@ * */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; import io.vertx.sqlclient.Row; -import io.vertx.sqlclient.impl.QueryResultHandler; +import io.vertx.sqlclient.internal.QueryResultHandler; import java.util.stream.Collector; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/TxCommand.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/TxCommand.java similarity index 94% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/TxCommand.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/TxCommand.java index 96a05a84d..d2afc7519 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/command/TxCommand.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/command/TxCommand.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 */ -package io.vertx.sqlclient.impl.command; +package io.vertx.sqlclient.internal.command; public class TxCommand extends CommandBase { diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CloseablePool.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/CloseablePool.java similarity index 94% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CloseablePool.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/CloseablePool.java index 44cb77416..a3b049b5a 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/CloseablePool.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/CloseablePool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal.pool; import io.vertx.codegen.annotations.Nullable; import io.vertx.core.Future; @@ -23,11 +23,12 @@ import io.vertx.core.internal.PromiseInternal; import io.vertx.core.internal.VertxInternal; import io.vertx.sqlclient.*; +import io.vertx.sqlclient.impl.SqlClientInternal; import io.vertx.sqlclient.spi.Driver; import java.util.function.Function; -public class CloseablePool

implements Pool, SqlClientInternal { +public class CloseablePool implements Pool, SqlClientInternal { private final VertxInternal vertx; private final CloseFuture closeFuture; diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolImpl.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/PoolImpl.java similarity index 95% rename from vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolImpl.java rename to vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/PoolImpl.java index ddb77c55e..bb41d33d6 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/PoolImpl.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/pool/PoolImpl.java @@ -15,7 +15,7 @@ * */ -package io.vertx.sqlclient.impl; +package io.vertx.sqlclient.internal.pool; import io.vertx.codegen.annotations.Nullable; import io.vertx.core.*; @@ -24,8 +24,11 @@ import io.vertx.core.internal.PromiseInternal; import io.vertx.core.internal.VertxInternal; import io.vertx.sqlclient.*; -import io.vertx.sqlclient.impl.command.CommandBase; import io.vertx.sqlclient.impl.pool.SqlConnectionPool; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.SqlClientBase; +import io.vertx.sqlclient.internal.SqlConnectionInternal; +import io.vertx.sqlclient.internal.command.CommandBase; import io.vertx.sqlclient.spi.Driver; import java.util.function.Function; @@ -80,7 +83,7 @@ private void initializeConnection(SqlConnectionPool.PooledConnection conn) { if (connectionInitializer != null) { ContextInternal current = vertx.getContext(); SqlConnectionInternal wrapper = driver.wrapConnection(current, conn.factory(), conn); - conn.init(wrapper); + conn.init((Connection.Holder) wrapper); current.dispatch(wrapper, connectionInitializer); } } @@ -129,7 +132,7 @@ public Future getConnection() { acquire(current, connectionTimeout, promise); return promise.future().map(conn -> { SqlConnectionInternal wrapper = driver.wrapConnection(current, conn.factory(), conn); - conn.init(wrapper); + conn.init((Connection.Holder) wrapper); return wrapper; }); } diff --git a/vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java b/vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java index c232381dc..1e6fb98fb 100644 --- a/vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java +++ b/vertx-sql-client/src/main/java/io/vertx/sqlclient/spi/Driver.java @@ -28,7 +28,9 @@ import io.vertx.sqlclient.PoolOptions; import io.vertx.sqlclient.SqlConnectOptions; import io.vertx.sqlclient.SqlConnection; -import io.vertx.sqlclient.impl.*; +import io.vertx.sqlclient.internal.Connection; +import io.vertx.sqlclient.internal.SqlConnectionBase; +import io.vertx.sqlclient.internal.SqlConnectionInternal; import java.util.function.Supplier; diff --git a/vertx-sql-client/src/main/java/module-info.java b/vertx-sql-client/src/main/java/module-info.java new file mode 100644 index 000000000..52b07f321 --- /dev/null +++ b/vertx-sql-client/src/main/java/module-info.java @@ -0,0 +1,32 @@ +module io.vertx.client.sql { + + requires io.netty.buffer; + requires io.netty.codec; + requires io.netty.transport; + requires transitive io.vertx.core; + requires io.vertx.core.logging; + requires java.sql; + + requires static io.vertx.codegen.api; + requires static io.vertx.codegen.json; + + exports io.vertx.sqlclient; + exports io.vertx.sqlclient.data; + exports io.vertx.sqlclient.desc; + exports io.vertx.sqlclient.spi; + + // Expose enough for implementing a client back-end on top of this API (e.g. vertx-jdbc-client) + + exports io.vertx.sqlclient.internal; + exports io.vertx.sqlclient.internal.command; + exports io.vertx.sqlclient.internal.pool; + + // Expose impl to our own implementation, this actually would deserve to be in another module since it is not + // related to the API or the internal API + + exports io.vertx.sqlclient.impl to io.vertx.client.sql.pg, io.vertx.client.sql.mysql, io.vertx.client.sql.mssql, io.vertx.client.sql.db2, io.vertx.client.sql.templates; + exports io.vertx.sqlclient.impl.codec to io.vertx.client.sql.pg, io.vertx.client.sql.mysql, io.vertx.client.sql.mssql, io.vertx.client.sql.db2; + exports io.vertx.sqlclient.impl.cache to io.vertx.client.sql.mysql, io.vertx.client.sql.mssql, io.vertx.client.sql.db2; + exports io.vertx.sqlclient.impl.pool; + +} diff --git a/vertx-sql-client/src/main/resources/META-INF/MANIFEST.MF b/vertx-sql-client/src/main/resources/META-INF/MANIFEST.MF index 3874521de..e69de29bb 100644 --- a/vertx-sql-client/src/main/resources/META-INF/MANIFEST.MF +++ b/vertx-sql-client/src/main/resources/META-INF/MANIFEST.MF @@ -1,2 +0,0 @@ -Automatic-Module-Name: io.vertx.client.sql - diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java b/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java index 3ecf1d1c7..bb217eff9 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java +++ b/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/ArrayTupleTest.java @@ -18,6 +18,7 @@ package io.vertx.sqlclient.impl; import io.vertx.sqlclient.Tuple; +import io.vertx.sqlclient.internal.ArrayTuple; import org.junit.Test; import static org.junit.Assert.assertEquals; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java b/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java index e16199004..71ba8af67 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java +++ b/vertx-sql-client/src/test/java/io/vertx/sqlclient/impl/TestRowDesc.java @@ -12,6 +12,7 @@ package io.vertx.sqlclient.impl; import io.vertx.sqlclient.desc.ColumnDescriptor; +import io.vertx.sqlclient.internal.RowDesc; import java.sql.JDBCType; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java b/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java index 05657154f..8b34680de 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/ConnectionTestBase.java @@ -16,7 +16,7 @@ import io.vertx.ext.unit.TestContext; import io.vertx.sqlclient.SqlConnectOptions; import io.vertx.sqlclient.SqlConnection; -import io.vertx.sqlclient.impl.SqlConnectionBase; +import io.vertx.sqlclient.internal.SqlConnectionBase; import io.vertx.sqlclient.spi.ConnectionFactory; import io.vertx.sqlclient.spi.DatabaseMetadata; import org.junit.After; diff --git a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java b/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java index 427c75a5a..0548c8bf1 100644 --- a/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java +++ b/vertx-sql-client/src/test/java/io/vertx/sqlclient/tck/TracingTestBase.java @@ -18,7 +18,6 @@ import io.vertx.core.spi.tracing.SpanKind; import io.vertx.core.spi.tracing.TagExtractor; import io.vertx.core.spi.tracing.VertxTracer; -import io.vertx.core.tracing.TracingOptions; import io.vertx.core.tracing.TracingPolicy; import io.vertx.ext.unit.Async; import io.vertx.ext.unit.TestContext;