Skip to content

Commit d1cfb6c

Browse files
committed
Update to CompositeFuture changes
1 parent cc83994 commit d1cfb6c

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

vertx-mssql-client/src/test/java/io/vertx/mssqlclient/MSSQLQueriesTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.vertx.ext.unit.junit.RepeatRule;
2121
import io.vertx.ext.unit.junit.VertxUnitRunner;
2222
import io.vertx.sqlclient.Row;
23+
import io.vertx.sqlclient.RowSet;
2324
import io.vertx.sqlclient.Tuple;
2425
import io.vertx.sqlclient.data.NullValue;
2526
import org.junit.After;
@@ -35,6 +36,7 @@
3536
import java.util.Arrays;
3637
import java.util.Collections;
3738
import java.util.List;
39+
import java.util.stream.Collectors;
3840
import java.util.stream.Stream;
3941

4042
import static org.hamcrest.CoreMatchers.instanceOf;
@@ -185,14 +187,14 @@ public void testExecuteStoredProcedure(TestContext ctx) {
185187

186188
@Test
187189
public void testQuerySequences(TestContext ctx) {
188-
Future[] futures = Stream.of("tinyint", "smallint", "int", "bigint")
190+
List<Future<RowSet<Row>>> futures = Stream.of("tinyint", "smallint", "int", "bigint")
189191
.flatMap(type -> Stream.of(
190192
String.format("DROP SEQUENCE IF EXISTS seq_%s", type),
191193
String.format("CREATE SEQUENCE seq_%s AS %s", type, type)
192194
))
193195
.map(sql -> connection.query(sql).execute())
194-
.toArray(Future[]::new);
195-
CompositeFuture.all(Arrays.asList(futures)).onComplete(ctx.asyncAssertSuccess(cf -> {
196+
.collect(Collectors.toList());
197+
CompositeFuture.all(futures).onComplete(ctx.asyncAssertSuccess(cf -> {
196198
connection
197199
.query("SELECT * FROM INFORMATION_SCHEMA.SEQUENCES WHERE SEQUENCE_NAME LIKE 'seq_%'")
198200
.execute()

vertx-mysql-client/src/test/java/io/vertx/mysqlclient/MySQLPoolTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public void testNoConnectionLeaks(TestContext ctx) {
210210
.execute(params)
211211
.onComplete(ctx.asyncAssertSuccess(ids -> {
212212
CompositeFuture killAll = ids.value().stream()
213-
.<Future>map(connId -> conn.query("KILL " + connId).execute())
213+
.map(connId -> conn.query("KILL " + connId).execute())
214214
.collect(Collectors.collectingAndThen(toList(), CompositeFuture::all));
215215
killAll.compose(cf -> conn.close()).onComplete(ctx.asyncAssertSuccess(v -> killConnections.complete()));
216216
}));

vertx-pg-client/src/test/java/io/vertx/pgclient/PgBouncerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void testCursor() throws Exception {
119119
for (int i = 0;i < numConn;i++) {
120120
connections.add(PgConnection.connect(vertx, new PgConnectOptions(options).setUseLayer7Proxy(true)).toCompletionStage().toCompletableFuture().get(20, TimeUnit.SECONDS));
121121
}
122-
List<Future> list = new ArrayList<>();
122+
List<Future<?>> list = new ArrayList<>();
123123
for (int i = 0;i < numConn;i++) {
124124
int val = i;
125125
PgConnection conn = connections.get(i);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected ConnectionFactoryBase(VertxInternal vertx) {
4848
}
4949

5050
private void doClose(Promise<Void> p) {
51-
List<Future> futures = clients.values().stream().map(client -> client.close()).collect(Collectors.toList());
51+
List<Future<Void>> futures = clients.values().stream().map(client -> client.close()).collect(Collectors.toList());
5252

5353
CompositeFuture join = CompositeFuture.join(futures);
5454

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ public Future<Void> close() {
242242
Promise<Void> promise = vertx.promise();
243243
pool.close(ar1 -> {
244244
if (ar1.succeeded()) {
245-
List<Future> results = ar1
245+
List<Future<Void>> results = ar1
246246
.result()
247247
.stream()
248248
.map(connection -> connection

0 commit comments

Comments
 (0)