Fixed rebase issues

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>

Author: slinkydeveloper

formats/json-jackson/src/main/java/io/cloudevents/jackson/PojoCloudEventDataMapper.java

@@ -7,7 +7,7 @@
 import io.cloudevents.rw.CloudEventDataMapper;
 import io.cloudevents.rw.CloudEventRWException;
 
-public class PojoCloudEventDataMapper<T> implements CloudEventDataMapper {
+public class PojoCloudEventDataMapper<T> implements CloudEventDataMapper<PojoCloudEventData<T>> {
 
     private final ObjectMapper mapper;
     private final TypeReference<T> target;

formats/json-jackson/src/test/java/io/cloudevents/jackson/PojoCloudEventDataMapperTest.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.builder.CloudEventBuilder;
+import io.cloudevents.core.impl.CloudEventUtils;
 import io.cloudevents.core.test.Data;
 import org.junit.jupiter.api.Test;
 
@@ -25,10 +26,11 @@ public void testWithBytes() {
             .withData("application/json", myPojoSerialized.getBytes())
             .build();
 
-        PojoCloudEventData<MyPojo> mappedData = PojoCloudEventDataMapper
-            .from(objectMapper, new TypeReference<MyPojo>() {
+        PojoCloudEventData<MyPojo> mappedData = CloudEventUtils.mapData(
+            event,
+            PojoCloudEventDataMapper.from(objectMapper, new TypeReference<MyPojo>() {
             })
-            .map(event.getData());
+        );
         assertThat(mappedData)
             .isNotNull()
             .extracting(PojoCloudEventData::getValue)
@@ -43,10 +45,11 @@ public void testWithJson() {
             .withData("application/json", new JsonCloudEventData(myPojoJson))
             .build();
 
-        PojoCloudEventData<MyPojo> mappedData = PojoCloudEventDataMapper
-            .from(objectMapper, new TypeReference<MyPojo>() {
+        PojoCloudEventData<MyPojo> mappedData = CloudEventUtils.mapData(
+            event,
+            PojoCloudEventDataMapper.from(objectMapper, new TypeReference<MyPojo>() {
             })
-            .map(event.getData());
+        );
         assertThat(mappedData)
             .isNotNull()
             .extracting(PojoCloudEventData::getValue)