Skip to content

Commit 813c276

Browse files
vietjvietj
committed
Various cleanups
1 parent c115ed2 commit 813c276

File tree

13 files changed

+113
-60
lines changed

13 files changed

+113
-60
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ public String system() {
132132
}
133133

134134
@Override
135-
public DatabaseMetadata getDatabaseMetaData() {
135+
public DatabaseMetadata databaseMetadata() {
136136
return connMetadata.getDbMetadata();
137137
}
138138

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ public String system() {
196196
}
197197

198198
@Override
199-
public DatabaseMetadata getDatabaseMetaData() {
199+
public DatabaseMetadata databaseMetadata() {
200200
return databaseMetadata;
201201
}
202202

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public String system() {
157157
}
158158

159159
@Override
160-
public DatabaseMetadata getDatabaseMetaData() {
160+
public DatabaseMetadata databaseMetadata() {
161161
return metaData;
162162
}
163163
}

‎vertx-oracle-client/src/main/java/io/vertx/oracleclient/impl/OracleJdbcConnection.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.vertx.oracleclient.impl.commands.*;
2323
import io.vertx.sqlclient.spi.connection.Connection;
2424
import io.vertx.sqlclient.spi.DatabaseMetadata;
25+
import io.vertx.sqlclient.spi.connection.ConnectionContext;
2526
import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
2627
import io.vertx.sqlclient.spi.protocol.CloseCursorCommand;
2728
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
@@ -53,7 +54,7 @@ public class OracleJdbcConnection implements Connection {
5354
private final OracleConnectOptions options;
5455
@SuppressWarnings("rawtypes")
5556
private final ConcurrentMap<String, RowReader> cursors = new ConcurrentHashMap<>();
56-
private Holder holder;
57+
private ConnectionContext holder;
5758

5859
// Command pipeline state
5960
@SuppressWarnings("rawtypes")
@@ -75,11 +76,6 @@ public ClientMetrics metrics() {
7576
return metrics;
7677
}
7778

78-
@Override
79-
public int pipeliningLimit() {
80-
return 1;
81-
}
82-
8379
@Override
8480
public TracingPolicy tracingPolicy() {
8581
return options.getTracingPolicy();
@@ -106,8 +102,8 @@ public SocketAddress server() {
106102
}
107103

108104
@Override
109-
public void init(Holder holder) {
110-
this.holder = holder;
105+
public void init(ConnectionContext context) {
106+
this.holder = context;
111107
}
112108

113109
@Override
@@ -126,12 +122,12 @@ public boolean isValid() {
126122
}
127123

128124
@Override
129-
public DatabaseMetadata getDatabaseMetaData() {
125+
public DatabaseMetadata databaseMetadata() {
130126
return metadata;
131127
}
132128

133129
@Override
134-
public void close(Holder holder, Completable<Void> promise) {
130+
public void close(ConnectionContext holder, Completable<Void> promise) {
135131
if (Vertx.currentContext() == context) {
136132
Future<Void> future;
137133
if (closePromise == null) {

‎vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public int getSecretKey() {
140140
}
141141

142142
@Override
143-
public DatabaseMetadata getDatabaseMetaData() {
143+
public DatabaseMetadata databaseMetadata() {
144144
return dbMetaData;
145145
}
146146

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SocketConnectionBase.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import io.vertx.sqlclient.spi.connection.Connection;
3737
import io.vertx.sqlclient.internal.PreparedStatement;
3838
import io.vertx.sqlclient.spi.DatabaseMetadata;
39+
import io.vertx.sqlclient.spi.connection.ConnectionContext;
3940
import io.vertx.sqlclient.spi.protocol.CloseConnectionCommand;
4041
import io.vertx.sqlclient.spi.protocol.CloseStatementCommand;
4142
import io.vertx.sqlclient.spi.protocol.CommandBase;
@@ -71,7 +72,7 @@ public enum Status {
7172
protected final PreparedStatementCache psCache;
7273
protected final ContextInternal context;
7374
private final Predicate<String> preparedStatementCacheSqlFilter;
74-
private Holder holder;
75+
private ConnectionContext holder;
7576
private final int pipeliningLimit;
7677

7778
// Command pipeline state
@@ -128,11 +129,11 @@ public String user() {
128129
}
129130

130131
@Override
131-
public DatabaseMetadata getDatabaseMetaData() {
132+
public DatabaseMetadata databaseMetadata() {
132133
return null;
133134
}
134135

135-
public Context context() {
136+
public io.vertx.core.Context context() {
136137
return context;
137138
}
138139

@@ -168,7 +169,7 @@ public boolean isValid() {
168169
}
169170

170171
@Override
171-
public void init(Holder holder) {
172+
public void init(ConnectionContext holder) {
172173
ContextInternal context = (ContextInternal) Vertx.currentContext();
173174
if (context == null || context.nettyEventLoop() != this.context.nettyEventLoop()) {
174175
throw new IllegalStateException();
@@ -180,7 +181,7 @@ public void init(Holder holder) {
180181
}
181182

182183
@Override
183-
public void close(Holder holder, Completable<Void> promise) {
184+
public void close(ConnectionContext holder, Completable<Void> promise) {
184185
if (Vertx.currentContext() == context) {
185186
Channel ch = socket.channelHandlerContext().channel();
186187
if (status == Status.CONNECTED) {
@@ -206,7 +207,7 @@ protected <R> void doSchedule(CommandBase<R> cmd, Completable<R> handler) {
206207
if (handler == null) {
207208
throw new IllegalArgumentException();
208209
}
209-
Context context = Vertx.currentContext();
210+
io.vertx.core.Context context = Vertx.currentContext();
210211
if (context != this.context) {
211212
throw new IllegalStateException();
212213
}

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/PoolImpl.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.vertx.sqlclient.spi.connection.Connection;
3131
import io.vertx.sqlclient.internal.SqlClientBase;
3232
import io.vertx.sqlclient.internal.SqlConnectionInternal;
33+
import io.vertx.sqlclient.spi.connection.ConnectionContext;
3334
import io.vertx.sqlclient.spi.protocol.CommandBase;
3435
import io.vertx.sqlclient.spi.connection.ConnectionFactory;
3536
import io.vertx.sqlclient.spi.Driver;
@@ -99,7 +100,7 @@ private void initializeConnection(SqlConnectionPool.PooledConnection conn) {
99100
if (connectionInitializer != null) {
100101
ContextInternal current = vertx.getContext();
101102
SqlConnectionInternal wrapper = connectionWrapper.wrap(current, conn.factory(), conn);
102-
conn.init((Connection.Holder) wrapper);
103+
conn.init((ConnectionContext) wrapper);
103104
current.dispatch(wrapper, connectionInitializer);
104105
}
105106
}
@@ -148,7 +149,7 @@ public Future<SqlConnection> getConnection() {
148149
acquire(current, connectionTimeout, promise);
149150
return promise.future().map(conn -> {
150151
SqlConnectionInternal wrapper = connectionWrapper.wrap(current, conn.factory(), conn);
151-
conn.init((Connection.Holder) wrapper);
152+
conn.init((ConnectionContext) wrapper);
152153
return wrapper;
153154
});
154155
}

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import io.vertx.core.internal.VertxInternal;
2626
import io.vertx.sqlclient.SqlConnectOptions;
2727
import io.vertx.sqlclient.spi.connection.Connection;
28+
import io.vertx.sqlclient.spi.connection.ConnectionContext;
2829
import io.vertx.sqlclient.spi.protocol.CommandBase;
2930
import io.vertx.sqlclient.spi.protocol.QueryCommandBase;
3031
import io.vertx.sqlclient.impl.tracing.QueryReporter;
@@ -297,12 +298,12 @@ public Future<Void> close() {
297298
return promise.future();
298299
}
299300

300-
public class PooledConnection implements Connection, Connection.Holder {
301+
public class PooledConnection implements Connection, ConnectionContext {
301302

302303
private final ConnectionFactory factory;
303304
private final Connection conn;
304305
private final PoolConnector.Listener listener;
305-
private Holder holder;
306+
private ConnectionContext holder;
306307
private Promise<ConnectResult<PooledConnection>> poolCallback;
307308
private Lease<PooledConnection> lease;
308309
public long idleEvictionTimestamp;
@@ -366,8 +367,8 @@ public int pipeliningLimit() {
366367
}
367368

368369
@Override
369-
public DatabaseMetadata getDatabaseMetaData() {
370-
return conn.getDatabaseMetaData();
370+
public DatabaseMetadata databaseMetadata() {
371+
return conn.databaseMetadata();
371372
}
372373

373374
@Override
@@ -405,19 +406,19 @@ private void refresh() {
405406
}
406407

407408
@Override
408-
public void init(Holder holder) {
409+
public void init(ConnectionContext context) {
409410
if (this.holder != null) {
410411
throw new IllegalStateException();
411412
}
412-
this.holder = holder;
413+
this.holder = context;
413414
}
414415

415416
@Override
416-
public void close(Holder holder, Completable<Void> promise) {
417+
public void close(ConnectionContext holder, Completable<Void> promise) {
417418
doClose(holder, promise);
418419
}
419420

420-
private void doClose(Holder holder, Completable<Void> promise) {
421+
private void doClose(ConnectionContext holder, Completable<Void> promise) {
421422
if (holder != this.holder) {
422423
String msg;
423424
if (this.holder == null) {
@@ -473,9 +474,9 @@ public void handleEvent(Object event) {
473474
}
474475

475476
@Override
476-
public void handleException(Throwable err) {
477+
public void handleException(Throwable failure) {
477478
if (holder != null) {
478-
holder.handleException(err);
479+
holder.handleException(failure);
479480
}
480481
}
481482

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/PreparedStatement.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717

1818
package io.vertx.sqlclient.internal;
1919

20-
import io.vertx.sqlclient.Tuple;
21-
2220
import java.util.ArrayList;
2321
import java.util.List;
2422

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/internal/SqlConnectionBase.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import io.vertx.sqlclient.Transaction;
2929
import io.vertx.sqlclient.impl.PreparedStatementBase;
3030
import io.vertx.sqlclient.impl.TransactionImpl;
31+
import io.vertx.sqlclient.spi.connection.ConnectionContext;
3132
import io.vertx.sqlclient.spi.protocol.CommandBase;
3233
import io.vertx.sqlclient.spi.connection.Connection;
3334
import io.vertx.sqlclient.spi.protocol.PrepareStatementCommand;
@@ -41,7 +42,7 @@
4142
/**
4243
* @author <a href="mailto:[email protected]">Julien Viet</a>
4344
*/
44-
public class SqlConnectionBase<C extends SqlConnectionBase<C>> extends SqlClientBase implements SqlConnectionInternal, Closeable, Connection.Holder {
45+
public class SqlConnectionBase<C extends SqlConnectionBase<C>> extends SqlClientBase implements SqlConnectionInternal, Closeable, ConnectionContext {
4546

4647
private volatile Handler<Throwable> exceptionHandler;
4748
private volatile Handler<Void> closeHandler;
@@ -139,12 +140,12 @@ public <R> void schedule(CommandBase<R> cmd, Completable<R> handler) {
139140
}
140141

141142
@Override
142-
public void handleException(Throwable err) {
143+
public void handleException(Throwable failure) {
143144
Handler<Throwable> handler = exceptionHandler;
144145
if (handler != null) {
145-
context.emit(err, handler);
146+
context.emit(failure, handler);
146147
} else {
147-
err.printStackTrace();
148+
failure.printStackTrace();
148149
}
149150
}
150151

@@ -155,7 +156,7 @@ public boolean isSSL() {
155156

156157
@Override
157158
public DatabaseMetadata databaseMetadata() {
158-
return conn.getDatabaseMetaData();
159+
return conn.databaseMetadata();
159160
}
160161

161162
@Override

0 commit comments

Comments
 (0)