Cleanup

stromner-stralfors · stromner-stralfors · commit 58ffc2419c4b · 2026-01-08T13:46:06.000+01:00
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -20,15 +20,15 @@
 
     <modules>
         <module>kafka</module>
-        <!--<module>restful-ws-quarkus</module> TODO!-->
+        <module>restful-ws-quarkus</module>
         <module>restful-ws-microprofile-liberty</module>
         <module>vertx</module>
         <module>basic-http</module>
         <module>restful-ws-spring-boot</module>
         <module>amqp-proton</module>
         <module>spring-reactive</module>
         <module>spring-rsocket</module>
-        <!--<module>spring-function</module> TODO!-->
+        <module>spring-function</module>
         <module>rocketmq</module>
     </modules>
 
diff --git a/examples/restful-ws-quarkus/pom.xml b/examples/restful-ws-quarkus/pom.xml
@@ -11,10 +11,10 @@
     <artifactId>cloudevents-restful-ws-quarkus-example</artifactId>
     <properties>
         <module-name>cloudevents.example.restful.ws.quarkus</module-name>
-        <quarkus-plugin.version>3.30.4</quarkus-plugin.version>
+        <quarkus-plugin.version>3.30.5</quarkus-plugin.version>
         <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-        <quarkus.platform.version>3.30.4</quarkus.platform.version>
+        <quarkus.platform.version>3.30.5</quarkus.platform.version>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
+            <artifactId>quarkus-rest-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
diff --git a/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/client/UserClient.java b/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/client/UserClient.java
@@ -1,8 +1,9 @@
 package io.cloudevents.examples.quarkus.client;
 
-import javax.ws.rs.Consumes;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Path;
 
 import io.cloudevents.CloudEvent;
 import io.cloudevents.jackson.JsonFormat;
@@ -11,6 +12,7 @@
 
 @Path("/users")
 @RegisterRestClient
+@ApplicationScoped
 public interface UserClient {
 
     // This will emit binary encoded events.
diff --git a/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/client/UserEventsGenerator.java b/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/client/UserEventsGenerator.java
@@ -3,11 +3,11 @@
 import java.net.URI;
 import java.util.UUID;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.core.MediaType;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 
 import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.slf4j.Logger;
@@ -26,12 +26,12 @@ public class UserEventsGenerator {
     private static final Logger LOGGER = LoggerFactory.getLogger(UserEventsGenerator.class);
 
     @Inject
-    ObjectMapper mapper;
+    JsonMapper mapper;
 
     @Inject
     @RestClient
     UserClient userClient;
-    
+
     long userCount=0;
 
     @Scheduled(every="2s")
diff --git a/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/config/ApplicationConfig.java b/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/config/ApplicationConfig.java
@@ -0,0 +1,14 @@
+package io.cloudevents.examples.quarkus.config;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
+import tools.jackson.databind.json.JsonMapper;
+
+@ApplicationScoped
+public class ApplicationConfig {
+    @Produces
+    @ApplicationScoped
+    public JsonMapper jsonMapper() {
+        return JsonMapper.builder().findAndAddModules().build();
+    }
+}
diff --git a/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/resources/UserResource.java b/examples/restful-ws-quarkus/src/main/java/io/cloudevents/examples/quarkus/resources/UserResource.java
@@ -1,19 +1,20 @@
 package io.cloudevents.examples.quarkus.resources;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import tools.jackson.databind.json.JsonMapper;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.examples.quarkus.model.User;
 import io.cloudevents.jackson.JsonFormat;
 import io.cloudevents.jackson.PojoCloudEventDataMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.inject.Inject;
-import javax.ws.rs.*;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Context;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriInfo;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -25,12 +26,12 @@ public class UserResource {
     private static final Logger LOGGER = LoggerFactory.getLogger(UserResource.class);
 
     @Inject
-    ObjectMapper mapper;
+    JsonMapper mapper;
 
     @Context
     UriInfo uriInfo;
 
-    private Map<String, User> users = new HashMap<>();
+    private final Map<String, User> users = new HashMap<>();
 
     @GET
     @Path("/{username}")
diff --git a/examples/restful-ws-quarkus/src/main/resources/application.properties b/examples/restful-ws-quarkus/src/main/resources/application.properties
@@ -4,4 +4,3 @@
 ## The Rest client will send events to the local UserResource
 io.cloudevents.examples.quarkus.client.UserClient/mp-rest/url=http://localhost:8080
 %test.io.cloudevents.examples.quarkus.client.UserClient/mp-rest/url=http://localhost:8081
-io.cloudevents.examples.quarkus.client.UserClient/mp-rest/scope=javax.inject.Singleton
diff --git a/examples/restful-ws-quarkus/src/test/java/io/cloudevents/examples/quarkus/NativeUserResourceTestIT.java b/examples/restful-ws-quarkus/src/test/java/io/cloudevents/examples/quarkus/NativeUserResourceTestIT.java
@@ -1,8 +1,8 @@
 package io.cloudevents.examples.quarkus;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 public class NativeUserResourceTestIT extends UserResourceTest {
 
     // Execute the same tests but in native mode.
diff --git a/examples/spring-function/src/test/java/io/cloudevents/examples/spring/DemoApplicationTests.java b/examples/spring-function/src/test/java/io/cloudevents/examples/spring/DemoApplicationTests.java
@@ -1,6 +1,7 @@
 package io.cloudevents.examples.spring;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
@@ -15,8 +16,8 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@Disabled("ContentType behaves odd after upgrading from deprecated TestRestTemplate")
 class DemoApplicationTests {
-    String NEW_BODY = "{\"data\": {\"value\": \"Dave\" }}";
     private static final String BODY = "{\"value\":\"Dave\"}";
 	private RestTestClient rest;
 
@@ -40,7 +41,7 @@ void echoWithCorrectHeaders() {
             .header("ce-type", "io.spring.event")
             .header("ce-source", "https://spring.io/events")
             .contentType(MediaType.APPLICATION_JSON)
-            .body(NEW_BODY)
+            .body(BODY)
             .exchange()
             .returnResult(String.class);
 
@@ -63,17 +64,15 @@ void structuredRequestResponseEvents() {
         ExchangeResult response = rest.post()
             .uri("/event")
             .contentType(new MediaType("application", "cloudevents+json"))
-            .body(String.format(
-                """
-                    {
-                        "id": "12345",
-                        "specversion": "1.0",
-                        "type": "io.spring.event",
-                        "source": "https://spring.io/events",
-                        "data": %s
-                    }
-                    """, BODY
-            ))
+            .body("""
+                {
+                    "id": "12345",
+                    "specversion": "1.0",
+                    "type": "io.spring.event",
+                    "source": "https://spring.io/events",
+                    "data": %s
+                }
+                """.formatted(BODY))
             .exchange()
             .returnResult(String.class);
 
diff --git a/formats/json-jackson/src/main/java/io/cloudevents/jackson/CloudEventDeserializer.java b/formats/json-jackson/src/main/java/io/cloudevents/jackson/CloudEventDeserializer.java
@@ -38,7 +38,6 @@
 import tools.jackson.databind.node.NullNode;
 import tools.jackson.databind.node.ObjectNode;
 
-import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 
 /**
diff --git a/spring/src/main/java/io/cloudevents/spring/http/CloudEventHttpUtils.java b/spring/src/main/java/io/cloudevents/spring/http/CloudEventHttpUtils.java
@@ -58,7 +58,7 @@ private CloudEventHttpUtils() {
     public static MessageReader toReader(HttpHeaders headers, Supplier<byte[]> body) throws CloudEventRWException {
         Map<String, List<String>> headersMap = new HashMap<>();
         headers.forEach((key, values) -> headersMap.put(key, new ArrayList<>(values)));
-        return HttpMessageFactory.createReaderFromMultimap(headersMap, body.get()); // TODO - Take header iterator instead
+        return HttpMessageFactory.createReaderFromMultimap(headersMap, body.get());
     }
 
 	/**
diff --git a/sql/src/test/java/io/cloudevents/sql/asserts/ResultAssert.java b/sql/src/test/java/io/cloudevents/sql/asserts/ResultAssert.java
@@ -25,6 +25,7 @@ public IntegerAssert asInteger() {
             .asInstanceOf(INTEGER);
     }
 
+    @Override
     public StringAssert asString() {
         isNotNull();
         return (StringAssert) assertThat(this.actual.value())
