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 index d301a73b..0e848fff 100644 --- a/formats/json-jackson/src/main/java/io/cloudevents/jackson/CloudEventDeserializer.java +++ b/formats/json-jackson/src/main/java/io/cloudevents/jackson/CloudEventDeserializer.java @@ -118,7 +118,7 @@ class CloudEventDeserializer extends StdDeserializer { if (JsonFormat.dataIsJsonContentType(contentType)) { // This solution is quite bad, but i see no alternatives now. // Hopefully in future we can improve it - data = new JsonCloudEventData(node.remove("data")); + data = JsonCloudEventData.wrap(node.remove("data")); } else { JsonNode dataNode = node.remove("data"); assertNodeType(dataNode, JsonNodeType.STRING, "data", "Because content type is not a json, only a string is accepted as data"); @@ -136,7 +136,7 @@ class CloudEventDeserializer extends StdDeserializer { if (JsonFormat.dataIsJsonContentType(contentType)) { // This solution is quite bad, but i see no alternatives now. // Hopefully in future we can improve it - data = new JsonCloudEventData(node.remove("data")); + data = JsonCloudEventData.wrap(node.remove("data")); } else { JsonNode dataNode = node.remove("data"); assertNodeType(dataNode, JsonNodeType.STRING, "data", "Because content type is not a json, only a string is accepted as data"); diff --git a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonCloudEventDataTest.java b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonCloudEventDataTest.java index 9ae8cfc2..1d9488e1 100644 --- a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonCloudEventDataTest.java +++ b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonCloudEventDataTest.java @@ -37,7 +37,7 @@ public class JsonCloudEventDataTest { @MethodSource("textContentArguments") public void testMapper(String contentType) { CloudEvent event = CloudEventBuilder.v1(Data.V1_MIN) - .withData(contentType, new JsonCloudEventData(JsonNodeFactory.instance.numberNode(10))) + .withData(contentType, JsonCloudEventData.wrap(JsonNodeFactory.instance.numberNode(10))) .build(); byte[] serialized = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE) diff --git a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java index 253e2fc8..c5fbb9ed 100644 --- a/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java +++ b/formats/json-jackson/src/test/java/io/cloudevents/jackson/JsonFormatTest.java @@ -330,7 +330,7 @@ class JsonFormatTest { builder = CloudEventBuilder.v03(event); } return builder - .withData(new JsonCloudEventData(JsonNodeFactory.instance.objectNode())) + .withData(JsonCloudEventData.wrap(JsonNodeFactory.instance.objectNode())) .build(); } else { return event; diff --git a/formats/json-jackson/src/test/java/io/cloudevents/jackson/PojoCloudEventDataMapperTest.java b/formats/json-jackson/src/test/java/io/cloudevents/jackson/PojoCloudEventDataMapperTest.java index f93ef1cc..a7eccbaa 100644 --- a/formats/json-jackson/src/test/java/io/cloudevents/jackson/PojoCloudEventDataMapperTest.java +++ b/formats/json-jackson/src/test/java/io/cloudevents/jackson/PojoCloudEventDataMapperTest.java @@ -46,7 +46,7 @@ public class PojoCloudEventDataMapperTest { public void testWithJson(PojoCloudEventDataMapper mapper) { CloudEvent event = CloudEventBuilder.v1(Data.V1_MIN) - .withData("application/json", new JsonCloudEventData(myPojoJson)) + .withData("application/json", JsonCloudEventData.wrap(myPojoJson)) .build(); PojoCloudEventData mappedData = CloudEventUtils.mapData(