migrate to vert.x 5.0.7 with vertx-jooq gradle subproject

- upgrade vertx from 4.5.25 to 5.0.7
- rebase vertx-grpc fork on upstream v5 with RoutingContext customization
- convert vertx-jooq fork from maven to gradle subproject (15 modules)
- add vertx-jooq-fork as git submodule from hiddenswitch/forks-jooq-vertx-5
- migrate executeBlocking from Handler<Promise> to Callable API
- migrate eventually from Function to Supplier API
- replace CompositeFuture.all with Future.all
- replace io.vertx.core.logging with slf4j
- replace PgPool/MySQLPool constructors with builder pattern
- add shim io.vertx.core.logging Logger/LoggerFactory for compatibility
- update vertx-grpc to v5 ServiceMethod API with protoc plugin2
- update smallrye-mutiny bindings to 4.0.0-beta0 for vertx 5
- remove mavenLocal from repositories
- all 68 server tests passing

Author: doctorpangloss

.gitmodules

@@ -10,3 +10,6 @@
 [submodule "steamguardcli"]
 	path = steamguardcli
 	url = git@github.com:hiddenswitch/steamguard-cli.git
+[submodule "vertx-jooq-fork"]
+	path = vertx-jooq-fork
+	url = git@github.com:hiddenswitch/forks-jooq-vertx-5.git

build.gradle

@@ -205,7 +205,12 @@ subprojects {
         }
 
         if (details.requested.group == 'org.infinispan') {
-          details.useVersion infinispanVersion
+          // Infinispan 15 merged -jakarta suffixed artifacts back to base names
+          if (details.requested.name.endsWith('-jakarta')) {
+            details.useTarget "${details.requested.group}:${details.requested.name.replace('-jakarta', '')}:${infinispanVersion}"
+          } else {
+            details.useVersion infinispanVersion
+          }
         }
 
         if (details.requested.group == 'org.objenesis') {

default-infinispan.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2022 Red Hat, Inc.
+  ~
+  ~ Red Hat licenses this file to you under the Apache License, version 2.0
+  ~ (the "License"); you may not use this file except in compliance with the
+  ~ License.  You may obtain a copy of the License at:
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+  ~ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+  ~ License for the specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<infinispan xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:infinispan:config:14.0 http://www.infinispan.org/schemas/infinispan-config-14.0.xsd"
+            xmlns="urn:infinispan:config:14.0">
+
+  <jgroups>
+    <stack-file name="jgroups" path="tcp.xml"/>
+  </jgroups>
+
+  <cache-container default-cache="distributed-cache">
+    <transport stack="jgroups"/>
+    <distributed-cache name="distributed-cache"/>
+    <replicated-cache name="__vertx.subs"/>
+    <replicated-cache name="__vertx.haInfo"/>
+    <replicated-cache name="__vertx.nodeInfo"/>
+    <distributed-cache-configuration name="__vertx.distributed.cache.configuration"/>
+  </cache-container>
+
+</infinispan>

gradle.properties

@@ -7,17 +7,17 @@ classgraphVersion=4.8.184
 jacksonVersion=2.19.0
 jacksonDatabindVersion=2.19.0
 jaegerVersion=1.8.1
-vertxVersion=4.5.25
+vertxVersion=5.0.7
 javaProtobufVersion=4.29.0
 junitVersion=5.14.3
 shadowPluginVersion=9.0.0-rc1
 guavaVersion=33.5.0-jre
 keycloakVersion=22.0.3
-micrometerVersion=1.10.2
+micrometerVersion=1.15.7
 jmhVersion=1.37
 testcontainersVersion=1.21.4
 postgresqlVersion=42.7.4
-nettyVersion=4.1.131.Final
+nettyVersion=4.2.9.Final
 grpcVersion=1.72.0
 protocVersion=4.29.0
 resteasyVersion=6.2.11.Final

settings.gradle

@@ -39,4 +39,19 @@ include 'vertx-grpc:vertx-grpc-it'
 include 'vertx-grpc:vertx-grpc-server'
 include 'spellsource-graphql'
 include 'spellsource-heuristic-trainer'
+include 'vertx-jooq-fork:vertx-jooq-shared'
+include 'vertx-jooq-fork:vertx-jooq-shared-reactive'
+include 'vertx-jooq-fork:vertx-jooq-classic'
+include 'vertx-jooq-fork:vertx-jooq-classic-jdbc'
+include 'vertx-jooq-fork:vertx-jooq-classic-reactive'
+include 'vertx-jooq-fork:vertx-jooq-rx'
+include 'vertx-jooq-fork:vertx-jooq-rx-jdbc'
+include 'vertx-jooq-fork:vertx-jooq-rx-reactive'
+include 'vertx-jooq-fork:vertx-jooq-rx3'
+include 'vertx-jooq-fork:vertx-jooq-rx3-jdbc'
+include 'vertx-jooq-fork:vertx-jooq-rx3-reactive'
+include 'vertx-jooq-fork:vertx-jooq-mutiny'
+include 'vertx-jooq-fork:vertx-jooq-mutiny-jdbc'
+include 'vertx-jooq-fork:vertx-jooq-mutiny-reactive'
+include 'vertx-jooq-fork:vertx-jooq-generate'
 

spellsource-common/src/main/java/io/vertx/await/Async.java

@@ -2,8 +2,8 @@
 
 
 import io.vertx.core.*;
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.VertxInternal;
+import io.vertx.core.internal.ContextInternal;
+import io.vertx.core.internal.VertxInternal;
 
 import java.lang.ref.WeakReference;
 import java.util.Objects;
@@ -68,7 +68,7 @@ public static <T> Future<T> vt(Vertx vertx, Callable<T> handler) {
 				var finalRef = ref;
 				vertxInternal.addCloseHook(prom -> {
 					finalRef.clear();
-					prom.complete(null);
+					prom.succeed();
 				});
 			} else {
 				context = ref.get();

spellsource-common/src/main/java/io/vertx/core/logging/Logger.java

@@ -0,0 +1,48 @@
+package io.vertx.core.logging;
+
+/**
+ * Shim for the removed {@code io.vertx.core.logging.Logger} class.
+ * Bridges to SLF4J so that libraries compiled against Vert.x 4 logging still work at runtime.
+ */
+public class Logger {
+
+	private final org.slf4j.Logger delegate;
+
+	Logger(org.slf4j.Logger delegate) {
+		this.delegate = delegate;
+	}
+
+	public boolean isDebugEnabled() {
+		return delegate.isDebugEnabled();
+	}
+
+	public void debug(Object message, Object... params) {
+		if (delegate.isDebugEnabled()) {
+			delegate.debug(String.valueOf(message), params);
+		}
+	}
+
+	public void info(Object message, Object... params) {
+		if (delegate.isInfoEnabled()) {
+			delegate.info(String.valueOf(message), params);
+		}
+	}
+
+	public void warn(Object message, Object... params) {
+		if (delegate.isWarnEnabled()) {
+			delegate.warn(String.valueOf(message), params);
+		}
+	}
+
+	public void error(Object message, Object... params) {
+		if (delegate.isErrorEnabled()) {
+			delegate.error(String.valueOf(message), params);
+		}
+	}
+
+	public void trace(Object message, Object... params) {
+		if (delegate.isTraceEnabled()) {
+			delegate.trace(String.valueOf(message), params);
+		}
+	}
+}

spellsource-common/src/main/java/io/vertx/core/logging/LoggerFactory.java

@@ -0,0 +1,16 @@
+package io.vertx.core.logging;
+
+/**
+ * Shim for the removed {@code io.vertx.core.logging.LoggerFactory} class.
+ * Bridges to SLF4J so that libraries compiled against Vert.x 4 logging still work at runtime.
+ */
+public class LoggerFactory {
+
+	public static Logger getLogger(Class<?> clazz) {
+		return new Logger(org.slf4j.LoggerFactory.getLogger(clazz));
+	}
+
+	public static Logger getLogger(String name) {
+		return new Logger(org.slf4j.LoggerFactory.getLogger(name));
+	}
+}

spellsource-common/src/main/java/io/vertx/executeblocking/ExecuteBlocking.java

@@ -2,8 +2,8 @@
 
 import io.vertx.core.Future;
 import io.vertx.core.Vertx;
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.impl.future.PromiseInternal;
+import io.vertx.core.internal.ContextInternal;
+import io.vertx.core.internal.PromiseInternal;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.ThreadFactory;

spellsource-server/build.gradle

@@ -1,15 +1,10 @@
 buildscript {
-  ext {
-    vertxJooqVersion = '6.5.5'
-  }
   repositories {
-    mavenLocal()
     mavenCentral()
   }
   dependencies {
-    classpath "io.github.jklingsporn:vertx-jooq-generate:$vertxJooqVersion"
+    classpath "org.jooq:jooq-codegen:3.17.3"
     classpath "org.postgresql:postgresql:$postgresqlVersion"
-    classpath "io.vertx:vertx-core:$vertxVersion"
   }
 }
 
@@ -33,14 +28,16 @@ repositories {
 
 evaluationDependsOn(':spellsource-containers')
 
+configurations {
+  jooqGenerator
+}
+
 import com.bmuschko.gradle.docker.tasks.container.DockerCreateContainer
 import com.bmuschko.gradle.docker.tasks.container.DockerRemoveContainer
 import com.bmuschko.gradle.docker.tasks.container.DockerStartContainer
 import com.bmuschko.gradle.docker.tasks.container.DockerStopContainer
 import com.bmuschko.gradle.docker.tasks.image.DockerPullImage
 import com.kobylynskyi.graphql.codegen.model.ApiInterfaceStrategy
-import io.github.jklingsporn.vertx.jooq.shared.postgres.JSONBToJsonObjectConverter
-import io.vertx.core.json.JsonObject
 import org.apache.tools.ant.taskdefs.condition.Os
 import org.jooq.codegen.GenerationTool
 import org.jooq.meta.jaxb.*
@@ -55,7 +52,7 @@ def jdbcUrl = "jdbc:postgresql://localhost:5432/$localDatabaseName"
 def jvmArgs = ['--enable-preview', '--add-opens', 'java.base/java.lang=ALL-UNNAMED', '-XX:+UseContainerSupport', '-XX:MaxRAMPercentage=80.0', '-XX:+UseG1GC', '-XX:MinHeapFreeRatio=10', '-XX:MaxHeapFreeRatio=20', '-XX:-ShrinkHeapInSteps', '-XX:G1PeriodicGCInterval=10000']
 
 dependencies {
-  compileOnly 'org.infinispan:infinispan-component-annotations:15.0.0.Dev01'
+  compileOnly 'org.infinispan:infinispan-component-annotations:15.0.11.Final'
 
   implementation project(':spellsource-common')
   implementation project(':spellsource-game')
@@ -110,7 +107,7 @@ dependencies {
   implementation group: "io.netty", name: "netty-resolver-dns-native-macos", version: nettyVersion, classifier: "osx-aarch_64"
   implementation 'org.jooq:jooq:3.17.3'
   implementation "io.vertx:vertx-pg-client:$vertxVersion"
-  implementation("io.github.jklingsporn:vertx-jooq-classic-reactive:$vertxJooqVersion") {
+  implementation(project(':vertx-jooq-fork:vertx-jooq-classic-reactive')) {
     exclude group: "io.vertx", module: '*'
   }
 
@@ -156,6 +153,11 @@ dependencies {
   testImplementation 'uk.org.webcompere:system-stubs-jupiter:2.0.2'
 
   testRuntimeOnly "org.junit.platform:junit-platform-launcher"
+
+  jooqGenerator project(':vertx-jooq-fork:vertx-jooq-generate')
+  jooqGenerator project(':vertx-jooq-fork:vertx-jooq-shared')
+  jooqGenerator "org.postgresql:postgresql:$postgresqlVersion"
+  jooqGenerator "io.vertx:vertx-core:$vertxVersion"
 }
 
 javadoc {
@@ -302,8 +304,8 @@ tasks.register('jooqGenerate') {
                   new SchemaMappingType().withInputSchema("hiddenswitch").withOutputSchema("hiddenswitch"))
               .withForcedTypes(
                   new ForcedType()
-                      .withUserType(JsonObject.class.getName())
-                      .withConverter(JSONBToJsonObjectConverter.class.getName())
+                      .withUserType('io.vertx.core.json.JsonObject')
+                      .withConverter('io.github.jklingsporn.vertx.jooq.shared.postgres.JSONBToJsonObjectConverter')
                       .withIncludeTypes("jsonb"))
               .withIncludeTables(true)
               .withIncludeRoutines(true)
@@ -326,6 +328,11 @@ tasks.register('jooqGenerate') {
               .withName('io.github.jklingsporn.vertx.jooq.generate.VertxGeneratorStrategy')))
 
   doLast() {
+    def cl = new URLClassLoader(
+        configurations.jooqGenerator.files.collect { it.toURI().toURL() } as URL[],
+        GenerationTool.classLoader
+    )
+    Thread.currentThread().setContextClassLoader(cl)
     GenerationTool.generate(configuration)
     exec {
       // dump the generated ddl to a file