[Fix apache/incubator-kie-issues#1457] Converter deserialization

apache · Oct 4, 2024 · c2ea8f3 · c2ea8f3
1 parent 8bc0786
commit c2ea8f3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 4 deletions.
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
@@ -58,7 +58,7 @@ public ProcessInstanceDataEvent<?> deserialize(JsonParser jp, DeserializationCon
         String type = node.get("type").asText();
 
         switch (type) {
-            case "MultipleProcessInstanceDataEvent":
+            case MultipleProcessInstanceDataEvent.TYPE:
                 return jp.getCodec().treeToValue(node, MultipleProcessInstanceDataEvent.class);
             case "ProcessInstanceErrorDataEvent":
                 return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceErrorDataEvent.class);

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
@@ -59,7 +59,7 @@ public UserTaskInstanceDataEvent<?> deserialize(JsonParser jp, DeserializationCo
         String type = node.get("type").asText();
 
         switch (type) {
-            case "MultipleUserTaskInstanceDataEvent":
+            case MultipleUserTaskInstanceDataEvent.TYPE:
                 return jp.getCodec().treeToValue(node, MultipleUserTaskInstanceDataEvent.class);
             case "UserTaskInstanceAssignmentDataEvent":
                 return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceAssignmentDataEvent.class);

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
@@ -58,7 +58,7 @@ public ProcessInstanceDataEvent<?> deserialize(JsonParser jp, DeserializationCon
         String type = node.get("type").asText();
 
         switch (type) {
-            case "MultipleProcessInstanceDataEvent":
+            case MultipleProcessInstanceDataEvent.TYPE:
                 return jp.getCodec().treeToValue(node, MultipleProcessInstanceDataEvent.class);
             case "ProcessInstanceErrorDataEvent":
                 return (ProcessInstanceDataEvent<?>) jp.getCodec().treeToValue(node, ProcessInstanceErrorDataEvent.class);

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
@@ -59,7 +59,7 @@ public UserTaskInstanceDataEvent<?> deserialize(JsonParser jp, DeserializationCo
         String type = node.get("type").asText();
 
         switch (type) {
-            case "MultipleUserTaskInstanceDataEvent":
+            case MultipleUserTaskInstanceDataEvent.TYPE:
                 return jp.getCodec().treeToValue(node, MultipleUserTaskInstanceDataEvent.class);
             case "UserTaskInstanceAssignmentDataEvent":
                 return (UserTaskInstanceDataEvent<?>) jp.getCodec().treeToValue(node, UserTaskInstanceAssignmentDataEvent.class);

diff --git a/data-index/data-index-common/src/test/java/org/kie/kogito/index/json/JsonUtilsTest.java b/data-index/data-index-common/src/test/java/org/kie/kogito/index/json/JsonUtilsTest.java
@@ -45,4 +45,20 @@ void testComplexMergeWithDot() {
         assertThat(JsonUtils.mergeVariable("key.user1", "manolo", ObjectMapperFactory.get().createObjectNode().set("key", ObjectMapperFactory.get().createObjectNode().put("user2", "pepe"))))
                 .isEqualTo(expected);
     }
+
+    @Test
+    void testMergeWorkflowdata() {
+        ObjectNode result = ObjectMapperFactory.get().createObjectNode().put("link", "link1").put("name", "name1");
+        ObjectNode base = ObjectMapperFactory.get().createObjectNode().set("workflowdata", ObjectMapperFactory.get().createObjectNode().put("user1", "manolo").put("user2", "pepe"));
+        ObjectNode expected = base.deepCopy();
+        ((ObjectNode) expected.get("workflowdata")).set("result", result);
+        assertThat(JsonUtils.mergeVariable("workflowdata.result", result, base)).isEqualTo(expected);
+    }
+
+    @Test
+    void testSelfMerge() {
+        ObjectNode source = ObjectMapperFactory.get().createObjectNode().put("user1", "Javierito").put("user2", "Vicentito");
+        ObjectNode target = ObjectMapperFactory.get().createObjectNode().set("workflowdata", ObjectMapperFactory.get().createObjectNode().put("user1", "manolo").put("user2", "pepe"));
+        assertThat(JsonUtils.mergeVariable("workflowdata", source, target)).isEqualTo(ObjectMapperFactory.get().createObjectNode().set("workflowdata", source));
+    }
 }
diff --git a/...ommon/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java b/...ommon/src/main/java/org/kie/kogito/index/service/messaging/KogitoIndexEventConverter.java
@@ -25,6 +25,7 @@
 import org.eclipse.microprofile.reactive.messaging.Message;
 import org.kie.kogito.event.AbstractDataEvent;
 import org.kie.kogito.event.DataEvent;
+import org.kie.kogito.event.process.MultipleProcessInstanceDataEvent;
 import org.kie.kogito.event.process.ProcessDefinitionDataEvent;
 import org.kie.kogito.event.process.ProcessDefinitionEventBody;
 import org.kie.kogito.event.process.ProcessInstanceDataEvent;
@@ -38,6 +39,7 @@
 import org.kie.kogito.event.process.ProcessInstanceStateEventBody;
 import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent;
 import org.kie.kogito.event.process.ProcessInstanceVariableEventBody;
+import org.kie.kogito.event.usertask.MultipleUserTaskInstanceDataEvent;
 import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentDataEvent;
 import org.kie.kogito.event.usertask.UserTaskInstanceAssignmentEventBody;
 import org.kie.kogito.event.usertask.UserTaskInstanceAttachmentDataEvent;
@@ -139,6 +141,8 @@ public void setObjectMapper(ObjectMapper objectMapper) {
 
     private DataEvent<?> buildProcessInstanceDataEventVariant(CloudEvent cloudEvent) throws IOException {
         switch (cloudEvent.getType()) {
+            case MultipleProcessInstanceDataEvent.TYPE:
+                return objectMapper.convertValue(cloudEvent, MultipleProcessInstanceDataEvent.class);
             case "ProcessInstanceErrorDataEvent":
                 return buildDataEvent(cloudEvent, objectMapper, ProcessInstanceErrorDataEvent::new, ProcessInstanceErrorEventBody.class);
             case "ProcessInstanceNodeDataEvent":
@@ -156,6 +160,8 @@ private DataEvent<?> buildProcessInstanceDataEventVariant(CloudEvent cloudEvent)
 
     private DataEvent<?> buildUserTaskInstanceDataEvent(CloudEvent cloudEvent) throws IOException {
         switch (cloudEvent.getType()) {
+            case MultipleUserTaskInstanceDataEvent.TYPE:
+                return objectMapper.convertValue(cloudEvent, MultipleUserTaskInstanceDataEvent.class);
             case "UserTaskInstanceAssignmentDataEvent":
                 return buildDataEvent(cloudEvent, objectMapper, UserTaskInstanceAssignmentDataEvent::new, UserTaskInstanceAssignmentEventBody.class);
             case "UserTaskInstanceAttachmentDataEvent":