You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kie.apache.org by fj...@apache.org on 2024/12/31 10:33:21 UTC
(incubator-kie-kogito-apps) branch main updated: [Fix #2171] Adding excludeProperties arg to ExecuteAfter mutation (#2172)
This is an automated email from the ASF dual-hosted git repository.
fjtiradosarti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new f82e48e0d [Fix #2171] Adding excludeProperties arg to ExecuteAfter mutation (#2172)
f82e48e0d is described below
commit f82e48e0d582e2c344fbee693978507ef09ea96b
Author: Francisco Javier Tirado Sarti <65...@users.noreply.github.com>
AuthorDate: Tue Dec 31 11:33:17 2024 +0100
[Fix #2171] Adding excludeProperties arg to ExecuteAfter mutation (#2172)
---
.../kie/kogito/index/api/KogitoRuntimeClient.java | 2 +-
.../mutations/OutputGraphQLMutationProvider.java | 5 +++--
.../src/main/resources/mutation.schema.graphqls | 2 +-
.../index/service/api/KogitoRuntimeClientImpl.java | 2 +-
.../index/service/api/KogitoRuntimeClientTest.java | 2 +-
.../query/AbstractGraphQLRuntimesQueriesIT.java | 22 +++++++++++++++-------
.../addon/api/KogitoAddonRuntimeClientImpl.java | 2 +-
.../api/KogitoAddonRuntimeClientImplTest.java | 2 +-
8 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java
index c6e42dd9d..57641bb88 100644
--- a/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java
+++ b/data-index/data-index-common/src/main/java/org/kie/kogito/index/api/KogitoRuntimeClient.java
@@ -30,7 +30,7 @@ import org.kie.kogito.index.model.UserTaskInstance;
public interface KogitoRuntimeClient {
- CompletableFuture<String> executeProcessIntance(ProcessDefinition definition, ExecuteArgs args);
+ CompletableFuture<String> executeProcessInstance(ProcessDefinition definition, ExecuteArgs args);
CompletableFuture<String> abortProcessInstance(String serviceURL, ProcessInstance processInstance);
diff --git a/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/java/org/kie/kogito/index/mutations/OutputGraphQLMutationProvider.java b/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/java/org/kie/kogito/index/mutations/OutputGraphQLMutationProvider.java
index 6532ae43a..4930d6585 100644
--- a/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/java/org/kie/kogito/index/mutations/OutputGraphQLMutationProvider.java
+++ b/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/java/org/kie/kogito/index/mutations/OutputGraphQLMutationProvider.java
@@ -19,6 +19,7 @@
package org.kie.kogito.index.mutations;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.CompletableFuture;
import org.kie.kogito.index.CommonUtils;
@@ -62,14 +63,14 @@ public class OutputGraphQLMutationProvider implements GraphQLMutationsProvider {
if (completedInstanceId != null) {
ProcessInstance processInstance = cacheService.getProcessInstanceStorage().get(completedInstanceId);
if (processInstance != null) {
- input = MergeUtils.merge(input, processInstance.getVariables());
+ input = MergeUtils.merge(input, processInstance.getVariables().remove(env.getArgumentOrDefault("excludeProperties", Set.of("workflowdatainput"))));
} else {
logger.warn("Completed Instance Id {} cannot be found, using user input as it is", completedInstanceId);
}
} else {
logger.warn("Missing " + COMPLETED_INSTANCE_ID + " parameter, using user input as it is");
}
- return schemaManager.getDataIndexApiExecutor().executeProcessIntance(processDefinition, ExecuteArgs.of(input));
+ return schemaManager.getDataIndexApiExecutor().executeProcessInstance(processDefinition, ExecuteArgs.of(input));
}
private static <T> T mandatoryArgument(DataFetchingEnvironment env, String name) {
diff --git a/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/resources/mutation.schema.graphqls b/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/resources/mutation.schema.graphqls
index 120b44dc5..a434086dc 100644
--- a/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/resources/mutation.schema.graphqls
+++ b/data-index/data-index-mutations/data-index-shared-output-mutation/src/main/resources/mutation.schema.graphqls
@@ -1,3 +1,3 @@
extend type Mutation {
- ExecuteAfter(completedInstanceId: String, processId: String, processVersion: String, input: JSON): String
+ ExecuteAfter(completedInstanceId: String, processId: String!, processVersion: String!, input: JSON, excludeProperties: [String]): String
}
diff --git a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
index 500d7ad0d..a3e5c303a 100644
--- a/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
+++ b/data-index/data-index-service/data-index-service-common/src/main/java/org/kie/kogito/index/service/api/KogitoRuntimeClientImpl.java
@@ -76,7 +76,7 @@ class KogitoRuntimeClientImpl extends KogitoRuntimeCommonClient implements Kogit
private static final Logger LOGGER = LoggerFactory.getLogger(KogitoRuntimeClientImpl.class);
@Override
- public CompletableFuture<String> executeProcessIntance(ProcessDefinition definition, ExecuteArgs args) {
+ public CompletableFuture<String> executeProcessInstance(ProcessDefinition definition, ExecuteArgs args) {
CompletableFuture<String> future = new CompletableFuture<>();
HttpRequest<Buffer> request = getWebClient(CommonUtils.getServiceUrl(definition.getEndpoint(), definition.getId())).post("/" + definition.getId());
if (args.businessKey() != null) {
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java
index 9d61de4fe..88ae69430 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/api/KogitoRuntimeClientTest.java
@@ -129,7 +129,7 @@ public class KogitoRuntimeClientTest {
ProcessDefinition definition = TestUtils.getProcessDefinition(processId);
definition.setEndpoint(SERVICE_URL + "/" + processId);
JsonNode body = ObjectMapperFactory.get().createObjectNode().put("name", "javierito");
- client.executeProcessIntance(definition, ExecuteArgs.of(body));
+ client.executeProcessInstance(definition, ExecuteArgs.of(body));
verify(webClientMock).post("/" + processId);
ArgumentCaptor<Object> jsonCaptor = ArgumentCaptor.forClass(Object.class);
verify(httpRequestMock).sendJson(jsonCaptor.capture(), any());
diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
index 6f9915a1e..bfc1a4041 100644
--- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
+++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/graphql/query/AbstractGraphQLRuntimesQueriesIT.java
@@ -111,22 +111,30 @@ public abstract class AbstractGraphQLRuntimesQueriesIT extends AbstractIndexingI
final String assesmentVarValue = "assesmentValue";
final String infraVarName = "clientVar";
final String infraVarValue = "clientValue";
- ProcessInstanceVariableDataEvent variableEvent = new ProcessInstanceVariableDataEvent();
- variableEvent.setKogitoProcessId(processId);
- variableEvent.setKogitoProcessInstanceId(assesmentInstanceId);
- variableEvent.setData(ProcessInstanceVariableEventBody.create().processId(processId).processInstanceId(assesmentInstanceId)
- .variableName(assesmentVarName).variableValue(assesmentVarValue).build());
- indexProcessCloudEvent(variableEvent);
+ final String excludedKey = "notUsedKey";
+ final String excludedValue = "irrelevant";
+ indexProcessCloudEvent(buildVariableEvent(assesmentInstanceId, assesmentVarName, assesmentVarValue));
+ indexProcessCloudEvent(buildVariableEvent(assesmentInstanceId, excludedKey, excludedValue));
final String infraProcessId = "infra";
ProcessDefinitionDataEvent definitionEvent = TestUtils.getProcessDefinitionDataEvent(infraProcessId);
indexProcessCloudEvent(definitionEvent);
checkOkResponse("{ \"query\" : \"mutation{ ExecuteAfter ( " + fragment("completedInstanceId", assesmentInstanceId) + "," + fragment("processId", infraProcessId) +
+ ",excludeProperties: [\\\"" + excludedKey + "\\\"]" +
"," + fragment("processVersion", TestUtils.PROCESS_VERSION) + "," + "input: {" + fragment(infraVarName, infraVarValue) + "})}\"}");
- verify(dataIndexApiClient).executeProcessIntance(TestUtils.getProcessDefinition(infraProcessId),
+ verify(dataIndexApiClient).executeProcessInstance(TestUtils.getProcessDefinition(infraProcessId),
ExecuteArgs.of(ObjectMapperFactory.get().createObjectNode().put(assesmentVarName, assesmentVarValue)
.put(infraVarName, infraVarValue)));
}
+ private ProcessInstanceVariableDataEvent buildVariableEvent(String processInstanceId, String key, String name) {
+ ProcessInstanceVariableDataEvent variableEvent = new ProcessInstanceVariableDataEvent();
+ variableEvent.setKogitoProcessId(processId);
+ variableEvent.setKogitoProcessInstanceId(processInstanceId);
+ variableEvent.setData(ProcessInstanceVariableEventBody.create().processId(processId).processInstanceId(processInstanceId)
+ .variableName(key).variableValue(name).build());
+ return variableEvent;
+ }
+
private String fragment(String name, String value) {
return name + ": \\\"" + value + "\\\"";
}
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
index f681f39d1..d3bb8df3f 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/main/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImpl.java
@@ -279,7 +279,7 @@ public class KogitoAddonRuntimeClientImpl extends KogitoRuntimeCommonClient impl
}
@Override
- public CompletableFuture<String> executeProcessIntance(ProcessDefinition definition, ExecuteArgs args) {
+ public CompletableFuture<String> executeProcessInstance(ProcessDefinition definition, ExecuteArgs args) {
Process<?> process = processes != null ? processes.processById(definition.getId()) : null;
if (process == null) {
throw new DataIndexServiceException(String.format("Unable to find Process with id %s to perform the operation requested", definition.getId()));
diff --git a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
index 7830460a8..910a67307 100644
--- a/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
+++ b/data-index/kogito-addons-quarkus-data-index-persistence/kogito-addons-quarkus-data-index-persistence-common/runtime/src/test/java/org/kie/kogito/index/addon/api/KogitoAddonRuntimeClientImplTest.java
@@ -190,7 +190,7 @@ public class KogitoAddonRuntimeClientImplTest {
ProcessDefinition definition = new ProcessDefinition();
definition.setId("infra");
JsonNode body = ObjectMapperFactory.get().createObjectNode().put("name", "javierito");
- client.executeProcessIntance(definition, ExecuteArgs.of(body));
+ client.executeProcessInstance(definition, ExecuteArgs.of(body));
verify(model).update(Map.of("name", "javierito"));
verify(processInstance).start();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@kie.apache.org
For additional commands, e-mail: commits-help@kie.apache.org