Skip to content

Commit 5640164

Browse files
vietjvietj
authored
Merge pull request #1286 from eclipse-vertx/remove-callback-usage
Remove callback usage
2 parents 6577aab + 807ca6c commit 5640164

File tree

158 files changed

+3798
-1946
lines changed

Some content is hidden

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

158 files changed

+3798
-1946
lines changed

‎vertx-db2-client/src/main/java/examples/DB2ClientExamples.java

Lines changed: 77 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ public void gettingStarted() {
5757
// A simple query
5858
client
5959
.query("SELECT * FROM users WHERE id='julien'")
60-
.execute(ar -> {
60+
.execute()
61+
.onComplete(ar -> {
6162
if (ar.succeeded()) {
6263
RowSet<Row> result = ar.result();
6364
System.out.println("Got " + result.size() + " rows ");
@@ -86,9 +87,10 @@ public void configureFromDataObject(Vertx vertx) {
8687
// Create the pool from the data object
8788
DB2Pool pool = DB2Pool.pool(vertx, connectOptions, poolOptions);
8889

89-
pool.getConnection(ar -> {
90-
// Handling your connection
91-
});
90+
pool.getConnection()
91+
.onComplete(ar -> {
92+
// Handling your connection
93+
});
9294
}
9395

9496
public void configureFromUri(Vertx vertx) {
@@ -100,9 +102,10 @@ public void configureFromUri(Vertx vertx) {
100102
DB2Pool pool = DB2Pool.pool(connectionUri);
101103

102104
// Create the connection from the connection URI
103-
DB2Connection.connect(vertx, connectionUri, res -> {
104-
// Handling your connection
105-
});
105+
DB2Connection.connect(vertx, connectionUri)
106+
.onComplete(res -> {
107+
// Handling your connection
108+
});
106109
}
107110

108111
public void connecting01() {
@@ -259,44 +262,45 @@ public void connectSsl(Vertx vertx) {
259262
.setPath("/path/to/keystore.p12")
260263
.setPassword("keystoreSecret"));
261264

262-
DB2Connection.connect(vertx, options, res -> {
263-
if (res.succeeded()) {
264-
// Connected with SSL
265-
} else {
266-
System.out.println("Could not connect " + res.cause());
267-
}
268-
});
265+
DB2Connection.connect(vertx, options)
266+
.onComplete(res -> {
267+
if (res.succeeded()) {
268+
// Connected with SSL
269+
} else {
270+
System.out.println("Could not connect " + res.cause());
271+
}
272+
});
269273
}
270274

271275
public void generatedKeys(SqlClient client) {
272276
client
273277
.preparedQuery("SELECT color_id FROM FINAL TABLE ( INSERT INTO color (color_name) VALUES (?), (?), (?) )")
274-
.execute(Tuple.of("white", "red", "blue"), ar -> {
275-
if (ar.succeeded()) {
276-
RowSet<Row> rows = ar.result();
277-
System.out.println("Inserted " + rows.rowCount() + " new rows.");
278-
for (Row row : rows) {
279-
System.out.println("generated key: " + row.getInteger("color_id"));
278+
.execute(Tuple.of("white", "red", "blue"))
279+
.onComplete(ar -> {
280+
if (ar.succeeded()) {
281+
RowSet<Row> rows = ar.result();
282+
System.out.println("Inserted " + rows.rowCount() + " new rows.");
283+
for (Row row : rows) {
284+
System.out.println("generated key: " + row.getInteger("color_id"));
285+
}
286+
} else {
287+
System.out.println("Failure: " + ar.cause().getMessage());
280288
}
281-
} else {
282-
System.out.println("Failure: " + ar.cause().getMessage());
283-
}
284-
});
289+
});
285290
}
286291

287292
public void typeMapping01(Pool pool) {
288293
pool
289294
.query("SELECT an_int_column FROM exampleTable")
290-
.execute(ar -> {
291-
RowSet<Row> rowSet = ar.result();
292-
Row row = rowSet.iterator().next();
295+
.execute().onSuccess(rowSet -> {
296+
Row row = rowSet.iterator().next();
293297

294-
// Stored as INTEGER column type and represented as java.lang.Integer
295-
Object value = row.getValue(0);
298+
// Stored as INTEGER column type and represented as java.lang.Integer
299+
Object value = row.getValue(0);
296300

297-
// Convert to java.lang.Long
298-
Long longValue = row.getLong(0);
299-
});
301+
// Convert to java.lang.Long
302+
Long longValue = row.getLong(0);
303+
});
300304
}
301305

302306
public void collector01Example(SqlClient client) {
@@ -309,17 +313,18 @@ public void collector01Example(SqlClient client) {
309313
// Run the query with the collector
310314
client.query("SELECT * FROM users")
311315
.collecting(collector)
312-
.execute(ar -> {
313-
if (ar.succeeded()) {
314-
SqlResult<Map<Long, String>> result = ar.result();
316+
.execute()
317+
.onComplete(ar -> {
318+
if (ar.succeeded()) {
319+
SqlResult<Map<Long, String>> result = ar.result();
315320

316-
// Get the map created by the collector
317-
Map<Long, String> map = result.value();
318-
System.out.println("Got " + map);
319-
} else {
320-
System.out.println("Failure: " + ar.cause().getMessage());
321-
}
322-
});
321+
// Get the map created by the collector
322+
Map<Long, String> map = result.value();
323+
System.out.println("Got " + map);
324+
} else {
325+
System.out.println("Failure: " + ar.cause().getMessage());
326+
}
327+
});
323328
}
324329

325330
public void collector02Example(SqlClient client) {
@@ -331,7 +336,11 @@ public void collector02Example(SqlClient client) {
331336
);
332337

333338
// Run the query with the collector
334-
client.query("SELECT * FROM users").collecting(collector).execute(ar -> {
339+
client
340+
.query("SELECT * FROM users")
341+
.collecting(collector)
342+
.execute()
343+
.onComplete(ar -> {
335344
if (ar.succeeded()) {
336345
SqlResult<String> result = ar.result();
337346

@@ -353,36 +362,38 @@ enum Days {
353362
* Using an enum as a string value in the Row and Tuple methods.
354363
*/
355364
public void enumStringValues(SqlClient client) {
356-
client.preparedQuery("SELECT day_name FROM FINAL TABLE ( INSERT INTO days (day_name) VALUES (?), (?), (?) )")
357-
.execute(Tuple.of(Days.FRIDAY, Days.SATURDAY, Days.SUNDAY), ar -> {
358-
if (ar.succeeded()) {
359-
RowSet<Row> rows = ar.result();
360-
System.out.println("Inserted " + rows.rowCount() + " new rows");
361-
for (Row row : rows) {
362-
System.out.println("Day: " + row.get(Days.class, "day_name"));
363-
}
364-
} else {
365-
System.out.println("Failure: " + ar.cause().getMessage());
366-
}
367-
});
365+
client.preparedQuery("SELECT day_name FROM FINAL TABLE ( INSERT INTO days (day_name) VALUES (?), (?), (?) )")
366+
.execute(Tuple.of(Days.FRIDAY, Days.SATURDAY, Days.SUNDAY))
367+
.onComplete(ar -> {
368+
if (ar.succeeded()) {
369+
RowSet<Row> rows = ar.result();
370+
System.out.println("Inserted " + rows.rowCount() + " new rows");
371+
for (Row row : rows) {
372+
System.out.println("Day: " + row.get(Days.class, "day_name"));
373+
}
374+
} else {
375+
System.out.println("Failure: " + ar.cause().getMessage());
376+
}
377+
});
368378
}
369379

370380
/**
371381
* Using an enum as an int value in the Row and Tuple methods.
372382
* The row.get() method returns the corresponding enum's name() value at the ordinal position of the integer value retrieved.
373383
*/
374384
public void enumIntValues(SqlClient client) {
375-
client.preparedQuery("SELECT day_num FROM FINAL TABLE ( INSERT INTO days (day_num) VALUES (?), (?), (?) )")
376-
.execute(Tuple.of(Days.FRIDAY.ordinal(), Days.SATURDAY.ordinal(), Days.SUNDAY.ordinal()), ar -> {
377-
if (ar.succeeded()) {
378-
RowSet<Row> rows = ar.result();
379-
System.out.println("Inserted " + rows.rowCount() + " new rows");
380-
for (Row row : rows) {
381-
System.out.println("Day: " + row.get(Days.class, "day_num"));
382-
}
383-
} else {
384-
System.out.println("Failure: " + ar.cause().getMessage());
385-
}
385+
client.preparedQuery("SELECT day_num FROM FINAL TABLE ( INSERT INTO days (day_num) VALUES (?), (?), (?) )")
386+
.execute(Tuple.of(Days.FRIDAY.ordinal(), Days.SATURDAY.ordinal(), Days.SUNDAY.ordinal()))
387+
.onComplete(ar -> {
388+
if (ar.succeeded()) {
389+
RowSet<Row> rows = ar.result();
390+
System.out.println("Inserted " + rows.rowCount() + " new rows");
391+
for (Row row : rows) {
392+
System.out.println("Day: " + row.get(Days.class, "day_num"));
393+
}
394+
} else {
395+
System.out.println("Failure: " + ar.cause().getMessage());
396+
}
386397
});
387398
}
388399

‎vertx-db2-client/src/main/java/examples/SqlClientExamples.java

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ public class SqlClientExamples {
4545
public void queries01(SqlClient client) {
4646
client
4747
.query("SELECT * FROM users WHERE id='andy'")
48-
.execute(ar -> {
48+
.execute()
49+
.onComplete(ar -> {
4950
if (ar.succeeded()) {
5051
RowSet<Row> result = ar.result();
5152
System.out.println("Got " + result.size() + " rows ");
@@ -59,7 +60,8 @@ public void queries01(SqlClient client) {
5960
public void queries02(SqlClient client) {
6061
client
6162
.preparedQuery("SELECT * FROM users WHERE id=?")
62-
.execute(Tuple.of("andy"), ar -> {
63+
.execute(Tuple.of("andy"))
64+
.onComplete(ar -> {
6365
if (ar.succeeded()) {
6466
RowSet<Row> rows = ar.result();
6567
System.out.println("Got " + rows.size() + " rows ");
@@ -72,7 +74,8 @@ public void queries02(SqlClient client) {
7274
public void queries03(SqlClient client) {
7375
client
7476
.preparedQuery("SELECT first_name, last_name FROM users")
75-
.execute(ar -> {
77+
.execute()
78+
.onComplete(ar -> {
7679
if (ar.succeeded()) {
7780
RowSet<Row> rows = ar.result();
7881
for (Row row : rows) {
@@ -87,7 +90,8 @@ public void queries03(SqlClient client) {
8790
public void queries04(SqlClient client) {
8891
client
8992
.preparedQuery("INSERT INTO users (first_name, last_name) VALUES (?, ?)")
90-
.execute(Tuple.of("Andy", "Guibert"), ar -> {
93+
.execute(Tuple.of("Andy", "Guibert"))
94+
.onComplete(ar -> {
9195
if (ar.succeeded()) {
9296
RowSet<Row> rows = ar.result();
9397
System.out.println(rows.rowCount());
@@ -126,7 +130,8 @@ public void queries08(SqlClient client) {
126130
// Execute the prepared batch
127131
client
128132
.preparedQuery("INSERT INTO USERS (id, name) VALUES (?, ?)")
129-
.executeBatch(batch, res -> {
133+
.executeBatch(batch)
134+
.onComplete(res -> {
130135
if (res.succeeded()) {
131136

132137
// Process rows
@@ -143,7 +148,8 @@ public void queries09(SqlClient client, SqlConnectOptions connectOptions) {
143148
connectOptions.setCachePreparedStatements(true);
144149
client
145150
.preparedQuery("SELECT * FROM users WHERE id = ?")
146-
.execute(Tuple.of("julien"), ar -> {
151+
.execute(Tuple.of("julien"))
152+
.onComplete(ar -> {
147153
if (ar.succeeded()) {
148154
RowSet<Row> rows = ar.result();
149155
System.out.println("Got " + rows.size() + " rows ");
@@ -155,11 +161,13 @@ public void queries09(SqlClient client, SqlConnectOptions connectOptions) {
155161

156162
public void queries10(SqlConnection sqlConnection) {
157163
sqlConnection
158-
.prepare("SELECT * FROM users WHERE id = ?", ar -> {
164+
.prepare("SELECT * FROM users WHERE id = ?")
165+
.onComplete(ar -> {
159166
if (ar.succeeded()) {
160167
PreparedStatement preparedStatement = ar.result();
161168
preparedStatement.query()
162-
.execute(Tuple.of("julien"), ar2 -> {
169+
.execute(Tuple.of("julien"))
170+
.onComplete(ar2 -> {
163171
if (ar2.succeeded()) {
164172
RowSet<Row> rows = ar2.result();
165173
System.out.println("Got " + rows.size() + " rows ");
@@ -272,20 +280,26 @@ public void transaction03(Pool pool) {
272280
}
273281

274282
public void usingCursors01(SqlConnection connection) {
275-
connection.prepare("SELECT * FROM users WHERE first_name LIKE ?", ar0 -> {
283+
connection
284+
.prepare("SELECT * FROM users WHERE first_name LIKE ?")
285+
.onComplete(ar0 -> {
276286
if (ar0.succeeded()) {
277287
PreparedStatement pq = ar0.result();
278288

279289
// Cursors require to run within a transaction
280-
connection.begin(ar1 -> {
290+
connection
291+
.begin()
292+
.onComplete(ar1 -> {
281293
if (ar1.succeeded()) {
282294
Transaction tx = ar1.result();
283295

284296
// Create a cursor
285297
Cursor cursor = pq.cursor(Tuple.of("julien"));
286298

287299
// Read 50 rows
288-
cursor.read(50, ar2 -> {
300+
cursor
301+
.read(50)
302+
.onComplete(ar2 -> {
289303
if (ar2.succeeded()) {
290304
RowSet<Row> rows = ar2.result();
291305

@@ -305,7 +319,9 @@ public void usingCursors01(SqlConnection connection) {
305319
}
306320

307321
public void usingCursors02(Cursor cursor) {
308-
cursor.read(50, ar2 -> {
322+
cursor
323+
.read(50)
324+
.onComplete(ar2 -> {
309325
if (ar2.succeeded()) {
310326
// Close the cursor
311327
cursor.close();
@@ -314,12 +330,16 @@ public void usingCursors02(Cursor cursor) {
314330
}
315331

316332
public void usingCursors03(SqlConnection connection) {
317-
connection.prepare("SELECT * FROM users WHERE first_name LIKE ?", ar0 -> {
333+
connection
334+
.prepare("SELECT * FROM users WHERE first_name LIKE ?")
335+
.onComplete(ar0 -> {
318336
if (ar0.succeeded()) {
319337
PreparedStatement pq = ar0.result();
320338

321339
// Streams require to run within a transaction
322-
connection.begin(ar1 -> {
340+
connection
341+
.begin()
342+
.onComplete(ar1 -> {
323343
if (ar1.succeeded()) {
324344
Transaction tx = ar1.result();
325345

0 commit comments

Comments
 (0)