Update to Quarkus 3.8 and resteasy-reactive

pe-st · Mar 2, 2024 · dde3a5e · dde3a5e
1 parent 7f21f62
commit dde3a5e
Show file tree

Hide file tree

Showing 23 changed files with 170 additions and 140 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up JDK
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

diff --git a/code-first-openapi-quarkus/pom.xml b/code-first-openapi-quarkus/pom.xml
@@ -18,7 +18,7 @@
 
         <!-- artifact versions -->
         <lombok.version>1.18.30</lombok.version>
-        <quarkus.version>3.7.1</quarkus.version>
+        <quarkus.version>3.8.1</quarkus.version>
 
         <!-- testing artifact versions -->
         <hamcrest.version>2.2</hamcrest.version>
@@ -43,9 +43,17 @@
 
     <dependencies>
         <!-- Jakarta EE and MP dependencies -->
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...rkus/src/main/java/ch/schlau/pesche/apidocs/openapi/codefirst/rest/JsonConfiguration.java b/...rkus/src/main/java/ch/schlau/pesche/apidocs/openapi/codefirst/rest/JsonConfiguration.java
@@ -1,18 +1,36 @@
 package ch.schlau.pesche.apidocs.openapi.codefirst.rest;
 
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Instance;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.JsonbConfig;
 
 import ch.schlau.pesche.apidocs.openapi.codefirst.txproc.model.PanJsonAdapter;
-import lombok.experimental.UtilityClass;
+import io.quarkus.jsonb.JsonbConfigCustomizer;
 
-@UtilityClass
 public class JsonConfiguration {
 
-    public static final JsonbConfig JSON_CONFIG = new JsonbConfig()
+    public static JsonbConfig createJsonbConfig() {
+        return new JsonbConfig()
             .withAdapters(new PanJsonAdapter())
             ;
+    }
 
-    public static final Jsonb JSONB = JsonbBuilder.create(JSON_CONFIG);
+    public static Jsonb createJsonb() {
+        return JsonbBuilder.create(createJsonbConfig());
+    }
+
+    // Replaces the CDI producer for JsonbConfig built into Quarkus
+    @Dependent
+    JsonbConfig jsonConfig(Instance<JsonbConfigCustomizer> customizers) {
+        JsonbConfig config = createJsonbConfig();
+
+        // Apply all JsonbConfigCustomizer beans (incl. Quarkus)
+        for (JsonbConfigCustomizer customizer : customizers) {
+            customizer.customize(config);
+        }
+
+        return config;
+    }
 }
diff --git a/...us/src/main/java/ch/schlau/pesche/apidocs/openapi/codefirst/rest/JsonContextResolver.java b/...us/src/main/java/ch/schlau/pesche/apidocs/openapi/codefirst/rest/JsonContextResolver.java
diff --git a/.../src/test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/PinCheckRequestTest.java b/.../src/test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/PinCheckRequestTest.java
@@ -1,35 +1,39 @@
 package ch.schlau.pesche.apidocs.openapi.codefirst.txproc;
 
-import static ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration.JSONB;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.UUID;
 
+import jakarta.json.bind.Jsonb;
+
 import org.junit.jupiter.api.Test;
 
+import ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration;
 import ch.schlau.pesche.apidocs.openapi.codefirst.txproc.model.Pan;
 
 class PinCheckRequestTest {
 
     @Test
     void json_roundtrip() {
 
+        Jsonb jsonb = JsonConfiguration.createJsonb();
+
         PinCheckRequest request = new PinCheckRequest();
         request.setUuid(UUID.fromString("abcdabcd-1234-5678-aaaa-cccccccccccc"));
 
         // JSON serialization
-        String jsonString1 = JSONB.toJson(request);
+        String jsonString1 = jsonb.toJson(request);
         assertThat(jsonString1, is("{\"uuid\":\"abcdabcd-1234-5678-aaaa-cccccccccccc\"}"));
 
         // set the other properties as well
         request.setPan(new Pan("111222333444"));
         request.setPinBlock("-secret-");
-        String jsonString2 = JSONB.toJson(request);
+        String jsonString2 = jsonb.toJson(request);
         assertThat(jsonString2, is("{\"pan\":\"111222333444\",\"pinBlock\":\"-secret-\",\"uuid\":\"abcdabcd-1234-5678-aaaa-cccccccccccc\"}"));
 
         // JSON deserialization
-        PinCheckRequest roundtrip = JSONB.fromJson(jsonString2, PinCheckRequest.class);
+        PinCheckRequest roundtrip = jsonb.fromJson(jsonString2, PinCheckRequest.class);
         assertThat(roundtrip.getUuid().toString(), is("abcdabcd-1234-5678-aaaa-cccccccccccc"));
         assertThat(roundtrip.getPan().getPan(), is("111222333444"));
         assertThat(roundtrip.getPinBlock(), is("-secret-"));

diff --git a/.../test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/PurchaseAuthRequestTest.java b/.../test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/PurchaseAuthRequestTest.java
@@ -1,13 +1,15 @@
 package ch.schlau.pesche.apidocs.openapi.codefirst.txproc;
 
-import static ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration.JSONB;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.UUID;
 
+import jakarta.json.bind.Jsonb;
+
 import org.junit.jupiter.api.Test;
 
+import ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration;
 import ch.schlau.pesche.apidocs.openapi.codefirst.txproc.model.EmvTags;
 import ch.schlau.pesche.apidocs.openapi.codefirst.txproc.model.Pan;
 
@@ -16,6 +18,8 @@ class PurchaseAuthRequestTest {
     @Test
     void json_roundtrip() {
 
+        Jsonb jsonb = JsonConfiguration.createJsonb();
+
         PurchaseAuthRequest request = new PurchaseAuthRequest();
         request.setUuid(UUID.fromString("abcdabcd-1234-5678-aaaa-cccccccccccc"));
         request.setPan(new Pan("42"));
@@ -24,11 +28,11 @@ void json_roundtrip() {
         request.setEmvTags(emvTags);
 
         // JSON serialization
-        String jsonString = JSONB.toJson(request);
+        String jsonString = jsonb.toJson(request);
         assertThat(jsonString, is("{\"emvTags\":{\"84\":\"A0000000041010\"},\"pan\":\"42\",\"uuid\":\"abcdabcd-1234-5678-aaaa-cccccccccccc\"}"));
 
         // JSON deserialization
-        PurchaseAuthRequest roundtrip = JSONB.fromJson(jsonString, PurchaseAuthRequest.class);
+        PurchaseAuthRequest roundtrip = jsonb.fromJson(jsonString, PurchaseAuthRequest.class);
         assertThat(roundtrip.getUuid().toString(), is("abcdabcd-1234-5678-aaaa-cccccccccccc"));
     }
 }
diff --git a/...us/src/test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/model/EmvTagsTest.java b/...us/src/test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/model/EmvTagsTest.java
@@ -1,19 +1,20 @@
 package ch.schlau.pesche.apidocs.openapi.codefirst.txproc.model;
 
-import static ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration.JSONB;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import jakarta.json.bind.Jsonb;
 
 import org.junit.jupiter.api.Test;
 
+import ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration;
+
 class EmvTagsTest {
 
     @Test
     void json_roundtrip() {
 
-        Jsonb jsonb = JSONB;
+        Jsonb jsonb = JsonConfiguration.createJsonb();
 
         EmvTags emv = new EmvTags();
         emv.setX84("A0000000043060");

diff --git a/...uarkus/src/test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/model/PanTest.java b/...uarkus/src/test/java/ch/schlau/pesche/apidocs/openapi/codefirst/txproc/model/PanTest.java
@@ -1,6 +1,5 @@
 package ch.schlau.pesche.apidocs.openapi.codefirst.txproc.model;
 
-import static ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration.JSONB;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -9,6 +8,8 @@
 
 import org.junit.jupiter.api.Test;
 
+import ch.schlau.pesche.apidocs.openapi.codefirst.rest.JsonConfiguration;
+
 class PanTest {
 
     @Test
@@ -29,7 +30,7 @@ void asMaskedPan_invalid() {
     @Test
     void json_roundtrip() {
 
-        Jsonb jsonb = JSONB;
+        Jsonb jsonb = JsonConfiguration.createJsonb();
 
         Pan pan = new Pan("4444333322221111");
 

diff --git a/code-first-swagger/pom.xml b/code-first-swagger/pom.xml
@@ -18,7 +18,7 @@
 
         <!-- artifact versions -->
         <lombok.version>1.18.30</lombok.version>
-        <quarkus.version>3.7.1</quarkus.version>
+        <quarkus.version>3.8.1</quarkus.version>
         <swagger.version>2.2.20</swagger.version>
 
         <!-- testing artifact versions -->
@@ -44,9 +44,17 @@
 
     <dependencies>
         <!-- Jakarta EE and MP dependencies -->
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jsonb</artifactId>
+            <artifactId>quarkus-resteasy-reactive-jsonb</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...gger/src/main/java/ch/schlau/pesche/apidocs/swagger/codefirst/rest/JsonConfiguration.java b/...gger/src/main/java/ch/schlau/pesche/apidocs/swagger/codefirst/rest/JsonConfiguration.java
@@ -1,18 +1,36 @@
 package ch.schlau.pesche.apidocs.swagger.codefirst.rest;
 
+import jakarta.enterprise.context.Dependent;
+import jakarta.enterprise.inject.Instance;
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.JsonbConfig;
 
 import ch.schlau.pesche.apidocs.swagger.codefirst.txproc.model.PanJsonAdapter;
-import lombok.experimental.UtilityClass;
+import io.quarkus.jsonb.JsonbConfigCustomizer;
 
-@UtilityClass
 public class JsonConfiguration {
 
-    public static final JsonbConfig JSON_CONFIG = new JsonbConfig()
+    public static JsonbConfig createJsonbConfig() {
+        return new JsonbConfig()
             .withAdapters(new PanJsonAdapter())
             ;
+    }
 
-    public static final Jsonb JSONB = JsonbBuilder.create(JSON_CONFIG);
+    public static Jsonb createJsonb() {
+        return JsonbBuilder.create(createJsonbConfig());
+    }
+
+    // Replaces the CDI producer for JsonbConfig built into Quarkus
+    @Dependent
+    JsonbConfig jsonConfig(Instance<JsonbConfigCustomizer> customizers) {
+        JsonbConfig config = createJsonbConfig();
+
+        // Apply all JsonbConfigCustomizer beans (incl. Quarkus)
+        for (JsonbConfigCustomizer customizer : customizers) {
+            customizer.customize(config);
+        }
+
+        return config;
+    }
 }
diff --git a/...er/src/main/java/ch/schlau/pesche/apidocs/swagger/codefirst/rest/JsonContextResolver.java b/...er/src/main/java/ch/schlau/pesche/apidocs/swagger/codefirst/rest/JsonContextResolver.java
diff --git a/.../src/test/java/ch/schlau/pesche/apidocs/swagger/codefirst/txproc/PinCheckRequestTest.java b/.../src/test/java/ch/schlau/pesche/apidocs/swagger/codefirst/txproc/PinCheckRequestTest.java
@@ -1,37 +1,41 @@
 package ch.schlau.pesche.apidocs.swagger.codefirst.txproc;
 
-import static ch.schlau.pesche.apidocs.swagger.codefirst.rest.JsonConfiguration.JSONB;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.UUID;
 
+import jakarta.json.bind.Jsonb;
+
 import org.junit.jupiter.api.Test;
 
+import ch.schlau.pesche.apidocs.swagger.codefirst.rest.JsonConfiguration;
 import ch.schlau.pesche.apidocs.swagger.codefirst.txproc.model.Pan;
 
 class PinCheckRequestTest {
 
     @Test
     void json_roundtrip() {
 
+        Jsonb jsonb = JsonConfiguration.createJsonb();
+
         PinCheckRequest request = new PinCheckRequest();
         request.setUuid(UUID.fromString("abcdabcd-1234-5678-aaaa-cccccccccccc"));
 
         // JSON serialization
-        String jsonString1 = JSONB.toJson(request);
+        String jsonString1 = jsonb.toJson(request);
         assertThat(jsonString1, is("{\"uuid\":\"abcdabcd-1234-5678-aaaa-cccccccccccc\"}"));
 
         // set the other properties as well
         request.setPan(new Pan("111222333444"));
         request.setPinBlock("-secret-");
-        String jsonString2 = JSONB.toJson(request);
+        String jsonString2 = jsonb.toJson(request);
         assertThat(jsonString2, is("{\"pan\":\"111222333444\",\"pinBlock\":\"-secret-\",\"uuid\":\"abcdabcd-1234-5678-aaaa-cccccccccccc\"}"));
 
         // JSON deserialization
-        PinCheckRequest roundtrip = JSONB.fromJson(jsonString2, PinCheckRequest.class);
+        PinCheckRequest roundtrip = jsonb.fromJson(jsonString2, PinCheckRequest.class);
         assertThat(roundtrip.getUuid().toString(), is("abcdabcd-1234-5678-aaaa-cccccccccccc"));
         assertThat(roundtrip.getPan().getPan(), is("111222333444"));
         assertThat(roundtrip.getPinBlock(), is("-secret-"));
     }
-}
+}