Upgrade librairies (#18)

larousso · web-flow · commit b12ebbca920d · 2025-06-12T10:56:22.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,10 +16,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           token: '${{ secrets.PERSONAL_ACCESS_TOKEN }}'
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: release gradle
         run: |
           git config --local user.email "jooq-async-github-actions@users.noreply.github.com"
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -6,10 +6,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.2.0
-      - name: Set up JDK 15
+      - name: Set up JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 15
+          java-version: 21
       - name: Start docker
         run: docker pull postgres:14
       - name: Run test
diff --git a/.java-version b/.java-version
@@ -1 +1 @@
-15
+21
diff --git a/.sdkmanrc b/.sdkmanrc
@@ -0,0 +1 @@
+java=21-open
diff --git a/build.gradle b/build.gradle
@@ -22,16 +22,16 @@ subprojects {
         withSourcesJar()
         withJavadocJar()
         toolchain {
-            languageVersion = JavaLanguageVersion.of(17)
+            languageVersion = JavaLanguageVersion.of(21)
         }
     }
     ext {
-        jacksonVersion = "2.10.5"
-        akkaVersion = "2.6.6"
-        vavrVersion = "0.10.0"
-        _jooqVersion = "3.19.5"
+        jacksonVersion = "2.18.4"
+        vavrVersion = "0.10.6"
+        _jooqVersion = "3.20.4"
         scalaVersion = "2.13"
-        reactorVersion = "3.6.3"
+        reactorVersion = "3.7.7"
+        testContainers = "1.21.1"
     }
     test {
         testLogging {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/jooq-async-api-tck/build.gradle b/jooq-async-api-tck/build.gradle
@@ -11,12 +11,12 @@ dependencies {
 
     implementation("io.vavr:vavr:$vavrVersion")
     implementation("org.jooq:jooq:$_jooqVersion")
-    implementation("io.projectreactor:reactor-core:3.4.23")
+    implementation("io.projectreactor:reactor-core:$reactorVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
-    implementation("io.vavr:vavr-jackson:$vavrVersion")
+    implementation("io.vavr:vavr-jackson:0.10.3")
     implementation("com.novocode:junit-interface:0.11")
     implementation("org.assertj:assertj-core:3.10.0")
     implementation("org.postgresql:postgresql:42.2.5")
     implementation("org.mockito:mockito-core:2.22.0")
-    implementation("org.testcontainers:postgresql:1.16.3")
+    implementation("org.testcontainers:postgresql:${testContainers}")
 }
diff --git a/jooq-async-api/build.gradle b/jooq-async-api/build.gradle
@@ -8,7 +8,7 @@ group = 'fr.maif'
 dependencies {
     implementation("io.vavr:vavr:$vavrVersion")
     implementation("org.jooq:jooq:$_jooqVersion")
-    implementation("io.projectreactor:reactor-core:3.4.23")
+    implementation("io.projectreactor:reactor-core:$reactorVersion")
     implementation("org.slf4j:slf4j-api:1.7.30")
     implementation("org.slf4j:slf4j-log4j12:1.7.30")
 }
diff --git a/jooq-async-jdbc/build.gradle b/jooq-async-jdbc/build.gradle
@@ -11,7 +11,7 @@ dependencies {
 
     implementation("io.vavr:vavr:$vavrVersion")
     implementation("org.jooq:jooq:$_jooqVersion")
-    implementation("io.projectreactor:reactor-core:3.4.23")
+    implementation("io.projectreactor:reactor-core:$reactorVersion")
     implementation("org.slf4j:slf4j-api:1.7.26")
 
     testImplementation project(':jooq-async-api-tck')
@@ -21,6 +21,6 @@ dependencies {
     testImplementation("org.assertj:assertj-core:3.10.0")
     testImplementation("org.postgresql:postgresql:42.2.5")
     testImplementation("org.mockito:mockito-core:2.22.0")
-    testImplementation("org.testcontainers:testcontainers:1.17.3")
-    testImplementation("org.testcontainers:postgresql:1.17.3")
+    testImplementation("org.testcontainers:testcontainers:${testContainers}")
+    testImplementation("org.testcontainers:postgresql:${testContainers}")
 }
diff --git a/jooq-async-reactive/build.gradle b/jooq-async-reactive/build.gradle
@@ -13,15 +13,14 @@ dependencies {
     implementation("org.jooq:jooq:$_jooqVersion")
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
     implementation("io.projectreactor:reactor-core:$reactorVersion")
-    implementation("com.ongres.scram:client:2.1")
     implementation("org.slf4j:slf4j-api:1.7.26")
-    implementation("io.vertx:vertx-pg-client:4.5.4")
+    implementation("io.vertx:vertx-pg-client:5.0.0")
 
     testImplementation project(':jooq-async-api-tck')
     testImplementation("com.novocode:junit-interface:0.11")
     testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.0")
     testImplementation("org.junit.vintage:junit-vintage-engine:5.9.0")
-    testImplementation("org.testcontainers:testcontainers:1.17.3")
-    testImplementation("org.testcontainers:postgresql:1.17.3")
+    testImplementation("org.testcontainers:testcontainers:${testContainers}")
+    testImplementation("org.testcontainers:postgresql:${testContainers}")
 
 }
diff --git a/jooq-async-reactive/src/main/java/fr/maif/jooq/reactive/AbstractReactivePgAsyncClient.java b/jooq-async-reactive/src/main/java/fr/maif/jooq/reactive/AbstractReactivePgAsyncClient.java
@@ -7,8 +7,6 @@
 import fr.maif.jooq.PgAsyncClient;
 import fr.maif.jooq.QueryResult;
 import io.vavr.collection.List;
-import io.vavr.concurrent.Future;
-import io.vavr.concurrent.Promise;
 import io.vavr.control.Option;
 import io.vavr.control.Try;
 import io.vertx.core.AsyncResult;
@@ -19,9 +17,9 @@
 import io.vertx.sqlclient.RowSet;
 import io.vertx.sqlclient.SqlClient;
 import io.vertx.sqlclient.Tuple;
-import io.vertx.sqlclient.impl.ArrayTuple;
-import org.jooq.*;
+import io.vertx.sqlclient.internal.ArrayTuple;
 import org.jooq.Record;
+import org.jooq.*;
 import org.jooq.conf.ParamType;
 import org.jooq.exception.TooManyRowsException;
 import org.jooq.impl.DSL;
@@ -32,15 +30,14 @@
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 import static fr.maif.jooq.reactive.FutureConversions.fromVertx;
-import static io.vavr.API.*;
-import static io.vavr.Predicates.instanceOf;
 import static java.util.Objects.isNull;
 
 public abstract class AbstractReactivePgAsyncClient<Client extends SqlClient> implements PgAsyncClient {
@@ -115,7 +112,6 @@ public CompletionStage<Long> executeBatch(Function<DSLContext, ? extends Query>
         if (values.isEmpty()) {
             return completedStage(0L);
         }
-        CompletableFuture<RowSet<Row>> rowFuture = new CompletableFuture<>();
         try {
             Query query = queryFunction.apply(DSL.using(configuration));
             log(query);
@@ -138,11 +134,20 @@ public CompletionStage<Long> executeBatch(Function<DSLContext, ? extends Query>
                             return Tuple.of(l.head(), l.tail().toJavaArray(Object[]::new));
                         }
                     });
-            client.preparedQuery(preparedQuery).executeBatch(bindValues.toJavaList(), toCompletionHandler(rowFuture));
+            return client.preparedQuery(preparedQuery).executeBatch(bindValues.toJavaList())
+                    .toCompletionStage()
+                    .thenApply(r -> {
+                        if (Objects.nonNull(r) && Objects.nonNull(r.rowCount())) {
+                            return Long.valueOf(r.rowCount());
+                        }
+                        return 0L;
+                    })
+            ;
         } catch (Exception e) {
+            CompletableFuture<Long> rowFuture = new CompletableFuture<>();
             rowFuture.completeExceptionally(e);
+            return rowFuture;
         }
-        return rowFuture.thenApply(r -> Option(r).flatMap(c -> Option(c.rowCount())).map(Integer::longValue).getOrElse(0L));
     }
 
     protected static <U> Handler<AsyncResult<U>> toCompletionHandler(CompletableFuture<U> future) {
@@ -229,31 +234,23 @@ protected <U> Object convertParamToDatabaseType(Param<U> param) {
     }
 
     private Object jacksonToVertx(JsonNode json) {
-        return Match(json).of(
-                Case($(instanceOf(ObjectNode.class)), node -> {
-                    Map<String, Object> t = mapper.convertValue(node, new TypeReference<Map<String, Object>>() {
-                    });
-                    return new JsonObject(t);
-                }),
-                Case($(instanceOf(ArrayNode.class)), array -> {
-                    java.util.List<Object> t = mapper.convertValue(array, new TypeReference<java.util.List<Object>>() {
-                    });
-                    return new JsonArray(t);
-                }),
-                Case($(instanceOf(NullNode.class)), booleanNode ->
-                        Tuple.JSON_NULL
-                ),
-                Case($(instanceOf(BooleanNode.class)), booleanNode ->
-                        booleanNode.booleanValue()
-                ),
-                Case($(instanceOf(TextNode.class)), textNode ->
-                        textNode.textValue()
-                ),
-                Case($(instanceOf(NumericNode.class)), numericNode ->
-                        numericNode.numberValue()
-                ),
-                Case($(), other -> other)
-        );
+        return switch (json) {
+            case ObjectNode node -> {
+                Map<String, Object> t = mapper.convertValue(node, new TypeReference<Map<String, Object>>() {
+                });
+                yield new JsonObject(t);
+            }
+            case ArrayNode array -> {
+                java.util.List<Object> t = mapper.convertValue(array, new TypeReference<java.util.List<Object>>() {
+                });
+                yield new JsonArray(t);
+            }
+            case NullNode nullNode -> Tuple.JSON_NULL;
+            case BooleanNode booleanNode -> booleanNode.booleanValue();
+            case TextNode textNode -> textNode.textValue();
+            case NumericNode numericNode -> numericNode.numberValue();
+            default -> json;
+        };
     }
 
     protected String toPreparedQuery(Query query) {
diff --git a/jooq-async-reactive/src/main/java/fr/maif/jooq/reactive/ReactivePgAsyncPool.java b/jooq-async-reactive/src/main/java/fr/maif/jooq/reactive/ReactivePgAsyncPool.java
@@ -4,8 +4,6 @@
 import fr.maif.jooq.PgAsyncPool;
 import fr.maif.jooq.PgAsyncTransaction;
 import fr.maif.jooq.QueryResult;
-import io.vavr.concurrent.Future;
-import io.vertx.pgclient.PgPool;
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.TransactionRollbackException;
 import org.jooq.Configuration;
diff --git a/jooq-async-reactive/src/main/java/fr/maif/jooq/reactor/PgAsyncPool.java b/jooq-async-reactive/src/main/java/fr/maif/jooq/reactor/PgAsyncPool.java
@@ -2,12 +2,9 @@
 
 import fr.maif.jooq.PgAsyncPoolGetter;
 import fr.maif.jooq.reactive.ReactivePgAsyncPool;
-import fr.maif.jooq.reactor.impl.ReactorPgAsyncClient;
 import fr.maif.jooq.reactor.impl.ReactorPgAsyncPool;
-import io.vertx.pgclient.PgPool;
-import org.jooq.Configuration;
-
 import io.vertx.sqlclient.Pool;
+import org.jooq.Configuration;
 import reactor.core.publisher.Mono;
 
 import java.util.function.Function;
diff --git a/jooq-async-reactive/src/test/java/fr/maif/jooq/ReactiveAsyncPoolTest.java b/jooq-async-reactive/src/test/java/fr/maif/jooq/ReactiveAsyncPoolTest.java
@@ -2,19 +2,17 @@
 
 import fr.maif.jooq.reactive.ReactivePgAsyncPool;
 import io.vertx.core.Vertx;
+import io.vertx.core.net.ClientSSLOptions;
 import io.vertx.pgclient.PgBuilder;
 import io.vertx.pgclient.PgConnectOptions;
-import io.vertx.pgclient.PgPool;
+import io.vertx.pgclient.SslMode;
 import io.vertx.sqlclient.Pool;
 import io.vertx.sqlclient.PoolOptions;
 import org.jooq.Configuration;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DefaultConfiguration;
 import org.junit.After;
-import org.junit.Test;
 import org.testcontainers.containers.PostgreSQLContainer;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 public class ReactiveAsyncPoolTest extends AbstractPgAsyncPoolTest {
 
@@ -37,7 +35,8 @@ public PgAsyncPool pgAsyncPool(PostgreSQLContainer<?> postgreSQLContainer) {
                 .setHost(host)
                 .setDatabase(databaseName)
                 .setUser(username)
-                .setPassword(password);
+                .setPassword(password)
+                .setSslMode(SslMode.DISABLE);
         PoolOptions poolOptions = new PoolOptions().setMaxSize(3);
         pool = PgBuilder.pool()
                 .using(vertx)

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ group = 'fr.maif'`
`8`	`8`	`dependencies {`
`9`	`9`	`implementation("io.vavr:vavr:$vavrVersion")`
`10`	`10`	`implementation("org.jooq:jooq:$_jooqVersion")`
`11`		`- implementation("io.projectreactor:reactor-core:3.4.23")`
	`11`	`+ implementation("io.projectreactor:reactor-core:$reactorVersion")`
`12`	`12`	`implementation("org.slf4j:slf4j-api:1.7.30")`
`13`	`13`	`implementation("org.slf4j:slf4j-log4j12:1.7.30")`
`14`	`14`	`}`