Skip to content

Commit 4ac1990

Browse files
committed
Extract the socket/codec classes in its own module.
Motivation: The vertx-sql-client component defines among all the base framework for Vert.x/Netty based implementations (e.g. PG client). This module intents to define the SQL client API as well as the SPI, there are implementations that do not use the Vert.x/Netty such as JDBC client or Oracle client. This extracts the Vert.x/Netty part into its own io.vertx.sql.client.codec module ensuring strong decoupling between with io.vertx.sql.client module. This new module intents to remain quite internal and is not an API usable from Vert.x by most users.
1 parent 9f67c06 commit 4ac1990

File tree

65 files changed

+186
-70
lines changed

Some content is hidden

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

65 files changed

+186
-70
lines changed

pom.xml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,13 @@
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
68+
69+
<!-- TMP -->
70+
<dependency>
71+
<groupId>io.vertx</groupId>
72+
<artifactId>vertx-sql-client-codec</artifactId>
73+
<version>${project.version}</version>
74+
</dependency>
6875
</dependencies>
6976
</dependencyManagement>
7077

@@ -184,6 +191,7 @@
184191
</activation>
185192
<modules>
186193
<module>vertx-sql-client</module>
194+
<module>vertx-sql-client-codec</module>
187195
<module>vertx-pg-client</module>
188196
<module>vertx-mysql-client</module>
189197
<module>vertx-mssql-client</module>
@@ -199,6 +207,7 @@
199207
</properties>
200208
<modules>
201209
<module>vertx-sql-client</module>
210+
<module>vertx-sql-client-codec</module>
202211
<module>vertx-pg-client</module>
203212
</modules>
204213
</profile>
@@ -209,6 +218,7 @@
209218
</properties>
210219
<modules>
211220
<module>vertx-sql-client</module>
221+
<module>vertx-sql-client-codec</module>
212222
<module>vertx-pg-client</module>
213223
</modules>
214224
</profile>
@@ -219,6 +229,7 @@
219229
</properties>
220230
<modules>
221231
<module>vertx-sql-client</module>
232+
<module>vertx-sql-client-codec</module>
222233
<module>vertx-pg-client</module>
223234
</modules>
224235
</profile>
@@ -230,6 +241,7 @@
230241
</properties>
231242
<modules>
232243
<module>vertx-sql-client</module>
244+
<module>vertx-sql-client-codec</module>
233245
<module>vertx-mysql-client</module>
234246
</modules>
235247
</profile>
@@ -241,6 +253,7 @@
241253
</properties>
242254
<modules>
243255
<module>vertx-sql-client</module>
256+
<module>vertx-sql-client-codec</module>
244257
<module>vertx-mysql-client</module>
245258
</modules>
246259
</profile>
@@ -252,6 +265,7 @@
252265
</properties>
253266
<modules>
254267
<module>vertx-sql-client</module>
268+
<module>vertx-sql-client-codec</module>
255269
<module>vertx-mysql-client</module>
256270
</modules>
257271
</profile>
@@ -263,6 +277,7 @@
263277
</properties>
264278
<modules>
265279
<module>vertx-sql-client</module>
280+
<module>vertx-sql-client-codec</module>
266281
<module>vertx-mysql-client</module>
267282
</modules>
268283
</profile>
@@ -273,6 +288,7 @@
273288
</properties>
274289
<modules>
275290
<module>vertx-sql-client</module>
291+
<module>vertx-sql-client-codec</module>
276292
<module>vertx-mssql-client</module>
277293
</modules>
278294
</profile>
@@ -283,20 +299,23 @@
283299
</properties>
284300
<modules>
285301
<module>vertx-sql-client</module>
302+
<module>vertx-sql-client-codec</module>
286303
<module>vertx-mssql-client</module>
287304
</modules>
288305
</profile>
289306
<profile>
290307
<id>DB2-11.5</id>
291308
<modules>
292309
<module>vertx-sql-client</module>
310+
<module>vertx-sql-client-codec</module>
293311
<module>vertx-db2-client</module>
294312
</modules>
295313
</profile>
296314
<profile>
297315
<id>SQL-templates</id>
298316
<modules>
299317
<module>vertx-sql-client</module>
318+
<module>vertx-sql-client-codec</module>
300319
<module>vertx-pg-client</module>
301320
<module>vertx-mysql-client</module>
302321
<module>vertx-sql-client-templates</module>
@@ -309,9 +328,10 @@
309328
</properties>
310329
<modules>
311330
<module>vertx-sql-client</module>
331+
<module>vertx-sql-client-codec</module>
312332
<module>vertx-oracle-client</module>
313333
</modules>
314334
</profile>
315335
</profiles>
316336

317-
</project>
337+
</project>

vertx-db2-client/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<groupId>io.vertx</groupId>
4848
<artifactId>vertx-sql-client</artifactId>
4949
</dependency>
50+
<dependency>
51+
<groupId>io.vertx</groupId>
52+
<artifactId>vertx-sql-client-codec</artifactId>
53+
</dependency>
5054

5155
<!-- Testing purposes -->
5256
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
import io.vertx.db2client.impl.command.InitialHandshakeCommand;
3232
import io.vertx.db2client.impl.drda.ConnectionMetaData;
3333
import io.vertx.sqlclient.SqlConnectOptions;
34-
import io.vertx.sqlclient.impl.connection.CommandMessage;
34+
import io.vertx.sqlclient.codec.CommandMessage;
3535
import io.vertx.sqlclient.spi.connection.Connection;
3636
import io.vertx.sqlclient.internal.PreparedStatement;
3737
import io.vertx.sqlclient.internal.QueryResultHandler;
38-
import io.vertx.sqlclient.impl.connection.SocketConnectionBase;
38+
import io.vertx.sqlclient.codec.SocketConnectionBase;
3939
import io.vertx.sqlclient.spi.DatabaseMetadata;
4040
import io.vertx.sqlclient.spi.protocol.CommandBase;
4141
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;

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
@@ -22,7 +22,7 @@
2222
import io.vertx.db2client.impl.drda.DRDAQueryRequest;
2323
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
2424
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
25-
import io.vertx.sqlclient.impl.connection.CommandResponse;
25+
import io.vertx.sqlclient.codec.CommandResponse;
2626

2727
class CloseCursorCommandCodec extends CommandCodec<Void, CloseCursorCommand> {
2828

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
@@ -17,7 +17,7 @@
1717

1818
import io.netty.buffer.ByteBuf;
1919
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
20-
import io.vertx.sqlclient.impl.connection.CommandResponse;
20+
import io.vertx.sqlclient.codec.CommandResponse;
2121

2222
class CloseStatementCommandCodec extends CommandCodec<Void, CloseStatementCommand> {
2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import io.vertx.core.Handler;
2020
import io.vertx.db2client.impl.command.InitialHandshakeCommand;
2121
import io.vertx.db2client.impl.command.PingCommand;
22-
import io.vertx.sqlclient.impl.connection.CommandMessage;
22+
import io.vertx.sqlclient.codec.CommandMessage;
2323
import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
2424
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
2525
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
2626
import io.vertx.sqlclient.spi.protocol.CommandBase;
27-
import io.vertx.sqlclient.impl.connection.CommandResponse;
27+
import io.vertx.sqlclient.codec.CommandResponse;
2828
import io.vertx.sqlclient.spi.protocol.PrepareStatementCommand;
2929
import io.vertx.sqlclient.spi.protocol.SimpleQueryCommand;
3030

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.vertx.core.internal.logging.Logger;
2626
import io.vertx.core.internal.logging.LoggerFactory;
2727
import io.vertx.db2client.DB2Exception;
28-
import io.vertx.sqlclient.impl.connection.CommandResponse;
28+
import io.vertx.sqlclient.codec.CommandResponse;
2929

3030
class DB2Decoder extends ByteToMessageDecoder {
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import io.vertx.core.internal.logging.Logger;
2525
import io.vertx.core.internal.logging.LoggerFactory;
2626
import io.vertx.db2client.impl.DB2SocketConnection;
27-
import io.vertx.sqlclient.impl.connection.CommandResponse;
27+
import io.vertx.sqlclient.codec.CommandResponse;
2828

2929
class DB2Encoder extends ChannelOutboundHandlerAdapter {
3030

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
@@ -28,7 +28,7 @@
2828
import io.vertx.db2client.impl.drda.DRDAQueryResponse;
2929
import io.vertx.sqlclient.Tuple;
3030
import io.vertx.sqlclient.internal.TupleInternal;
31-
import io.vertx.sqlclient.impl.connection.CommandResponse;
31+
import io.vertx.sqlclient.codec.CommandResponse;
3232
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
3333

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

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
@@ -27,7 +27,7 @@
2727
import io.vertx.sqlclient.Row;
2828
import io.vertx.sqlclient.Tuple;
2929
import io.vertx.sqlclient.data.Numeric;
30-
import io.vertx.sqlclient.impl.connection.CommandResponse;
30+
import io.vertx.sqlclient.codec.CommandResponse;
3131
import io.vertx.sqlclient.spi.protocol.ExtendedQueryCommand;
3232

3333
abstract class ExtendedQueryCommandBaseCodec<R, C extends ExtendedQueryCommand<R>>

0 commit comments

Comments
 (0)