CloudEventBuilder fixes

Author: stan-r-ds

core/src/main/java/dev/streamx/cli/command/ingestion/batch/BatchCommand.java

@@ -7,7 +7,6 @@
 import com.streamx.clients.ingestion.publisher.Publisher;
 import dev.streamx.cli.VersionProvider;
 import dev.streamx.cli.command.ingestion.BaseIngestionCommand;
-import dev.streamx.cli.command.ingestion.CloudEventBuilder;
 import dev.streamx.cli.command.ingestion.batch.exception.EventSourceDescriptorException;
 import dev.streamx.cli.command.ingestion.batch.exception.FileIngestionException;
 import dev.streamx.cli.command.ingestion.batch.resolver.BatchPayloadResolver;

…command/ingestion/CloudEventBuilder.java …d/ingestion/batch/CloudEventBuilder.javacore/src/main/java/dev/streamx/cli/command/ingestion/CloudEventBuilder.java renamed to core/src/main/java/dev/streamx/cli/command/ingestion/batch/CloudEventBuilder.java core/src/main/java/dev/streamx/cli/command/ingestion/CloudEventBuilder.java renamed to core/src/main/java/dev/streamx/cli/command/ingestion/batch/CloudEventBuilder.java

@@ -1,7 +1,6 @@
-package dev.streamx.cli.command.ingestion;
+package dev.streamx.cli.command.ingestion.batch;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.NullNode;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.jackson.JsonCloudEventData;
@@ -12,17 +11,10 @@
 
 public class CloudEventBuilder {
 
-  private static final ObjectMapper objectMapper = new ObjectMapper();
-
   private CloudEventBuilder() {
     // no instance
   }
 
-  public static CloudEvent build(String subject, String type, String source, Object data) {
-    JsonNode dataNode = objectMapper.valueToTree(data);
-    return build(subject, type, source, dataNode);
-  }
-
   public static CloudEvent build(String subject, String type, String source, JsonNode data) {
     var builder = io.cloudevents.core.builder.CloudEventBuilder.v1()
         .withId(UUID.randomUUID().toString())
@@ -41,4 +33,4 @@ public static CloudEvent build(String subject, String type, String source, JsonN
         .build();
   }
 
-}
+}

core/src/test/java/dev/streamx/cli/command/ingestion/BaseIngestionCommandTest.java

@@ -6,10 +6,12 @@
 import static com.streamx.clients.ingestion.StreamxClient.INGESTION_ENDPOINT_PATH_V2;
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.fasterxml.jackson.databind.node.TextNode;
 import com.github.tomakehurst.wiremock.client.ResponseDefinitionBuilder;
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.streamx.ce.serialization.json.CloudEventJsonSerializer;
+import dev.streamx.cli.command.ingestion.batch.CloudEventBuilder;
 import io.cloudevents.CloudEvent;
 import io.quarkus.test.junit.main.LaunchResult;
 import org.apache.hc.core5.http.HttpStatus;
@@ -33,7 +35,7 @@ void setup() {
 
   private void initializeWiremock() {
     setupMockPublicationResponse(
-        CloudEventBuilder.build("index.html", "some-event-type", "source", "mock-response")
+        CloudEventBuilder.build("index.html", "some-event-type", "source", new TextNode("mock-response"))
     );
   }