Merge pull request #62 from rgdoliveira/sync_main

Sync main branch with Apache main branch

Author: rgdoliveira

.rat-excludes

@@ -40,6 +40,10 @@ org.kie.kogito.app.audit.spi.GraphQLSchemaQueryProvider
 application.properties
 # data-index/data-index-graphql/src/main/resources/basic.schema.graphqls
 basic.schema.graphqls
+# data-index/data-index-graphql/src/main/resources/count.schema.graphqls
+count.schema.graphqls
+# data-index/data-index-graphql/src/main/resources/json.schema.graphqls
+json.schema.graphqls
 # data-index/data-index-service/data-index-service-common/src/main/resources/domain.schema.graphqls
 domain.schema.graphqls
 # /data-index/data-index-mutations/data-index-shared-output-mutation/src/main/resources/mutation.schema.graphqls

data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/h2/V1.4.0__Increase_variable_value_column_size.sql

@@ -0,0 +1,21 @@
+/*
+ * 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.
+ */
+
+ALTER TABLE Process_Instance_Variable_Log ALTER COLUMN variable_value SET DATA TYPE VARCHAR(MAX);
+ALTER TABLE Task_Instance_Variable_Log ALTER COLUMN variable_value SET DATA TYPE VARCHAR(MAX);

data-audit/kogito-addons-data-audit-jpa/kogito-addons-data-audit-jpa-common/src/main/resources/kie-flyway/db/data-audit/postgresql/V1.4.0__Increase_variable_value_column_size.sql

@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+
+
+ALTER TABLE Process_Instance_Variable_Log ALTER COLUMN variable_value TYPE TEXT;
+ALTER TABLE Task_Instance_Variable_Log ALTER COLUMN variable_value  TYPE TEXT;

data-index/data-index-graphql/src/main/java/org/kie/kogito/index/graphql/AbstractGraphQLSchemaManager.java

@@ -21,7 +21,6 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.ServiceLoader;
 import java.util.ServiceLoader.Provider;
 import java.util.concurrent.CompletableFuture;
@@ -31,6 +30,7 @@
 import org.kie.kogito.index.CommonUtils;
 import org.kie.kogito.index.api.KogitoRuntimeClient;
 import org.kie.kogito.index.graphql.query.GraphQLQueryOrderByParser;
+import org.kie.kogito.index.graphql.query.GraphQLQueryParser;
 import org.kie.kogito.index.graphql.query.GraphQLQueryParserRegistry;
 import org.kie.kogito.index.model.Job;
 import org.kie.kogito.index.model.Node;
@@ -41,13 +41,16 @@
 import org.kie.kogito.index.service.DataIndexServiceException;
 import org.kie.kogito.index.storage.DataIndexStorageService;
 import org.kie.kogito.persistence.api.StorageFetcher;
+import org.kie.kogito.persistence.api.StorageServiceCapability;
 import org.kie.kogito.persistence.api.query.Query;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.GraphQLArgument;
 import graphql.schema.GraphQLInputObjectType;
+import graphql.schema.GraphQLInputType;
 import graphql.schema.GraphQLNamedType;
 import graphql.schema.GraphQLScalarType;
 import graphql.schema.GraphQLSchema;
@@ -109,6 +112,29 @@ protected final void loadAdditionalMutations(TypeDefinitionRegistry typeRegistry
         mutations.stream().map(GraphQLMutationsProvider::registry).forEach(typeRegistry::merge);
     }
 
+    protected final void addCountQueries(TypeDefinitionRegistry typeRegistry) {
+        if (supportsCount()) {
+            typeRegistry.merge(loadSchemaDefinitionFile("count.schema.graphqls"));
+        }
+    }
+
+    protected final void addJsonQueries(TypeDefinitionRegistry typeRegistry) {
+        if (cacheService.capabilities().contains(StorageServiceCapability.JSON_QUERY)) {
+            typeRegistry.merge(loadSchemaDefinitionFile("json.schema.graphqls"));
+        }
+    }
+
+    protected final void addCountQueries(Builder builder) {
+        if (supportsCount()) {
+            builder.dataFetcher("CountProcessInstances", this::countProcessInstances);
+            builder.dataFetcher("CountUserTaskInstances", this::countUserTaskInstances);
+        }
+    }
+
+    private boolean supportsCount() {
+        return cacheService.capabilities().contains(StorageServiceCapability.COUNT);
+    }
+
     protected TypeDefinitionRegistry loadSchemaDefinitionFile(String fileName) {
         return CommonUtils.loadSchemaDefinitionFile(fileName);
     }
@@ -149,7 +175,7 @@ public String getProcessInstanceServiceUrl(DataFetchingEnvironment env) {
 
     public ProcessDefinition getProcessDefinition(DataFetchingEnvironment env) {
         ProcessInstance source = env.getSource();
-        return source.getDefinition();
+        return cacheService.getProcessDefinitionStorage().get(new ProcessDefinitionKey(source.getProcessId(), source.getVersion()));
     }
 
     protected String getServiceUrl(String endpoint, String processId) {
@@ -182,18 +208,17 @@ protected Collection<ProcessInstance> getProcessInstancesValues(DataFetchingEnvi
         return executeAdvancedQueryForCache(cacheService.getProcessInstanceStorage(), env);
     }
 
-    protected <K, T> List<T> executeAdvancedQueryForCache(StorageFetcher<K, T> cache, DataFetchingEnvironment env) {
-        Objects.requireNonNull(cache, "Cache not found");
-
-        String inputTypeName = ((GraphQLNamedType) env.getFieldDefinition().getArgument("where").getType()).getName();
-
-        Query<T> query = cache.query();
+    protected long countProcessInstances(DataFetchingEnvironment env) {
+        return executeCount(cacheService.getProcessInstanceStorage(), env);
+    }
 
-        Map<String, Object> where = env.getArgument("where");
-        query.filter(GraphQLQueryParserRegistry.get().getParser(inputTypeName).apply(where));
+    protected long countUserTaskInstances(DataFetchingEnvironment env) {
+        return executeCount(cacheService.getUserTaskInstanceStorage(), env);
+    }
 
+    protected <K, T> List<T> executeAdvancedQueryForCache(StorageFetcher<K, T> cache, DataFetchingEnvironment env) {
+        Query<T> query = buildQuery(cache, env);
         query.sort(new GraphQLQueryOrderByParser().apply(env));
-
         Map<String, Integer> pagination = env.getArgument("pagination");
         if (pagination != null) {
             Integer limit = pagination.get("limit");
@@ -205,10 +230,29 @@ protected <K, T> List<T> executeAdvancedQueryForCache(StorageFetcher<K, T> cache
                 query.offset(offset);
             }
         }
-
         return query.execute();
     }
 
+    protected <K, T> long executeCount(StorageFetcher<K, T> cache, DataFetchingEnvironment env) {
+        return buildQuery(cache, env).count();
+    }
+
+    private <K, T> Query<T> buildQuery(StorageFetcher<K, T> cache, DataFetchingEnvironment env) {
+        assert cache != null;
+        Query<T> query = cache.query();
+        GraphQLArgument arg = env.getFieldDefinition().getArgument("where");
+        if (arg != null) {
+            GraphQLInputType inputType = arg.getType();
+            if (inputType instanceof GraphQLNamedType) {
+                GraphQLQueryParser parser = GraphQLQueryParserRegistry.get().getParser(((GraphQLNamedType) inputType).getName());
+                if (parser != null) {
+                    query.filter(parser.apply(env.getArgument("where")));
+                }
+            }
+        }
+        return query;
+    }
+
     protected Collection<UserTaskInstance> getUserTaskInstancesValues(DataFetchingEnvironment env) {
         return executeAdvancedQueryForCache(cacheService.getUserTaskInstanceStorage(), env);
     }

data-index/data-index-graphql/src/main/resources/basic.schema.graphqls

@@ -69,7 +69,6 @@ input ProcessDefinitionArgument {
     serviceUrl: StringArgument
     description: StringArgument
     type: StringArgument
-    metadata: JSON
 }
 
 type ProcessInstance {
@@ -183,7 +182,6 @@ input ProcessInstanceArgument {
     id: IdArgument
     processId: StringArgument
     processName: StringArgument
-    variables: JSON
     parentProcessInstanceId: IdArgument
     rootProcessInstanceId: IdArgument
     rootProcessId: StringArgument

data-index/data-index-graphql/src/main/resources/count.schema.graphqls

@@ -0,0 +1,6 @@
+extend type Query {
+    CountProcessInstances(where: ProcessInstanceArgument): Int
+    CountUserTaskInstances(where: UserTaskInstanceArgument): Int
+    CountJobs(where: JobArgument): Int
+    CountProcessDefinitions(where: ProcessDefinitionArgument): Int
+}

data-index/data-index-graphql/src/main/resources/json.schema.graphqls

@@ -0,0 +1,7 @@
+extend input ProcessInstanceArgument {
+  variables: JSON
+}
+
+extend input ProcessDefinitionArgument {
+  metadata: JSON
+}

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

@@ -74,6 +74,8 @@ public GraphQLSchema createSchema() {
         TypeDefinitionRegistry typeDefinitionRegistry = new TypeDefinitionRegistry();
         typeDefinitionRegistry.merge(loadSchemaDefinitionFile("basic.schema.graphqls"));
         typeDefinitionRegistry.merge(loadSchemaDefinitionFile("domain.schema.graphqls"));
+        addCountQueries(typeDefinitionRegistry);
+        addJsonQueries(typeDefinitionRegistry);
         loadAdditionalMutations(typeDefinitionRegistry);
 
         RuntimeWiring runtimeWiring = RuntimeWiring.newRuntimeWiring()
@@ -83,6 +85,7 @@ public GraphQLSchema createSchema() {
                     builder.dataFetcher("ProcessInstances", this::getProcessInstancesValues);
                     builder.dataFetcher("UserTaskInstances", this::getUserTaskInstancesValues);
                     builder.dataFetcher("Jobs", this::getJobsValues);
+                    addCountQueries(builder);
                     return builder;
                 })
                 .type("Mutation", builder -> {

data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractIndexingServiceIT.java

@@ -114,8 +114,8 @@ static void setup() {
     @Transactional
     void tearDown() {
         cacheService.getJobsStorage().clear();
-        cacheService.getProcessDefinitionStorage().clear();
         cacheService.getProcessInstanceStorage().clear();
+        cacheService.getProcessDefinitionStorage().clear();
         cacheService.getUserTaskInstanceStorage().clear();
     }
 
@@ -191,6 +191,9 @@ protected void validateProcessInstance(String query, ProcessInstanceStateDataEve
     @Test
     void testProcessInstancePagination() {
         String processId = "travels";
+        ProcessDefinitionDataEvent definitionDataEvent = getProcessDefinitionDataEvent(processId);
+        indexProcessCloudEvent(definitionDataEvent);
+        validateProcessDefinition(getProcessDefinitionByIdAndVersion(processId, definitionDataEvent.getData().getVersion()), definitionDataEvent);
         List<String> pIds = new ArrayList<>();
 
         IntStream.range(0, 100).forEach(i -> {
@@ -230,8 +233,10 @@ void testProcessInstancePagination() {
     @Test
     void testUserTaskInstancePagination() {
         String processId = "deals";
+        ProcessDefinitionDataEvent definitionDataEvent = getProcessDefinitionDataEvent(processId);
+        indexProcessCloudEvent(definitionDataEvent);
+        validateProcessDefinition(getProcessDefinitionByIdAndVersion(processId, definitionDataEvent.getData().getVersion()), definitionDataEvent);
         List<String> taskIds = new ArrayList<>();
-
         IntStream.range(0, 100).forEach(i -> {
             String taskId = UUID.randomUUID().toString();
             UserTaskInstanceStateDataEvent event = getUserTaskCloudEvent(taskId, processId, UUID.randomUUID().toString(), null, null, "InProgress");
@@ -286,6 +291,9 @@ void testUserTaskInstancePagination() {
     @Test
     void testConcurrentProcessInstanceIndex() throws Exception {
         String processId = "travels";
+        ProcessDefinitionDataEvent definitionDataEvent = getProcessDefinitionDataEvent(processId);
+        indexProcessCloudEvent(definitionDataEvent);
+        validateProcessDefinition(getProcessDefinitionByIdAndVersion(processId, definitionDataEvent.getData().getVersion()), definitionDataEvent);
         ExecutorService executorService = new ScheduledThreadPoolExecutor(8);
         int max_instance_events = 10;
         List<CompletableFuture<Void>> futures = new ArrayList<>();
@@ -330,6 +338,10 @@ void testProcessInstanceIndex() throws Exception {
         indexProcessCloudEvent(definitionDataEvent);
         validateProcessDefinition(getProcessDefinitionByIdAndVersion(processId, definitionDataEvent.getData().getVersion()), definitionDataEvent);
 
+        ProcessDefinitionDataEvent subProcessdefinitionDataEvent = getProcessDefinitionDataEvent(subProcessId);
+        indexProcessCloudEvent(subProcessdefinitionDataEvent);
+        validateProcessDefinition(getProcessDefinitionByIdAndVersion(subProcessId, subProcessdefinitionDataEvent.getData().getVersion()), subProcessdefinitionDataEvent);
+
         ProcessInstanceStateDataEvent startEvent = getProcessCloudEvent(processId, processInstanceId, ACTIVE, null, null, null, CURRENT_USER);
         indexProcessCloudEvent(startEvent);
 

data-index/data-index-storage/data-index-storage-api/src/main/java/org/kie/kogito/index/storage/DataIndexStorageService.java

@@ -18,15 +18,18 @@
  */
 package org.kie.kogito.index.storage;
 
+import java.util.EnumSet;
+import java.util.Set;
+
 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.persistence.api.Storage;
+import org.kie.kogito.persistence.api.StorageServiceCapability;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public interface DataIndexStorageService {
-
     Storage<ProcessDefinitionKey, ProcessDefinition> getProcessDefinitionStorage();
 
     ProcessInstanceStorage getProcessInstanceStorage();
@@ -40,4 +43,8 @@ public interface DataIndexStorageService {
     String getDomainModelCacheName(String processId);
 
     Storage<String, String> getProcessIdModelCache();
+
+    default Set<StorageServiceCapability> capabilities() {
+        return EnumSet.noneOf(StorageServiceCapability.class);
+    }
 }

data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/mapper/ProcessInstanceEntityMapper.java

@@ -19,16 +19,13 @@
 package org.kie.kogito.index.jpa.mapper;
 
 import org.kie.kogito.index.jpa.model.MilestoneEntity;
-import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity;
 import org.kie.kogito.index.jpa.model.ProcessInstanceEntity;
 import org.kie.kogito.index.model.Milestone;
-import org.kie.kogito.index.model.ProcessDefinition;
 import org.kie.kogito.index.model.ProcessInstance;
 import org.mapstruct.AfterMapping;
 import org.mapstruct.InheritInverseConfiguration;
 import org.mapstruct.Mapper;
 import org.mapstruct.MappingTarget;
-import org.mapstruct.factory.Mappers;
 
 @Mapper(componentModel = "cdi", suppressTimestampInGenerated = true)
 public interface ProcessInstanceEntityMapper {
@@ -43,10 +40,6 @@ public interface ProcessInstanceEntityMapper {
     @InheritInverseConfiguration
     ProcessInstance mapToModel(ProcessInstanceEntity pi);
 
-    default ProcessDefinition mapToDefinition(ProcessDefinitionEntity entity) {
-        return Mappers.getMapper(ProcessDefinitionEntityMapper.class).mapToModel(entity);
-    }
-
     @AfterMapping
     default void afterMapping(@MappingTarget ProcessInstanceEntity entity) {
         entity.getNodes().forEach(n -> n.setProcessInstance(entity));

data-index/data-index-storage/data-index-storage-jpa-common/src/main/java/org/kie/kogito/index/jpa/model/ProcessInstanceEntity.java

@@ -23,8 +23,6 @@
 import java.util.Objects;
 import java.util.Set;
 
-import org.hibernate.annotations.NotFound;
-import org.hibernate.annotations.NotFoundAction;
 import org.kie.kogito.persistence.postgresql.hibernate.JsonBinaryConverter;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -93,7 +91,6 @@ public class ProcessInstanceEntity extends AbstractEntity {
     @ManyToOne(targetEntity = ProcessDefinitionEntity.class, fetch = FetchType.LAZY)
     @JoinColumns({ @JoinColumn(name = "processId", referencedColumnName = "id", insertable = false, updatable = false),
             @JoinColumn(name = "version", referencedColumnName = "version", insertable = false, updatable = false) })
-    @NotFound(action = NotFoundAction.IGNORE)
     private ProcessDefinitionEntity definition;
 
     @Override
@@ -290,10 +287,6 @@ public int hashCode() {
         return Objects.hash(id);
     }
 
-    public ProcessDefinitionEntity getDefinition() {
-        return definition;
-    }
-
     @Override
     public String toString() {
         return "ProcessInstanceEntity{" +