Random improvements.

jacekbilski · jacekbilski · commit c4d7f103f619 · 2026-06-09T23:21:43.000+02:00
Signed-off-by: Jacek Bilski &lt;jacek@bilski.tech&gt;
diff --git a/api/src/main/java/io/cloudevents/rw/CloudEventContextWriter.java b/api/src/main/java/io/cloudevents/rw/CloudEventContextWriter.java
@@ -85,8 +85,9 @@ default CloudEventContextWriter withContextAttribute(String name, OffsetDateTime
      * @throws IllegalArgumentException if you're trying to set the specversion attribute.
      *
      * @deprecated CloudEvent specification only permits {@link Integer} type as a
-     * numeric value.
+     * numeric value. Use {@link #withContextAttribute(String, Integer)} instead.
      */
+    @Deprecated
     default CloudEventContextWriter withContextAttribute(String name, Number value) throws CloudEventRWException {
         return withContextAttribute(name, value.toString());
     }
@@ -122,7 +123,7 @@ default CloudEventContextWriter withContextAttribute(String name, Boolean value)
     }
 
     /**
-     * Set attribute with a binary type.
+     * Set the attribute with a binary type.
      * This setter should not be invoked for specversion, because the writer should
      * already know the specversion or because it doesn't need it to correctly write the value.
      *
diff --git a/core/src/main/java/io/cloudevents/core/data/BytesCloudEventData.java b/core/src/main/java/io/cloudevents/core/data/BytesCloudEventData.java
@@ -16,6 +16,7 @@ public class BytesCloudEventData implements CloudEventData {
      * @param value the bytes to wrap
      * @deprecated use {@link BytesCloudEventData#wrap(byte[])}
      */
+    @Deprecated
     public BytesCloudEventData(byte[] value) {
         Objects.requireNonNull(value);
         this.value = value;
diff --git a/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpClient.java b/examples/amqp-proton/src/main/java/io/cloudevents/examples/amqp/vertx/AmqpClient.java
@@ -18,7 +18,7 @@
 import java.nio.charset.StandardCharsets;
 
 /**
- * A example vertx-based AMQP client that interacts with a remote AMQP server to send and receive CloudEvent messages.
+ * An example vertx-based AMQP client that interacts with a remote AMQP server to send and receive CloudEvent messages.
  */
 public class AmqpClient {
 
diff --git a/examples/restful-ws-spring-boot/src/main/java/io/cloudevents/examples/springboot/MainResource.java b/examples/restful-ws-spring-boot/src/main/java/io/cloudevents/examples/springboot/MainResource.java
@@ -22,40 +22,40 @@
 import io.cloudevents.core.builder.CloudEventBuilder;
 import io.cloudevents.core.data.PojoCloudEventData;
 import io.cloudevents.jackson.PojoCloudEventDataMapper;
-import org.springframework.beans.factory.annotation.Autowired;
 
-import jakarta.ws.rs.POST;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.MediaType;
-import jakarta.ws.rs.core.Response;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import static io.cloudevents.core.CloudEventUtils.mapData;
 
-@Path("/")
+@RestController
 public class MainResource {
 
     public static final String HAPPY_BIRTHDAY_EVENT_TYPE = "happybirthday.myapplication";
 
-    @Autowired
-    ObjectMapper objectMapper;
+    private final ObjectMapper objectMapper;
 
-    @POST
-    @Path("happy_birthday")
-    public Response handleHappyBirthdayEvent(CloudEvent inputEvent) {
+    public MainResource(ObjectMapper objectMapper) {
+        this.objectMapper = objectMapper;
+    }
+
+    @PostMapping("/happy_birthday")
+    public ResponseEntity handleHappyBirthdayEvent(@RequestBody CloudEvent inputEvent) {
         if (!inputEvent.getType().equals(HAPPY_BIRTHDAY_EVENT_TYPE)) {
-            return Response.status(Response.Status.BAD_REQUEST)
-                .type(MediaType.TEXT_PLAIN)
-                .entity("Event type should be \"" + HAPPY_BIRTHDAY_EVENT_TYPE + "\" but is \"" + inputEvent.getType() + "\"")
-                .build();
+            return ResponseEntity.badRequest()
+                .contentType(MediaType.TEXT_PLAIN)
+                .body("Event type should be \"" + HAPPY_BIRTHDAY_EVENT_TYPE + "\" but is \"" + inputEvent.getType() + "\"");
         }
 
         PojoCloudEventData<User> cloudEventData = mapData(inputEvent, PojoCloudEventDataMapper.from(objectMapper, User.class));
 
         if (cloudEventData == null) {
-            return Response.status(Response.Status.BAD_REQUEST)
-                .type(MediaType.TEXT_PLAIN)
-                .entity("Event should contain the user")
-                .build();
+            return ResponseEntity.badRequest()
+                .contentType(MediaType.TEXT_PLAIN)
+                .body("Event should contain the user");
         }
 
         User user = cloudEventData.getValue();
@@ -65,6 +65,6 @@ public Response handleHappyBirthdayEvent(CloudEvent inputEvent) {
             .withData(PojoCloudEventData.wrap(user, objectMapper::writeValueAsBytes))
             .build();
 
-        return Response.ok(outputEvent).build();
+        return ResponseEntity.ok(outputEvent);
     }
 }
diff --git a/examples/spring-reactive/src/test/java/io/cloudevents/examples/spring/DemoApplicationTests.java b/examples/spring-reactive/src/test/java/io/cloudevents/examples/spring/DemoApplicationTests.java
@@ -5,6 +5,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.http.MediaType;
@@ -14,6 +15,7 @@
 import io.cloudevents.core.builder.CloudEventBuilder;
 import static org.assertj.core.api.Assertions.assertThat;
 
+@AutoConfigureWebTestClient
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class DemoApplicationTests {
 
@@ -49,12 +51,13 @@ void structuredRequestResponseEvents() {
 
         rest.post().uri("/event") //
                 .contentType(new MediaType("application", "cloudevents+json")) //
-                .bodyValue("{" //
-                        + "\"id\":\"12345\"," //
-                        + "\"specversion\":\"1.0\"," //
-                        + "\"type\":\"io.spring.event\"," //
-                        + "\"source\":\"https://spring.io/events\"," //
-                        + "\"data\":{\"value\":\"Dave\"}}") //
+                .bodyValue("""
+                    {
+                    "id":"12345",
+                    "specversion":"1.0",
+                    "type":"io.spring.event",
+                    "source":"https://spring.io/events",
+                    "data":{"value":"Dave"}}""") //
                 .exchange() //
                 .expectStatus().isOk() //
                 .expectHeader().exists("ce-id") //
diff --git a/examples/spring-reactive/src/test/java/io/cloudevents/examples/spring/WebClientTests.java b/examples/spring-reactive/src/test/java/io/cloudevents/examples/spring/WebClientTests.java
@@ -8,6 +8,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.boot.test.web.server.LocalServerPort;
@@ -22,6 +23,7 @@
  * content of the request and response are asserted separately in
  * {@link DemoApplicationTests}.
  */
+@AutoConfigureWebTestClient
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 public class WebClientTests {
 
diff --git a/formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonCloudEventData.java b/formats/json-jackson/src/main/java/io/cloudevents/jackson/JsonCloudEventData.java
@@ -34,6 +34,7 @@ public class JsonCloudEventData implements CloudEventData {
      * @param node the json node to wrap
      * @deprecated You should use {@link #wrap(JsonNode)}
      */
+    @Deprecated
     public JsonCloudEventData(JsonNode node) {
         Objects.requireNonNull(node);
         this.node = node;
diff --git a/formats/xml/src/main/java/io/cloudevents/xml/OccurrenceTracker.java b/formats/xml/src/main/java/io/cloudevents/xml/OccurrenceTracker.java
@@ -37,8 +37,8 @@ class OccurrenceTracker {
     }
 
     /**
-     * Record an occurrence of attribute name.
-     * @param name The name  to track.
+     * Record an occurrence of an attribute name.
+     * @param name The name to track.
      * @return boolean true => accepted, false => duplicate name.
      */
     boolean trackOccurrence(String name) {
diff --git a/formats/xml/src/main/java/io/cloudevents/xml/XMLFormat.java b/formats/xml/src/main/java/io/cloudevents/xml/XMLFormat.java
@@ -19,7 +19,6 @@
 import io.cloudevents.CloudEvent;
 import io.cloudevents.CloudEventData;
 import io.cloudevents.core.builder.CloudEventBuilder;
-import io.cloudevents.core.format.ContentType;
 import io.cloudevents.core.format.EventDeserializationException;
 import io.cloudevents.core.format.EventFormat;
 import io.cloudevents.core.format.EventSerializationException;
diff --git a/formats/xml/src/test/java/io/cloudevents/xml/XMLUtilsTest.java b/formats/xml/src/test/java/io/cloudevents/xml/XMLUtilsTest.java
@@ -50,7 +50,7 @@ public void testChildCount() throws ParserConfigurationException {
 
         assertThat(XMLUtils.countOfChildElements(root)).isEqualTo(1);
 
-        // Add a another child
+        // Add another child
         Element c2 = doc.createElement("ChildTwo");
         root.appendChild(c2);
 
diff --git a/spring/src/main/java/io/cloudevents/spring/http/CloudEventHttpUtils.java b/spring/src/main/java/io/cloudevents/spring/http/CloudEventHttpUtils.java
@@ -27,6 +27,10 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
@@ -52,7 +56,9 @@ private CloudEventHttpUtils() {
      * @throws CloudEventRWException if something goes wrong while resolving the {@link SpecVersion} or if the message has unknown encoding
      */
     public static MessageReader toReader(HttpHeaders headers, Supplier<byte[]> body) throws CloudEventRWException {
-        return HttpMessageFactory.createReaderFromMultimap(headers, body.get());
+        Map<String, List<String>> headersMap = new HashMap<>();
+        headers.forEach((key, values) -> headersMap.put(key, new ArrayList<>(values)));
+        return HttpMessageFactory.createReaderFromMultimap(headersMap, body.get());
     }
 
 	/**
diff --git a/spring/src/main/java/io/cloudevents/spring/mvc/CloudEventHttpMessageConverter.java b/spring/src/main/java/io/cloudevents/spring/mvc/CloudEventHttpMessageConverter.java
@@ -38,36 +38,35 @@
  */
 public class CloudEventHttpMessageConverter extends AbstractHttpMessageConverter<CloudEvent> {
 
-	public CloudEventHttpMessageConverter() {
-		super(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL);
-	}
+    public CloudEventHttpMessageConverter() {
+        super(MediaType.APPLICATION_OCTET_STREAM, MediaType.ALL);
+    }
 
-	@Override
-	protected boolean supports(Class<?> clazz) {
-		return CloudEvent.class.isAssignableFrom(clazz);
-	}
+    @Override
+    protected boolean supports(Class<?> clazz) {
+        return CloudEvent.class.isAssignableFrom(clazz);
+    }
 
-	@Override
-	protected CloudEvent readInternal(Class<? extends CloudEvent> clazz, HttpInputMessage inputMessage)
-			throws IOException, HttpMessageNotReadableException {
-		byte[] body = StreamUtils.copyToByteArray(inputMessage.getBody());
-		return CloudEventHttpUtils.toReader(inputMessage.getHeaders(), () -> body).toEvent();
-	}
+    @Override
+    protected CloudEvent readInternal(Class<? extends CloudEvent> clazz, HttpInputMessage inputMessage)
+        throws IOException, HttpMessageNotReadableException {
+        byte[] body = StreamUtils.copyToByteArray(inputMessage.getBody());
+        return CloudEventHttpUtils.toReader(inputMessage.getHeaders(), () -> body).toEvent();
+    }
 
-	@Override
-	protected void writeInternal(CloudEvent event, HttpOutputMessage outputMessage)
-			throws IOException, HttpMessageNotWritableException {
-		CloudEventUtils.toReader(event)
-				.read(CloudEventHttpUtils.toWriter(outputMessage.getHeaders(), body -> copy(body, outputMessage)));
-	}
+    @Override
+    protected void writeInternal(CloudEvent event, HttpOutputMessage outputMessage)
+        throws IOException, HttpMessageNotWritableException {
+        CloudEventUtils.toReader(event)
+            .read(CloudEventHttpUtils.toWriter(outputMessage.getHeaders(), body -> copy(body, outputMessage)));
+    }
 
-	private void copy(byte[] body, HttpOutputMessage outputMessage) {
-		try {
-			StreamUtils.copy(body, outputMessage.getBody());
-		}
-		catch (IOException e) {
-			throw new IllegalStateException(e);
-		}
-	}
+    private void copy(byte[] body, HttpOutputMessage outputMessage) {
+        try {
+            StreamUtils.copy(body, outputMessage.getBody());
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
 
 }
diff --git a/spring/src/test/java/io/cloudevents/spring/mvc/MvcRestControllerTests.java b/spring/src/test/java/io/cloudevents/spring/mvc/MvcRestControllerTests.java
diff --git a/spring/src/test/java/io/cloudevents/spring/webflux/WebFluxRestControllerTests.java b/spring/src/test/java/io/cloudevents/spring/webflux/WebFluxRestControllerTests.java

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,9 @@ default CloudEventContextWriter withContextAttribute(String name, OffsetDateTime`
`85`	`85`	`* @throws IllegalArgumentException if you're trying to set the specversion attribute.`
`86`	`86`	`*`
`87`	`87`	`* @deprecated CloudEvent specification only permits {@link Integer} type as a`
`88`		`- * numeric value.`
	`88`	`+ * numeric value. Use {@link #withContextAttribute(String, Integer)} instead.`
`89`	`89`	`*/`
	`90`	`+ @Deprecated`
`90`	`91`	`default CloudEventContextWriter withContextAttribute(String name, Number value) throws CloudEventRWException {`
`91`	`92`	`return withContextAttribute(name, value.toString());`
`92`	`93`	`}`
`@@ -122,7 +123,7 @@ default CloudEventContextWriter withContextAttribute(String name, Boolean value)`
`122`	`123`	`}`
`123`	`124`
`124`	`125`	`/**`
`125`		`- * Set attribute with a binary type.`
	`126`	`+ * Set the attribute with a binary type.`
`126`	`127`	`* This setter should not be invoked for specversion, because the writer should`
`127`	`128`	`* already know the specversion or because it doesn't need it to correctly write the value.`
`128`	`129`	`*`