Skip to content

Commit ada9240

Browse files
vietjvietj
committed
A few internal renaming
1 parent c950b72 commit ada9240

File tree

6 files changed

+45
-48
lines changed

6 files changed

+45
-48
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class CursorImpl implements Cursor {
3939

4040
private String id;
4141
private boolean closed;
42-
private SqlResultHandler<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> result;
42+
private QueryResultBuilder<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> result;
4343

4444
CursorImpl(PreparedStatementImpl ps, ContextInternal context, TupleInternal params) {
4545
this.ps = ps;
@@ -66,7 +66,7 @@ public void read(int count, Handler<AsyncResult<RowSet<Row>>> handler) {
6666
@Override
6767
public synchronized Future<RowSet<Row>> read(int count) {
6868
Promise<RowSet<Row>> promise = context.promise();
69-
SqlResultBuilder<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new SqlResultBuilder<>(ps.tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
69+
QueryExecutor<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new QueryExecutor<>(ps.tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
7070
if (id == null) {
7171
id = UUID.randomUUID().toString();
7272
result = builder.executeExtendedQuery(ps.conn, ps.ps, ps.autoCommit, params, count, id, false, promise);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ private PreparedStatementImpl(Connection conn, SqlTracer tracer, ContextInternal
6262

6363
@Override
6464
public PreparedQuery<RowSet<Row>> query() {
65-
SqlResultBuilder<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new SqlResultBuilder<>(tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
65+
QueryExecutor<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new QueryExecutor<>(tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
6666
return new PreparedStatementQuery<>(builder);
6767
}
6868

6969
<R, F extends SqlResult<R>> void execute(Tuple args,
7070
int fetch,
7171
String cursorId,
7272
boolean suspended,
73-
SqlResultBuilder<R, ?, F> builder,
73+
QueryExecutor<R, ?, F> builder,
7474
Promise<F> p) {
7575
if (context == Vertx.currentContext()) {
7676
builder.executeExtendedQuery(
@@ -113,7 +113,7 @@ public Future<Void> close() {
113113
}
114114

115115
<R, F extends SqlResult<R>> void executeBatch(List<Tuple> argsList,
116-
SqlResultBuilder<R, ?, F> builder,
116+
QueryExecutor<R, ?, F> builder,
117117
Promise<F> p) {
118118
if (context == Vertx.currentContext()) {
119119
builder.executeBatchQuery(conn, ps, autoCommit, argsList, p);
@@ -142,12 +142,12 @@ void closeCursor(String cursorId, Promise<Void> promise) {
142142

143143
private class PreparedStatementQuery<T, R extends SqlResult<T>> extends QueryBase<T, R> implements PreparedQuery<R> {
144144

145-
public PreparedStatementQuery(SqlResultBuilder<T, ?, R> builder) {
145+
public PreparedStatementQuery(QueryExecutor<T, ?, R> builder) {
146146
super(builder);
147147
}
148148

149149
@Override
150-
protected <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(SqlResultBuilder<T2, ?, R2> builder) {
150+
protected <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(QueryExecutor<T2, ?, R2> builder) {
151151
return new PreparedStatementQuery<>(builder);
152152
}
153153

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@
3131
*/
3232
abstract class QueryBase<T, R extends SqlResult<T>> implements Query<R> {
3333

34-
protected final SqlResultBuilder<T, ?, R> builder;
34+
protected final QueryExecutor<T, ?, R> builder;
3535

36-
public QueryBase(SqlResultBuilder<T, ?, R> builder) {
36+
public QueryBase(QueryExecutor<T, ?, R> builder) {
3737
this.builder = builder;
3838
}
3939

40-
protected abstract <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(SqlResultBuilder<T2, ?, R2> builder);
40+
protected abstract <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(QueryExecutor<T2, ?, R2> builder);
4141

4242
@Override
4343
public <U> Query<SqlResult<U>> collecting(Collector<Row, ?, U> collector) {
4444
Objects.requireNonNull(collector, "Supplied collector must not be null");
45-
return copy(new SqlResultBuilder<>(builder.tracer(), SqlResultImpl::new, collector));
45+
return copy(new QueryExecutor<>(builder.tracer(), SqlResultImpl::new, collector));
4646
}
4747

4848
@Override
4949
public <U> Query<RowSet<U>> mapping(Function<Row, U> mapper) {
5050
Objects.requireNonNull(mapper, "Supplied mapper must not be null");
51-
return copy(new SqlResultBuilder<>(builder.tracer(), RowSetImpl.factory(), RowSetImpl.collector(mapper)));
51+
return copy(new QueryExecutor<>(builder.tracer(), RowSetImpl.factory(), RowSetImpl.collector(mapper)));
5252
}
5353
}

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlResultBuilder.java renamed to ‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryExecutor.java

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@
3636
import java.util.stream.Collector;
3737

3838
/**
39-
* A query result handler for building a {@link SqlResult}.
39+
* Executes query.
4040
*/
41-
class SqlResultBuilder<T, R extends SqlResultBase<T>, L extends SqlResult<T>> {
41+
class QueryExecutor<T, R extends SqlResultBase<T>, L extends SqlResult<T>> {
4242

4343
private final SqlTracer tracer;
4444
private final Function<T, R> factory;
4545
private final Collector<Row, ?, T> collector;
4646

47-
public SqlResultBuilder(SqlTracer tracer,
48-
Function<T, R> factory,
49-
Collector<Row, ?, T> collector) {
47+
public QueryExecutor(SqlTracer tracer,
48+
Function<T, R> factory,
49+
Collector<Row, ?, T> collector) {
5050
this.tracer = tracer;
5151
this.factory = factory;
5252
this.collector = collector;
@@ -56,12 +56,8 @@ SqlTracer tracer() {
5656
return tracer;
5757
}
5858

59-
private SqlResultHandler<T, R, L> createHandler(Promise<L> promise) {
60-
return new SqlResultHandler<>(factory, null, null, promise);
61-
}
62-
63-
private SqlResultHandler<T, R, L> createHandler(Promise<L> promise, Object payload) {
64-
return new SqlResultHandler<>(factory, tracer, payload, promise);
59+
private QueryResultBuilder<T, R, L> createHandler(Promise<L> promise, Object payload) {
60+
return new QueryResultBuilder<>(factory, tracer, payload, promise);
6561
}
6662

6763
void executeSimpleQuery(CommandScheduler scheduler,
@@ -76,26 +72,26 @@ void executeSimpleQuery(CommandScheduler scheduler,
7672
} else {
7773
payload = null;
7874
}
79-
SqlResultHandler handler = createHandler(promise, payload);
75+
QueryResultBuilder handler = createHandler(promise, payload);
8076
scheduler.schedule(new SimpleQueryCommand<>(sql, singleton, autoCommit, collector, handler), handler);
8177
}
8278

83-
SqlResultHandler<T, R, L> executeExtendedQuery(CommandScheduler scheduler,
84-
PreparedStatement preparedStatement,
85-
boolean autoCommit,
86-
Tuple arguments,
87-
int fetch,
88-
String cursorId,
89-
boolean suspended,
90-
Promise<L> promise) {
79+
QueryResultBuilder<T, R, L> executeExtendedQuery(CommandScheduler scheduler,
80+
PreparedStatement preparedStatement,
81+
boolean autoCommit,
82+
Tuple arguments,
83+
int fetch,
84+
String cursorId,
85+
boolean suspended,
86+
Promise<L> promise) {
9187
ContextInternal context = (ContextInternal) promise.future().context();
9288
Object payload;
9389
if (tracer != null) {
9490
payload = tracer.sendRequest(context, preparedStatement.sql(), arguments);
9591
} else {
9692
payload = null;
9793
}
98-
SqlResultHandler handler = createHandler(promise, payload);
94+
QueryResultBuilder handler = createHandler(promise, payload);
9995
String msg = preparedStatement.prepare((TupleInternal) arguments);
10096
if (msg != null) {
10197
handler.fail(msg);
@@ -122,7 +118,7 @@ void executeExtendedQuery(CommandScheduler scheduler, String sql, boolean autoCo
122118
} else {
123119
payload = null;
124120
}
125-
SqlResultHandler handler = this.createHandler(promise, payload);
121+
QueryResultBuilder handler = this.createHandler(promise, payload);
126122
BiCommand<PreparedStatement, Boolean> cmd = new BiCommand<>(new PrepareStatementCommand(sql, true), ps -> {
127123
String msg = ps.prepare((TupleInternal) arguments);
128124
if (msg != null) {
@@ -136,7 +132,7 @@ void executeExtendedQuery(CommandScheduler scheduler, String sql, boolean autoCo
136132
private ExtendedQueryCommand<T> createExtendedQueryCommand(PreparedStatement preparedStatement,
137133
boolean autoCommit,
138134
Tuple args,
139-
SqlResultHandler<T, R, L> handler) {
135+
QueryResultBuilder<T, R, L> handler) {
140136
return new ExtendedQueryCommand<>(
141137
preparedStatement,
142138
args,
@@ -157,7 +153,7 @@ void executeBatchQuery(CommandScheduler scheduler,
157153
} else {
158154
payload = null;
159155
}
160-
SqlResultHandler handler = createHandler(promise, payload);
156+
QueryResultBuilder handler = createHandler(promise, payload);
161157
for (Tuple args : batch) {
162158
String msg = preparedStatement.prepare((TupleInternal)args);
163159
if (msg != null) {
@@ -177,7 +173,7 @@ void executeBatchQuery(CommandScheduler scheduler, String sql, boolean autoCommi
177173
} else {
178174
payload = null;
179175
}
180-
SqlResultHandler handler = this.createHandler(promise, payload);
176+
QueryResultBuilder handler = createHandler(promise, payload);
181177
BiCommand<PreparedStatement, Boolean> cmd = new BiCommand<>(new PrepareStatementCommand(sql, true), ps -> {
182178
for (Tuple args : batch) {
183179
String msg = ps.prepare((TupleInternal) args);
@@ -193,6 +189,7 @@ void executeBatchQuery(CommandScheduler scheduler, String sql, boolean autoCommi
193189
private ExtendedBatchQueryCommand<T> createBatchQueryCommand(PreparedStatement preparedStatement,
194190
boolean autoCommit,
195191
List<Tuple> argsList,
196-
SqlResultHandler<T, R, L> handler) {
192+
QueryResultBuilder<T, R, L> handler) {
197193
return new ExtendedBatchQueryCommand<>(preparedStatement, argsList, autoCommit, collector, handler);
198-
}}
194+
}
195+
}

‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/SqlResultHandler.java renamed to ‎vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/QueryResultBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@
2828
import java.util.function.Function;
2929

3030
/**
31-
* A query result handler for building a {@link SqlResult}.
31+
* A query result for building a {@link SqlResult}.
3232
*/
33-
class SqlResultHandler<T, R extends SqlResultBase<T>, L extends SqlResult<T>> implements QueryResultHandler<T>, Promise<Boolean> {
33+
class QueryResultBuilder<T, R extends SqlResultBase<T>, L extends SqlResult<T>> implements QueryResultHandler<T>, Promise<Boolean> {
3434

3535
private final Promise<L> handler;
3636
private final Function<T, R> factory;
@@ -42,7 +42,7 @@ class SqlResultHandler<T, R extends SqlResultBase<T>, L extends SqlResult<T>> im
4242
private Throwable failure;
4343
private boolean suspended;
4444

45-
SqlResultHandler(Function<T, R> factory, SqlTracer tracer, Object tracingPayload, Promise<L> handler) {
45+
QueryResultBuilder(Function<T, R> factory, SqlTracer tracer, Object tracingPayload, Promise<L> handler) {
4646
this.factory = factory;
4747
this.context = (ContextInternal) handler.future().context();
4848
this.tracer = tracer;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int cur
5555

5656
@Override
5757
public Query<RowSet<Row>> query(String sql) {
58-
SqlResultBuilder<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new SqlResultBuilder<>(tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
58+
QueryExecutor<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new QueryExecutor<>(tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
5959
return new QueryImpl<>(autoCommit(), false, sql, builder);
6060
}
6161

6262
@Override
6363
public PreparedQuery<RowSet<Row>> preparedQuery(String sql) {
64-
SqlResultBuilder<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new SqlResultBuilder<>(tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
64+
QueryExecutor<RowSet<Row>, RowSetImpl<Row>, RowSet<Row>> builder = new QueryExecutor<>(tracer, RowSetImpl.FACTORY, RowSetImpl.COLLECTOR);
6565
return new PreparedQueryImpl<>(autoCommit(), false, sql, builder);
6666
}
6767

@@ -75,15 +75,15 @@ private class QueryImpl<T, R extends SqlResult<T>> extends QueryBase<T, R> {
7575
protected final boolean singleton;
7676
protected final String sql;
7777

78-
private QueryImpl(boolean autoCommit, boolean singleton, String sql, SqlResultBuilder<T, ?, R> builder) {
78+
private QueryImpl(boolean autoCommit, boolean singleton, String sql, QueryExecutor<T, ?, R> builder) {
7979
super(builder);
8080
this.autoCommit = autoCommit;
8181
this.singleton = singleton;
8282
this.sql = sql;
8383
}
8484

8585
@Override
86-
protected <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(SqlResultBuilder<T2, ?, R2> builder) {
86+
protected <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(QueryExecutor<T2, ?, R2> builder) {
8787
return new QueryImpl<>(autoCommit, singleton, sql, builder);
8888
}
8989

@@ -106,7 +106,7 @@ protected void execute(Promise<R> promise) {
106106

107107
private class PreparedQueryImpl<T, R extends SqlResult<T>> extends QueryImpl<T, R> implements PreparedQuery<R> {
108108

109-
private PreparedQueryImpl(boolean autoCommit, boolean singleton, String sql, SqlResultBuilder<T, ?, R> builder) {
109+
private PreparedQueryImpl(boolean autoCommit, boolean singleton, String sql, QueryExecutor<T, ?, R> builder) {
110110
super(autoCommit, singleton, sql, builder);
111111
}
112112

@@ -121,7 +121,7 @@ public <U> PreparedQuery<RowSet<U>> mapping(Function<Row, U> mapper) {
121121
}
122122

123123
@Override
124-
protected <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(SqlResultBuilder<T2, ?, R2> builder) {
124+
protected <T2, R2 extends SqlResult<T2>> QueryBase<T2, R2> copy(QueryExecutor<T2, ?, R2> builder) {
125125
return new PreparedQueryImpl<>(autoCommit, singleton, sql, builder);
126126
}
127127

0 commit comments

Comments
 (0)