Merge pull request #44 from rgdoliveira/sync_main

Sync main branch with Apache main branch (OSL 1.35 cut-off)
kiegroup · Nov 7, 2024 · 0f7a410 · 0f7a410
2 parents 3ec8627 + ebb5fcc
commit 0f7a410
Show file tree

Hide file tree

Showing 72 changed files with 1,231 additions and 1,129 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
diff --git a/...src/main/java/org/kie/kogito/app/audit/json/JsonProcessInstanceDataEventDeserializer.java b/...src/main/java/org/kie/kogito/app/audit/json/JsonProcessInstanceDataEventDeserializer.java
diff --git a/...rc/main/java/org/kie/kogito/app/audit/json/JsonUserTaskInstanceDataEventDeserializer.java b/...rc/main/java/org/kie/kogito/app/audit/json/JsonUserTaskInstanceDataEventDeserializer.java
diff --git a/...udit/data-audit-common-service/src/main/java/org/kie/kogito/app/audit/json/JsonUtils.java b/...udit/data-audit-common-service/src/main/java/org/kie/kogito/app/audit/json/JsonUtils.java
@@ -19,13 +19,10 @@
 package org.kie.kogito.app.audit.json;
 
 import org.kie.kogito.event.job.JobInstanceDataEvent;
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import io.cloudevents.jackson.JsonFormat;
 
@@ -41,15 +38,7 @@ public static ObjectMapper getObjectMapper() {
     }
 
     public static ObjectMapper configure(ObjectMapper objectMapper) {
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        objectMapper.registerModule(JsonFormat.getCloudEventJacksonModule());
-        objectMapper.registerModule(new JavaTimeModule());
-
-        SimpleModule module = new SimpleModule("Kogito Cloud Events");
-        module.addDeserializer(ProcessInstanceDataEvent.class, new JsonProcessInstanceDataEventDeserializer());
-        module.addDeserializer(UserTaskInstanceDataEvent.class, new JsonUserTaskInstanceDataEventDeserializer());
-        module.addDeserializer(JobInstanceDataEvent.class, new JsonJobDataEventDeserializer());
-        objectMapper.registerModule(module);
-        return objectMapper;
+        return objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(JsonFormat.getCloudEventJacksonModule())
+                .registerModule(new SimpleModule("Data Audit").addDeserializer(JobInstanceDataEvent.class, new JsonJobDataEventDeserializer())).findAndRegisterModules();
     }
 }
diff --git a/...mon/src/main/java/org/kie/kogito/index/json/JsonProcessInstanceDataEventDeserializer.java b/...mon/src/main/java/org/kie/kogito/index/json/JsonProcessInstanceDataEventDeserializer.java
diff --git a/...on/src/main/java/org/kie/kogito/index/json/JsonUserTaskInstanceDataEventDeserializer.java b/...on/src/main/java/org/kie/kogito/index/json/JsonUserTaskInstanceDataEventDeserializer.java
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java
@@ -18,17 +18,13 @@
  */
 package org.kie.kogito.index.json;
 
-import org.kie.kogito.event.process.ProcessInstanceDataEvent;
-import org.kie.kogito.event.usertask.UserTaskInstanceDataEvent;
 import org.kie.kogito.jackson.utils.JsonObjectUtils;
 import org.kie.kogito.jackson.utils.MergeUtils;
 import org.kie.kogito.jackson.utils.ObjectMapperFactory;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 
 import io.cloudevents.jackson.JsonFormat;
 
@@ -44,15 +40,7 @@ public static ObjectMapper getObjectMapper() {
     }
 
     public static ObjectMapper configure(ObjectMapper objectMapper) {
-        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-        objectMapper.registerModule(JsonFormat.getCloudEventJacksonModule());
-        objectMapper.registerModule(new JavaTimeModule());
-
-        SimpleModule module = new SimpleModule("Kogito Cloud Events");
-        module.addDeserializer(ProcessInstanceDataEvent.class, new JsonProcessInstanceDataEventDeserializer());
-        module.addDeserializer(UserTaskInstanceDataEvent.class, new JsonUserTaskInstanceDataEventDeserializer());
-        objectMapper.registerModule(module);
-        return objectMapper;
+        return objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).registerModule(JsonFormat.getCloudEventJacksonModule()).findAndRegisterModules();
     }
 
     public static ObjectNode mergeVariable(String variableName, Object variableValue, ObjectNode variables) {