Skip to content

Commit 32ebb46

Browse files
vietjvietj
committed
Rename SqlTracer -> QueryTracer
1 parent ada9240 commit 32ebb46

File tree

17 files changed

+51
-51
lines changed

17 files changed

+51
-51
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import io.vertx.db2client.impl.command.PingCommand;
2727
import io.vertx.sqlclient.impl.Connection;
2828
import io.vertx.sqlclient.impl.SqlConnectionImpl;
29-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
29+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3030

3131
public class DB2ConnectionImpl extends SqlConnectionImpl<DB2ConnectionImpl> implements DB2Connection {
3232

@@ -38,21 +38,21 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
3838
} catch (Exception e) {
3939
return ctx.failedFuture(e);
4040
}
41-
SqlTracer tracer = ctx.tracer() == null ? null : new SqlTracer(ctx.tracer(), options);
41+
QueryTracer tracer = ctx.tracer() == null ? null : new QueryTracer(ctx.tracer(), options);
4242
Promise<DB2Connection> promise = ctx.promise();
4343
ctx.dispatch(null, v -> connect(client, ctx, tracer, promise));
4444
return promise.future();
4545
}
4646

47-
private static void connect(DB2ConnectionFactory client, ContextInternal ctx, SqlTracer tracer, Promise<DB2Connection> promise) {
47+
private static void connect(DB2ConnectionFactory client, ContextInternal ctx, QueryTracer tracer, Promise<DB2Connection> promise) {
4848
client.connect().map(conn -> {
4949
DB2ConnectionImpl db2Connection = new DB2ConnectionImpl(client, ctx, conn, tracer);
5050
conn.init(db2Connection);
5151
return (DB2Connection) db2Connection;
5252
}).onComplete(promise);
5353
}
5454

55-
public DB2ConnectionImpl(DB2ConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
55+
public DB2ConnectionImpl(DB2ConnectionFactory factory, ContextInternal context, Connection conn, QueryTracer tracer) {
5656
super(context, conn, tracer);
5757
}
5858

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
import io.vertx.sqlclient.impl.Connection;
2626
import io.vertx.sqlclient.impl.PoolBase;
2727
import io.vertx.sqlclient.impl.SqlConnectionImpl;
28-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
28+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2929

3030
public class DB2PoolImpl extends PoolBase<DB2PoolImpl> implements DB2Pool {
3131

3232
public static DB2PoolImpl create(ContextInternal context, boolean closeVertx, DB2ConnectOptions connectOptions,
3333
PoolOptions poolOptions) {
34-
SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
34+
QueryTracer tracer = context.tracer() == null ? null : new QueryTracer(context.tracer(), connectOptions);
3535
DB2PoolImpl pool = new DB2PoolImpl(context, poolOptions, new DB2ConnectionFactory(context, connectOptions), tracer);
3636
CloseFuture closeFuture = pool.closeFuture();
3737
if (closeVertx) {
@@ -44,7 +44,7 @@ public static DB2PoolImpl create(ContextInternal context, boolean closeVertx, DB
4444

4545
private final DB2ConnectionFactory factory;
4646

47-
private DB2PoolImpl(ContextInternal context, PoolOptions poolOptions, DB2ConnectionFactory factory, SqlTracer tracer) {
47+
private DB2PoolImpl(ContextInternal context, PoolOptions poolOptions, DB2ConnectionFactory factory, QueryTracer tracer) {
4848
super(context, factory, tracer, poolOptions);
4949
this.factory = factory;
5050
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
import io.vertx.core.Vertx;
2020
import io.vertx.sqlclient.impl.Connection;
2121
import io.vertx.sqlclient.impl.SqlConnectionImpl;
22-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
22+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2323

2424
public class MSSQLConnectionImpl extends SqlConnectionImpl<MSSQLConnectionImpl> implements MSSQLConnection {
2525
private final MSSQLConnectionFactory factory;
2626

27-
public MSSQLConnectionImpl(MSSQLConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
27+
public MSSQLConnectionImpl(MSSQLConnectionFactory factory, ContextInternal context, Connection conn, QueryTracer tracer) {
2828
super(context, conn, tracer);
2929
this.factory = factory;
3030
}
@@ -37,7 +37,7 @@ public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int cur
3737

3838
public static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions options) {
3939
ContextInternal ctx = (ContextInternal) vertx.getOrCreateContext();
40-
SqlTracer tracer = ctx.tracer() == null ? null : new SqlTracer(ctx.tracer(), options);
40+
QueryTracer tracer = ctx.tracer() == null ? null : new QueryTracer(ctx.tracer(), options);
4141
PromiseInternal<MSSQLConnection> promise = ctx.promise();
4242
MSSQLConnectionFactory client = new MSSQLConnectionFactory(ctx, options);
4343
ctx.dispatch(null, v -> {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
import io.vertx.sqlclient.impl.Connection;
2424
import io.vertx.sqlclient.impl.PoolBase;
2525
import io.vertx.sqlclient.impl.SqlConnectionImpl;
26-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
26+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2727

2828
import java.util.function.Function;
2929

3030
public class MSSQLPoolImpl extends PoolBase<MSSQLPoolImpl> implements MSSQLPool {
3131

3232
public static MSSQLPoolImpl create(ContextInternal context, boolean closeVertx, MSSQLConnectOptions connectOptions, PoolOptions poolOptions) {
33-
SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
33+
QueryTracer tracer = context.tracer() == null ? null : new QueryTracer(context.tracer(), connectOptions);
3434
MSSQLPoolImpl pool = new MSSQLPoolImpl(context, new MSSQLConnectionFactory(context, connectOptions), tracer, poolOptions);
3535
CloseFuture closeFuture = pool.closeFuture();
3636
if (closeVertx) {
@@ -43,7 +43,7 @@ public static MSSQLPoolImpl create(ContextInternal context, boolean closeVertx,
4343

4444
private final MSSQLConnectionFactory connectionFactory;
4545

46-
private MSSQLPoolImpl(ContextInternal context, MSSQLConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
46+
private MSSQLPoolImpl(ContextInternal context, MSSQLConnectionFactory factory, QueryTracer tracer, PoolOptions poolOptions) {
4747
super(context, factory, tracer, poolOptions);
4848
this.connectionFactory = factory;
4949
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import io.vertx.mysqlclient.impl.command.StatisticsCommand;
3232
import io.vertx.sqlclient.impl.Connection;
3333
import io.vertx.sqlclient.impl.SqlConnectionImpl;
34-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
34+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3535

3636
public class MySQLConnectionImpl extends SqlConnectionImpl<MySQLConnectionImpl> implements MySQLConnection {
3737

@@ -43,13 +43,13 @@ public static Future<MySQLConnection> connect(Vertx vertx, MySQLConnectOptions o
4343
} catch (Exception e) {
4444
return ctx.failedFuture(e);
4545
}
46-
SqlTracer tracer = ctx.tracer() == null ? null : new SqlTracer(ctx.tracer(), options);
46+
QueryTracer tracer = ctx.tracer() == null ? null : new QueryTracer(ctx.tracer(), options);
4747
Promise<MySQLConnection> promise = ctx.promise();
4848
ctx.dispatch(null, v -> connect(client, ctx, tracer, promise));
4949
return promise.future();
5050
}
5151

52-
private static void connect(MySQLConnectionFactory client, ContextInternal ctx, SqlTracer tracer, Promise<MySQLConnection> promise) {
52+
private static void connect(MySQLConnectionFactory client, ContextInternal ctx, QueryTracer tracer, Promise<MySQLConnection> promise) {
5353
client.connect()
5454
.map(conn -> {
5555
MySQLConnectionImpl mySQLConnection = new MySQLConnectionImpl(client, ctx, conn, tracer);
@@ -60,7 +60,7 @@ private static void connect(MySQLConnectionFactory client, ContextInternal ctx,
6060

6161
private final MySQLConnectionFactory factory;
6262

63-
public MySQLConnectionImpl(MySQLConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
63+
public MySQLConnectionImpl(MySQLConnectionFactory factory, ContextInternal context, Connection conn, QueryTracer tracer) {
6464
super(context, conn, tracer);
6565

6666
this.factory = factory;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
import io.vertx.sqlclient.impl.Connection;
2222
import io.vertx.sqlclient.impl.PoolBase;
2323
import io.vertx.sqlclient.impl.SqlConnectionImpl;
24-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
24+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2525

2626
public class MySQLPoolImpl extends PoolBase<MySQLPoolImpl> implements MySQLPool {
2727

2828
public static MySQLPoolImpl create(ContextInternal context, boolean closeVertx, MySQLConnectOptions connectOptions, PoolOptions poolOptions) {
29-
SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
29+
QueryTracer tracer = context.tracer() == null ? null : new QueryTracer(context.tracer(), connectOptions);
3030
MySQLPoolImpl pool = new MySQLPoolImpl(context, new MySQLConnectionFactory(context, connectOptions), tracer, poolOptions);
3131
CloseFuture closeFuture = pool.closeFuture();
3232
if (closeVertx) {
@@ -39,7 +39,7 @@ public static MySQLPoolImpl create(ContextInternal context, boolean closeVertx,
3939

4040
private final MySQLConnectionFactory factory;
4141

42-
private MySQLPoolImpl(ContextInternal context, MySQLConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
42+
private MySQLPoolImpl(ContextInternal context, MySQLConnectionFactory factory, QueryTracer tracer, PoolOptions poolOptions) {
4343
super(context, factory, tracer, poolOptions);
4444
this.factory = factory;
4545
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import io.vertx.core.Future;
2929
import io.vertx.core.Handler;
3030
import io.vertx.core.Vertx;
31-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
31+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3232

3333
public class PgConnectionImpl extends SqlConnectionImpl<PgConnectionImpl> implements PgConnection {
3434

@@ -39,7 +39,7 @@ public static Future<PgConnection> connect(ContextInternal context, PgConnectOpt
3939
PgConnectionFactory client = new PgConnectionFactory(context.owner(), context, options);
4040
return client.connect()
4141
.map(conn -> {
42-
SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), options);
42+
QueryTracer tracer = context.tracer() == null ? null : new QueryTracer(context.tracer(), options);
4343
PgConnectionImpl pgConn = new PgConnectionImpl(client, context, conn, tracer);
4444
conn.init(pgConn);
4545
return pgConn;
@@ -50,7 +50,7 @@ public static Future<PgConnection> connect(ContextInternal context, PgConnectOpt
5050
private final PgConnectionFactory factory;
5151
private volatile Handler<PgNotification> notificationHandler;
5252

53-
PgConnectionImpl(PgConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
53+
PgConnectionImpl(PgConnectionFactory factory, ContextInternal context, Connection conn, QueryTracer tracer) {
5454
super(context, conn, tracer);
5555

5656
this.factory = factory;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import io.vertx.sqlclient.impl.PoolBase;
2626
import io.vertx.sqlclient.impl.SqlConnectionImpl;
2727
import io.vertx.core.*;
28-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
28+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2929

3030
/**
3131
* Todo :
@@ -39,7 +39,7 @@
3939
public class PgPoolImpl extends PoolBase<PgPoolImpl> implements PgPool {
4040

4141
public static PgPoolImpl create(ContextInternal context, boolean closeVertx, PgConnectOptions connectOptions, PoolOptions poolOptions) {
42-
SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
42+
QueryTracer tracer = context.tracer() == null ? null : new QueryTracer(context.tracer(), connectOptions);
4343
PgPoolImpl pool = new PgPoolImpl(context, new PgConnectionFactory(context.owner(), context, connectOptions), tracer, poolOptions);
4444
CloseFuture closeFuture = pool.closeFuture();
4545
if (closeVertx) {
@@ -52,7 +52,7 @@ public static PgPoolImpl create(ContextInternal context, boolean closeVertx, PgC
5252

5353
private final PgConnectionFactory factory;
5454

55-
private PgPoolImpl(ContextInternal context, PgConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
55+
private PgPoolImpl(ContextInternal context, PgConnectionFactory factory, QueryTracer tracer, PoolOptions poolOptions) {
5656
super(context, factory, tracer, poolOptions);
5757
this.factory = factory;
5858
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import io.vertx.core.Future;
3232
import io.vertx.core.Handler;
3333
import io.vertx.sqlclient.impl.pool.ConnectionPool;
34-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
34+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3535

3636
import java.util.function.Function;
3737

@@ -46,7 +46,7 @@ public abstract class PoolBase<P extends Pool> extends SqlClientBase<P> implemen
4646
private final ConnectionPool pool;
4747
private final CloseFuture closeFuture;
4848

49-
public PoolBase(ContextInternal context, ConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
49+
public PoolBase(ContextInternal context, ConnectionFactory factory, QueryTracer tracer, PoolOptions poolOptions) {
5050
super(tracer);
5151
this.vertx = context.owner();
5252
this.factory = factory;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import io.vertx.sqlclient.Row;
3030
import io.vertx.sqlclient.Tuple;
3131
import io.vertx.core.*;
32-
import io.vertx.sqlclient.impl.tracing.SqlTracer;
32+
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3333

3434
import java.util.List;
3535
import java.util.concurrent.atomic.AtomicBoolean;
@@ -41,18 +41,18 @@
4141
*/
4242
class PreparedStatementImpl implements PreparedStatement {
4343

44-
static PreparedStatement create(Connection conn, SqlTracer tracer, ContextInternal context, io.vertx.sqlclient.impl.PreparedStatement ps, boolean autoCommit) {
44+
static PreparedStatement create(Connection conn, QueryTracer tracer, ContextInternal context, io.vertx.sqlclient.impl.PreparedStatement ps, boolean autoCommit) {
4545
return new PreparedStatementImpl(conn, tracer, context, ps, autoCommit);
4646
}
4747

4848
final Connection conn;
49-
final SqlTracer tracer;
49+
final QueryTracer tracer;
5050
final ContextInternal context;
5151
final io.vertx.sqlclient.impl.PreparedStatement ps;
5252
final boolean autoCommit;
5353
private final AtomicBoolean closed = new AtomicBoolean();
5454

55-
private PreparedStatementImpl(Connection conn, SqlTracer tracer, ContextInternal context, io.vertx.sqlclient.impl.PreparedStatement ps, boolean autoCommit) {
55+
private PreparedStatementImpl(Connection conn, QueryTracer tracer, ContextInternal context, io.vertx.sqlclient.impl.PreparedStatement ps, boolean autoCommit) {
5656
this.conn = conn;
5757
this.tracer = tracer;
5858
this.context = context;

0 commit comments

Comments
 (0)