Skip to content

Commit c115ed2

Browse files
committed
Move relevant packages to SPI
1 parent 2c2eac8 commit c115ed2

File tree

121 files changed

+255
-213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+255
-213
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
import io.vertx.core.spi.metrics.ClientMetrics;
2727
import io.vertx.core.spi.metrics.VertxMetrics;
2828
import io.vertx.db2client.DB2ConnectOptions;
29-
import io.vertx.sqlclient.SqlConnection;
30-
import io.vertx.sqlclient.internal.Connection;
29+
import io.vertx.sqlclient.spi.connection.Connection;
3130
import io.vertx.sqlclient.impl.ConnectionFactoryBase;
3231

3332
import java.util.Map;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
import io.vertx.db2client.DB2Connection;
2424
import io.vertx.db2client.impl.command.PingCommand;
2525
import io.vertx.db2client.spi.DB2Driver;
26-
import io.vertx.sqlclient.internal.Connection;
26+
import io.vertx.sqlclient.spi.connection.Connection;
2727
import io.vertx.sqlclient.internal.SqlConnectionBase;
28-
import io.vertx.sqlclient.spi.ConnectionFactory;
28+
import io.vertx.sqlclient.spi.connection.ConnectionFactory;
2929

3030
public class DB2ConnectionImpl extends SqlConnectionBase<DB2ConnectionImpl> implements DB2Connection {
3131

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,15 @@
3232
import io.vertx.db2client.impl.drda.ConnectionMetaData;
3333
import io.vertx.sqlclient.SqlConnectOptions;
3434
import io.vertx.sqlclient.impl.CommandMessage;
35-
import io.vertx.sqlclient.internal.Connection;
35+
import io.vertx.sqlclient.spi.connection.Connection;
3636
import io.vertx.sqlclient.internal.PreparedStatement;
3737
import io.vertx.sqlclient.internal.QueryResultHandler;
3838
import io.vertx.sqlclient.impl.SocketConnectionBase;
39-
import io.vertx.sqlclient.internal.command.*;
4039
import io.vertx.sqlclient.spi.DatabaseMetadata;
40+
import io.vertx.sqlclient.spi.protocol.CommandBase;
41+
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
42+
import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
43+
import io.vertx.sqlclient.spi.protocol.TxCommand;
4144

4245
import java.util.Map;
4346
import java.util.function.Predicate;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import io.netty.buffer.ByteBuf;
1919
import io.vertx.db2client.impl.drda.DRDAQueryRequest;
2020
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
21-
import io.vertx.sqlclient.internal.command.CloseConnectionCommand;
21+
import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
2222

2323
class CloseConnectionCommandCodec extends CommandCodec<Void, CloseConnectionCommand> {
2424

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import io.vertx.db2client.impl.codec.DB2PreparedStatement.QueryInstance;
2222
import io.vertx.db2client.impl.drda.DRDAQueryRequest;
2323
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
24-
import io.vertx.sqlclient.internal.command.CloseCursorCommand;
24+
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
2525
import io.vertx.sqlclient.impl.CommandResponse;
2626

2727
class CloseCursorCommandCodec extends CommandCodec<Void, CloseCursorCommand> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package io.vertx.db2client.impl.codec;
1717

1818
import io.netty.buffer.ByteBuf;
19-
import io.vertx.sqlclient.internal.command.CloseStatementCommand;
19+
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
2020
import io.vertx.sqlclient.impl.CommandResponse;
2121

2222
class CloseStatementCommandCodec extends CommandCodec<Void, CloseStatementCommand> {

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,13 @@
2020
import io.vertx.db2client.impl.command.InitialHandshakeCommand;
2121
import io.vertx.db2client.impl.command.PingCommand;
2222
import io.vertx.sqlclient.impl.CommandMessage;
23-
import io.vertx.sqlclient.internal.command.CloseConnectionCommand;
24-
import io.vertx.sqlclient.internal.command.CloseCursorCommand;
25-
import io.vertx.sqlclient.internal.command.CloseStatementCommand;
26-
import io.vertx.sqlclient.internal.command.CommandBase;
23+
import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
24+
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
25+
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
26+
import io.vertx.sqlclient.spi.protocol.CommandBase;
2727
import io.vertx.sqlclient.impl.CommandResponse;
28-
import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
29-
import io.vertx.sqlclient.internal.command.PrepareStatementCommand;
30-
import io.vertx.sqlclient.internal.command.SimpleQueryCommand;
28+
import io.vertx.sqlclient.spi.protocol.PrepareStatementCommand;
29+
import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
3130

3231
public abstract class CommandCodec<R, C extends CommandBase<R>> extends CommandMessage<R, C> {
3332

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import io.vertx.sqlclient.Tuple;
3030
import io.vertx.sqlclient.internal.TupleInternal;
3131
import io.vertx.sqlclient.impl.CommandResponse;
32-
import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
32+
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
3333

3434
public class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
3535

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import io.vertx.sqlclient.Tuple;
2929
import io.vertx.sqlclient.data.Numeric;
3030
import io.vertx.sqlclient.impl.CommandResponse;
31-
import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
31+
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
3232

3333
abstract class ExtendedQueryCommandBaseCodec<R, C extends ExtendedQueryCommand<R>>
3434
extends QueryCommandBaseCodec<R, C> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import io.vertx.db2client.impl.drda.DRDAQueryRequest;
2121
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
2222
import io.vertx.sqlclient.impl.CommandResponse;
23-
import io.vertx.sqlclient.internal.command.ExtendedQueryCommand;
23+
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
2424

2525
public class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
2626

0 commit comments

Comments
 (0)