Srvlogic 226

data-index/data-index-common/pom.xml

@@ -45,6 +45,10 @@
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-events-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.graphql-java</groupId>
+      <artifactId>graphql-java</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-jackson</artifactId>

data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DateTimeCoercing.java → data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DateTimeCoercing.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.kie.kogito.index.graphql;
+package org.kie.kogito.index.api;
 
 import graphql.schema.Coercing;
 

data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/DefaultDateTimeCoercing.java → data-index/data-index-common/src/main/java/org/kie/kogito/index/api/DefaultDateTimeCoercing.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.kie.kogito.index.graphql;
+package org.kie.kogito.index.api;
 
 import java.time.DateTimeException;
 import java.time.Instant;

data-index/data-index-common/src/main/java/org/kie/kogito/index/json/JsonUtils.java

@@ -20,10 +20,14 @@
 
 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;
@@ -50,4 +54,20 @@ public static ObjectMapper configure(ObjectMapper objectMapper) {
         objectMapper.registerModule(module);
         return objectMapper;
     }
+
+    public static ObjectNode mergeVariable(String variableName, Object variableValue, ObjectNode variables) {
+        return (ObjectNode) MergeUtils.merge(createObjectNode(variableName, variableValue), variables);
+    }
+
+    private static ObjectNode createObjectNode(String variableName, Object variableValue) {
+        int indexOf = variableName.indexOf('.');
+        ObjectNode result = ObjectMapperFactory.get().createObjectNode();
+        if (indexOf == -1) {
+            result.set(variableName, JsonObjectUtils.fromValue(variableValue));
+        } else {
+            String name = variableName.substring(0, indexOf);
+            result.set(name, createObjectNode(variableName.substring(indexOf + 1), variableValue));
+        }
+        return result;
+    }
 }

data-index/data-index-common/src/main/java/org/kie/kogito/index/service/IndexingService.java

@@ -41,7 +41,7 @@
 import org.kie.kogito.event.usertask.UserTaskInstanceStateDataEvent;
 import org.kie.kogito.event.usertask.UserTaskInstanceVariableDataEvent;
 import org.kie.kogito.index.model.Job;
-import org.kie.kogito.index.model.ProcessDefinition;
+import org.kie.kogito.index.model.ProcessDefinitionKey;
 import org.kie.kogito.index.storage.DataIndexStorageService;
 import org.kie.kogito.index.storage.ProcessInstanceStorage;
 import org.kie.kogito.index.storage.UserTaskInstanceStorage;
@@ -92,9 +92,8 @@ public void indexProcessInstanceEvent(ProcessInstanceDataEvent<?> event) {
     //retry in case of rare but possible race condition during the insert for the first registry
     @Retry(maxRetries = 3, delay = 300, jitter = 100, retryOn = ConcurrentModificationException.class)
     public void indexProcessDefinition(ProcessDefinitionDataEvent definitionDataEvent) {
-        ProcessDefinition definition = ProcessDefinitionHelper
-                .merge(manager.getProcessDefinitionStorage().get(ProcessDefinition.toKey(definitionDataEvent.getKogitoProcessId(), definitionDataEvent.getData().getVersion())), definitionDataEvent);
-        manager.getProcessDefinitionStorage().put(definition.getKey(), definition);
+        ProcessDefinitionKey key = new ProcessDefinitionKey(definitionDataEvent.getKogitoProcessId(), definitionDataEvent.getData().getVersion());
+        manager.getProcessDefinitionStorage().put(key, ProcessDefinitionHelper.merge(manager.getProcessDefinitionStorage().get(key), definitionDataEvent));
     }
 
     //retry in case of rare but possible race condition during the insert for the first registry