[#689] Upgrade to Vert.x 4.0.3

Author: DavideD

README.md

@@ -37,10 +37,9 @@ Hibernate Reactive has been tested with:
 - Db2 11.5
 - CockroachDB 20.2
 - [Hibernate ORM][] 5.4.30.Final
-- Vert.x 3.9.6
-- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/)
-- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/)
-- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/)
+- [Vert.x Reactive PostgreSQL Client](https://vertx.io/docs/vertx-pg-client/java/) 4.0.3
+- [Vert.x Reactive MySQL Client](https://vertx.io/docs/vertx-mysql-client/java/) 4.0.3
+- [Vert.x Reactive Db2 Client](https://vertx.io/docs/vertx-db2-client/java/) 4.0.3
 - [Quarkus][Quarkus] via the Hibernate Reactive extension
 
 Support for SQL Server is coming soon.

build.gradle

@@ -55,7 +55,7 @@ ext {
     // Example:
     // ./gradlew build -PvertxVersion=4.0.0-SNAPSHOT
     if ( !project.hasProperty('vertxVersion') ) {
-        vertxVersion = '3.9.6'
+        vertxVersion = '4.0.3'
     }
 
     testcontainersVersion = '1.15.2'

hibernate-reactive-core/src/main/java/org/hibernate/reactive/pool/impl/SqlClientConnection.java

@@ -5,8 +5,19 @@
  */
 package org.hibernate.reactive.pool.impl;
 
-import io.vertx.sqlclient.PropertyKind;
+import java.sql.ResultSet;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CompletionStage;
+
+import org.hibernate.engine.jdbc.internal.FormatStyle;
+import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
+import org.hibernate.reactive.adaptor.impl.ResultSetAdaptor;
+import org.hibernate.reactive.pool.ReactiveConnection;
+
 import io.vertx.sqlclient.Pool;
+import io.vertx.sqlclient.PropertyKind;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowIterator;
 import io.vertx.sqlclient.RowSet;
@@ -15,16 +26,6 @@
 import io.vertx.sqlclient.SqlResult;
 import io.vertx.sqlclient.Transaction;
 import io.vertx.sqlclient.Tuple;
-import org.hibernate.engine.jdbc.internal.FormatStyle;
-import org.hibernate.engine.jdbc.spi.SqlStatementLogger;
-import org.hibernate.reactive.adaptor.impl.ResultSetAdaptor;
-import org.hibernate.reactive.pool.ReactiveConnection;
-
-import java.sql.ResultSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletionStage;
 
 import static org.hibernate.reactive.util.impl.CompletionStages.voidFuture;
 
@@ -194,40 +195,25 @@ private void feedback(String sql) {
 	}
 
 	private SqlClient client() {
-		return transaction != null ? transaction : connection;
+		return connection;
 	}
 
 	@Override
 	public CompletionStage<Void> beginTransaction() {
-		transaction = connection.begin();
-		return voidFuture();
-//		return execute("begin");
+		return Handlers.<Transaction>toCompletionStage(connection::begin)
+				.thenAccept( tx -> transaction = tx );
 	}
 
 	@Override
 	public CompletionStage<Void> commitTransaction() {
-		return Handlers.toCompletionStage(
-				handler -> transaction.commit(
-						ar -> {
-							transaction = null;
-							handler.handle( ar );
-						}
-				)
-		);
-//		return execute("commit");
+		return Handlers.<Void>toCompletionStage(transaction::commit)
+				.whenComplete( (v, x) -> transaction = null );
 	}
 
 	@Override
 	public CompletionStage<Void> rollbackTransaction() {
-		return Handlers.toCompletionStage(
-				handler -> transaction.rollback(
-						ar -> {
-							transaction = null;
-							handler.handle( ar );
-						}
-				)
-		);
-//		return execute("rollback");
+		return Handlers.<Void>toCompletionStage(transaction::rollback)
+				.whenComplete( (v, x) -> transaction = null );
 	}
 
 	@Override

hibernate-reactive-core/src/test/java/org/hibernate/reactive/configuration/ReactiveConnectionPoolTest.java

@@ -114,7 +114,7 @@ public void configureWithCredentials(TestContext context) {
 	public void configureWithWrongCredentials(TestContext context) {
 		thrown.expect( CompletionException.class );
 		thrown.expectMessage( "io.vertx.pgclient.PgException:" );
-		thrown.expectMessage( "\"bogus\"" );
+		thrown.expectMessage( "\\\"bogus\\\"" );
 
 		String url = DatabaseConfiguration.getJdbcUrl();
 		Map<String,Object> config = new HashMap<>();