Merge pull request #4 from rgdoliveira/sync_main

Sync main branch with Apache main branch
kiegroup · Jan 25, 2024 · 1b6689a · 1b6689a
2 parents b5545a4 + 7244568
commit 1b6689a
Show file tree

Hide file tree

Showing 37 changed files with 265 additions and 310 deletions.
diff --git a/...a-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java b/...a-index-service-common/src/test/java/org/kie/kogito/index/AbstractProcessDataIndexIT.java
@@ -86,6 +86,10 @@ public RequestSpecification dataIndexSpec() {
         return spec;
     }
 
+    protected ValidatableResponse addCheck(ValidatableResponse res) {
+        return res.body("data.ProcessDefinitions[0].source", notNullValue());
+    }
+
     @Test
     public void testProcessInstanceEvents() throws IOException {
         String pId = given()
@@ -163,14 +167,14 @@ public void testProcessInstanceEvents() throws IOException {
 
         await()
                 .atMost(TIMEOUT)
-                .untilAsserted(() -> given().spec(dataIndexSpec()).contentType(ContentType.JSON)
-                        .body("{ \"query\" : \"{ProcessDefinitions{ id, version, name } }\" }")
+                .untilAsserted(() -> addCheck(given().spec(dataIndexSpec()).contentType(ContentType.JSON)
+                        .body("{ \"query\" : \"{ProcessDefinitions{ id, version, name, source} }\" }")
                         .when().post("/graphql")
                         .then().statusCode(200)
                         .body("data.ProcessDefinitions.size()", is(1))
                         .body("data.ProcessDefinitions[0].id", is("approvals"))
                         .body("data.ProcessDefinitions[0].version", is("1.0"))
-                        .body("data.ProcessDefinitions[0].name", is("approvals")));
+                        .body("data.ProcessDefinitions[0].name", is("approvals"))));
 
         await()
                 .atMost(TIMEOUT)

diff --git a/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java b/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexInfinispanIT.java
@@ -35,7 +35,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexInfinispanSpringTestResource.class })
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public class ProcessDataIndexInfinispanIT extends AbstractProcessDataIndexIT {
+public class ProcessDataIndexInfinispanIT extends SpringBootAbstractProcessInstanceIT {
 
     @LocalServerPort
     private int httpPort;

diff --git a/...ndex-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java b/...ndex-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexMongoDBIT.java
@@ -35,7 +35,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexMongoDBSpringTestResource.class })
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public class ProcessDataIndexMongoDBIT extends AbstractProcessDataIndexIT {
+public class ProcessDataIndexMongoDBIT extends SpringBootAbstractProcessInstanceIT {
 
     @LocalServerPort
     private int httpPort;

diff --git a/...index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java b/...index-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexOracleIT.java
@@ -35,7 +35,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexOracleSpringTestResource.class })
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public class ProcessDataIndexOracleIT extends AbstractProcessDataIndexIT {
+public class ProcessDataIndexOracleIT extends SpringBootAbstractProcessInstanceIT {
 
     @LocalServerPort
     private int httpPort;

diff --git a/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java b/...x-service-springboot/src/test/java/org/kie/kogito/index/ProcessDataIndexPostgreSqlIT.java
@@ -35,7 +35,7 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = { KogitoApplication.class })
 @ContextConfiguration(initializers = { KogitoServiceRandomPortSpringTestResource.class, DataIndexPostgreSqlSpringTestResource.class })
 @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
-public class ProcessDataIndexPostgreSqlIT extends AbstractProcessDataIndexIT {
+public class ProcessDataIndexPostgreSqlIT extends SpringBootAbstractProcessInstanceIT {
 
     @LocalServerPort
     private int httpPort;

diff --git a/...ce-springboot/src/test/java/org/kie/kogito/index/SpringBootAbstractProcessInstanceIT.java b/...ce-springboot/src/test/java/org/kie/kogito/index/SpringBootAbstractProcessInstanceIT.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.kie.kogito.index;
+
+import io.restassured.response.ValidatableResponse;
+
+abstract class SpringBootAbstractProcessInstanceIT extends AbstractProcessDataIndexIT {
+
+    @Override
+    protected ValidatableResponse addCheck(ValidatableResponse res) {
+        // disable source check for Springboot since it is not implemented yet
+        return res;
+    }
+
+}
diff --git a/apps-integration-tests/integration-tests-data-index-service/pom.xml b/apps-integration-tests/integration-tests-data-index-service/pom.xml
@@ -35,24 +35,11 @@
 
   <modules>
     <module>integration-tests-data-index-service-quarkus-devservice</module>
+    <module>integration-tests-data-index-service-common</module>
+    <module>integration-tests-data-index-service-quarkus</module>
+    <module>integration-tests-data-index-service-springboot</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>integration-tests-data-index-service-common</module>
-        <module>integration-tests-data-index-service-quarkus</module>
-        <module>integration-tests-data-index-service-springboot</module>
-      </modules>
-    </profile>
-  </profiles>
-
   <dependencyManagement>
     <dependencies>
       <dependency>

diff --git a/apps-integration-tests/pom.xml b/apps-integration-tests/pom.xml
@@ -36,22 +36,9 @@
 
   <modules>
     <module>integration-tests-data-index-service</module>
+    <module>integration-tests-jobs-service</module>
+    <module>integration-tests-trusty-audit</module>
+    <module>integration-tests-trusty-service</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>integration-tests-jobs-service</module>
-        <module>integration-tests-trusty-audit</module>
-        <module>integration-tests-trusty-service</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/...data-index-common/src/main/java/org/kie/kogito/index/service/ProcessDefinitionHelper.java b/...data-index-common/src/main/java/org/kie/kogito/index/service/ProcessDefinitionHelper.java
@@ -64,6 +64,7 @@ public static ProcessDefinition merge(ProcessDefinition instance, ProcessDefinit
         instance.setAnnotations(doMerge(data.getAnnotations(), instance.getAnnotations()));
         instance.setMetadata(doMerge(toStringMap(data.getMetadata()), instance.getMetadata()));
         instance.setNodes(doMerge(nodeDefinitions(data), instance.getNodes()));
+        instance.setSource(doMerge(data.getSource(), instance.getSource()));
         return instance;
     }
 

diff --git a/data-index/data-index-service/pom.xml b/data-index/data-index-service/pom.xml
@@ -35,22 +35,12 @@
     <module>data-index-service-common</module>
     <module>data-index-service-inmemory</module>
     <module>data-index-service-postgresql</module>
+    <module>data-index-service-infinispan</module>
+    <module>data-index-service-mongodb</module>
+    <module>data-index-service-oracle</module>
   </modules>
 
   <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>data-index-service-infinispan</module>
-        <module>data-index-service-mongodb</module>
-        <module>data-index-service-oracle</module>
-      </modules>
-    </profile>
     <profile>
       <id>native</id>
       <activation>

diff --git a/...src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java b/...src/main/java/org/kie/kogito/index/storage/merger/ProcessInstanceNodeDataEventMerger.java
@@ -18,6 +18,7 @@
  */
 package org.kie.kogito.index.storage.merger;
 
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -62,18 +63,18 @@ public ProcessInstance merge(ProcessInstance pi, ProcessInstanceDataEvent<?> dat
         nodeInstance.setNodeId(body.getNodeDefinitionId());
         nodeInstance.setName(body.getNodeName());
         nodeInstance.setType(body.getNodeType());
+        ZonedDateTime eventDate = toZonedDateTime(body.getEventDate());
         switch (body.getEventType()) {
             case EVENT_TYPE_ENTER:
-                nodeInstance.setEnter(toZonedDateTime(body.getEventDate()));
+                nodeInstance.setEnter(eventDate);
                 break;
             case EVENT_TYPE_EXIT:
-                nodeInstance.setExit(toZonedDateTime(body.getEventDate()));
-
+                nodeInstance.setExit(eventDate);
+            default:
                 if (nodeInstance.getEnter() == null) {
                     // Adding a default enter time for exit events triggered by EventNodeInstances
-                    nodeInstance.setEnter(nodeInstance.getExit());
+                    nodeInstance.setEnter(eventDate);
                 }
-                break;
         }
         nodeInstances.add(nodeInstance);
 

diff --git a/...rage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java b/...rage-jpa/src/main/java/org/kie/kogito/index/jpa/storage/ProcessInstanceEntityStorage.java
@@ -18,6 +18,7 @@
  */
 package org.kie.kogito.index.jpa.storage;
 
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Set;
 
@@ -155,18 +156,19 @@ private NodeInstanceEntity updateNode(NodeInstanceEntity nodeInstance, ProcessIn
         nodeInstance.setNodeId(body.getNodeDefinitionId());
         nodeInstance.setName(body.getNodeName());
         nodeInstance.setType(body.getNodeType());
+        ZonedDateTime eventDate = toZonedDateTime(body.getEventDate());
         switch (body.getEventType()) {
+
             case EVENT_TYPE_ENTER:
-                nodeInstance.setEnter(toZonedDateTime(body.getEventDate()));
+                nodeInstance.setEnter(eventDate);
                 break;
             case EVENT_TYPE_EXIT:
-                nodeInstance.setExit(toZonedDateTime(body.getEventDate()));
-
+                nodeInstance.setExit(eventDate);
+            default:
                 if (nodeInstance.getEnter() == null) {
                     // Adding a default enter time for exit events triggered by EventNodeInstances
-                    nodeInstance.setEnter(nodeInstance.getExit());
+                    nodeInstance.setEnter(eventDate);
                 }
-                break;
         }
         return nodeInstance;
     }

diff --git a/data-index/data-index-storage/pom.xml b/data-index/data-index-storage/pom.xml
@@ -37,23 +37,10 @@
     <module>data-index-storage-protobuf</module>
     <module>data-index-storage-postgresql</module>
     <module>data-index-storage-jpa</module>
+    <module>data-index-storage-common</module>
+    <module>data-index-storage-infinispan</module>
+    <module>data-index-storage-mongodb</module>
+    <module>data-index-storage-postgresql-reporting</module>
+    <module>data-index-storage-oracle</module>
   </modules>
-
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>data-index-storage-common</module>
-        <module>data-index-storage-infinispan</module>
-        <module>data-index-storage-mongodb</module>
-        <module>data-index-storage-postgresql-reporting</module>
-        <module>data-index-storage-oracle</module>
-      </modules>
-    </profile>
-  </profiles>
 </project>
diff --git a/...on/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java b/...on/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
@@ -29,7 +29,6 @@
 
 import org.eclipse.microprofile.context.ManagedExecutor;
 import org.kie.kogito.Application;
-import org.kie.kogito.addon.source.files.SourceFilesProvider;
 import org.kie.kogito.index.api.KogitoRuntimeClient;
 import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
 import org.kie.kogito.index.model.Node;
@@ -42,6 +41,7 @@
 import org.kie.kogito.process.Processes;
 import org.kie.kogito.process.impl.AbstractProcess;
 import org.kie.kogito.services.uow.UnitOfWorkExecutor;
+import org.kie.kogito.source.files.SourceFilesProvider;
 import org.kie.kogito.svg.ProcessSvgService;
 
 import jakarta.enterprise.context.ApplicationScoped;

diff --git a/...untime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java b/...untime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.kie.kogito.Application;
-import org.kie.kogito.addon.source.files.SourceFilesProvider;
 import org.kie.kogito.index.api.KogitoRuntimeCommonClient;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.model.ProcessInstance;
@@ -37,6 +36,7 @@
 import org.kie.kogito.process.impl.AbstractProcess;
 import org.kie.kogito.services.uow.CollectingUnitOfWorkFactory;
 import org.kie.kogito.services.uow.DefaultUnitOfWorkManager;
+import org.kie.kogito.source.files.SourceFilesProvider;
 import org.kie.kogito.svg.ProcessSvgService;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;

diff --git a/...us-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml b/...us-data-index-persistence/kogito-addons-quarkus-data-index-persistence-postgresql/pom.xml
@@ -40,20 +40,7 @@
     <module>deployment</module>
     <module>runtime</module>
     <module>integration-tests-sw</module>
+    <module>integration-tests-process</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>integration-tests-process</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml b/data-index/kogito-addons-quarkus-data-index-persistence/pom.xml
@@ -34,21 +34,8 @@
   <modules>
     <module>kogito-addons-quarkus-data-index-persistence-common</module>
     <module>kogito-addons-quarkus-data-index-persistence-postgresql</module>
+    <module>kogito-addons-quarkus-data-index-persistence-infinispan</module>
+    <module>kogito-addons-quarkus-data-index-persistence-mongodb</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>kogito-addons-quarkus-data-index-persistence-infinispan</module>
-        <module>kogito-addons-quarkus-data-index-persistence-mongodb</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
diff --git a/...-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml b/...-index/kogito-addons-quarkus-data-index/kogito-addons-quarkus-data-index-inmemory/pom.xml
@@ -40,20 +40,7 @@
     <module>deployment</module>
     <module>runtime</module>
     <module>integration-tests-sw</module>
+    <module>integration-tests-process</module>
   </modules>
 
-  <profiles>
-    <profile>
-      <id>default</id>
-      <activation>
-        <property>
-          <name>!productized</name>
-        </property>
-      </activation>
-      <modules>
-        <module>integration-tests-process</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>