[Fix #3590] Adding $input support

fjtirado · fjtirado · commit ebe88fad3802 · 2024-07-24T18:57:39.000+02:00
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-runtime/src/main/java/org/kie/kogito/serverless/workflow/models/JsonNodeModel.java b/kogito-serverless-workflow/kogito-serverless-workflow-runtime/src/main/java/org/kie/kogito/serverless/workflow/models/JsonNodeModel.java
@@ -39,6 +39,7 @@
 public class JsonNodeModel implements Model, MapInput, MapInputId, MapOutput, MappableToModel<JsonNodeModelOutput> {
 
     private JsonNode workflowdata;
+    private JsonNode input;
     private String id;
     private Map<String, Object> additionalProperties = Collections.emptyMap();
 
@@ -57,6 +58,7 @@ public JsonNodeModel(String id, Object workflowdata) {
             ObjectMapper mapper = ObjectMapperFactory.listenerAware();
             this.workflowdata = workflowdata == null ? mapper.createObjectNode() : mapper.convertValue(workflowdata, JsonNode.class);
         }
+        this.input = this.workflowdata.deepCopy();
     }
 
     public String getId() {
@@ -122,6 +124,7 @@ public MapInput fromMap(Map<String, Object> params) {
     public Map<String, Object> toMap() {
         Map<String, Object> map = new HashMap<>();
         map.put(SWFConstants.DEFAULT_WORKFLOW_VAR, workflowdata);
+        map.put(SWFConstants.INPUT_WORKFLOW_VAR, input);
         map.putAll(additionalProperties);
         return map;
     }
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/main/java/org/kie/kogito/serverless/workflow/SWFConstants.java b/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/main/java/org/kie/kogito/serverless/workflow/SWFConstants.java
@@ -21,6 +21,7 @@
 public class SWFConstants {
 
     public static final String DEFAULT_WORKFLOW_VAR = "workflowdata";
+    public static final String INPUT_WORKFLOW_VAR = "workflowdatainput";
     public static final String RESULT = "Result";
     public static final String MODEL_WORKFLOW_VAR = "Parameter";
     public static final String CONTENT_DATA = "ContentData";
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/main/java/org/kie/kogito/serverless/workflow/utils/InputKogitoProcessContextResolver.java b/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/main/java/org/kie/kogito/serverless/workflow/utils/InputKogitoProcessContextResolver.java
@@ -0,0 +1,37 @@
+/*
+ * 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.serverless.workflow.utils;
+
+import java.util.Map;
+import java.util.function.Function;
+
+import org.kie.kogito.internal.process.runtime.KogitoProcessContext;
+import org.kie.kogito.serverless.workflow.SWFConstants;
+
+public class InputKogitoProcessContextResolver implements KogitoProcessContextResolverExtension {
+
+    @Override
+    public Map<String, Function<KogitoProcessContext, Object>> getKogitoProcessContextResolver() {
+        return Map.of("input", this::getInputVariables);
+    }
+
+    private Object getInputVariables(KogitoProcessContext context) {
+        return context.getVariable(SWFConstants.INPUT_WORKFLOW_VAR);
+    }
+}
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/main/resources/META-INF/services/org.kie.kogito.serverless.workflow.utils.KogitoProcessContextResolverExtension b/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/main/resources/META-INF/services/org.kie.kogito.serverless.workflow.utils.KogitoProcessContextResolverExtension
@@ -0,0 +1,20 @@
+#
+# 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.
+#
+
+org.kie.kogito.serverless.workflow.utils.InputKogitoProcessContextResolver
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/test/java/org/kie/kogito/serverless/workflow/test/MockBuilder.java b/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/test/java/org/kie/kogito/serverless/workflow/test/MockBuilder.java
@@ -31,6 +31,9 @@
 import org.kie.kogito.internal.process.runtime.KogitoProcessContext;
 import org.kie.kogito.internal.process.runtime.KogitoProcessInstance;
 import org.kie.kogito.jackson.utils.ObjectMapperFactory;
+import org.kie.kogito.serverless.workflow.SWFConstants;
+
+import com.fasterxml.jackson.databind.JsonNode;
 
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.functions.FunctionDefinition;
@@ -89,6 +92,7 @@ public Workflow build() {
     public static class KogitoProcessContextMockBuilder {
         private Consumer<KogitoProcessInstance> processInstanceMockManipulation;
         private Map<String, Object> constants = new HashMap<>();
+        private JsonNode input;
 
         public KogitoProcessContextMockBuilder withProcessInstanceMock(Consumer<KogitoProcessInstance> processInstanceMockManipulation) {
             this.processInstanceMockManipulation = processInstanceMockManipulation;
@@ -100,6 +104,11 @@ public KogitoProcessContextMockBuilder withConstants(Map<String, Object> constan
             return this;
         }
 
+        public KogitoProcessContextMockBuilder withInput(JsonNode input) {
+            this.input = input;
+            return this;
+        }
+
         public KogitoProcessContext build() {
             KogitoProcessContext context = mock(KogitoProcessContext.class);
             KogitoProcessInstance kogitoProcessInstanceMock = mock(KogitoProcessInstance.class);
@@ -112,6 +121,7 @@ public KogitoProcessContext build() {
             if (constants != null && !constants.isEmpty()) {
                 when(processMock.getMetaData()).thenReturn(Collections.singletonMap(Metadata.CONSTANTS, ObjectMapperFactory.get().valueToTree(constants)));
             }
+            when(context.getVariable(SWFConstants.INPUT_WORKFLOW_VAR)).thenReturn(input);
             return context;
         }
     }
diff --git a/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/test/java/org/kie/kogito/serverless/workflow/utils/KogitoProcessContextResolverTest.java b/kogito-serverless-workflow/kogito-serverless-workflow-utils/src/test/java/org/kie/kogito/serverless/workflow/utils/KogitoProcessContextResolverTest.java
@@ -20,15 +20,19 @@
 
 import org.junit.jupiter.api.Test;
 import org.kie.kogito.internal.process.runtime.KogitoProcessContext;
+import org.kie.kogito.jackson.utils.ObjectMapperFactory;
 import org.kie.kogito.serverless.workflow.test.MockBuilder;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.mockito.Mockito.when;
 
 public class KogitoProcessContextResolverTest {
 
     KogitoProcessContext context = MockBuilder.kogitoProcessContext()
+            .withInput(ObjectMapperFactory.get().createObjectNode().put("pepe", "pepe"))
             .withProcessInstanceMock(it -> {
                 when(it.getId()).thenReturn("value-id");
                 when(it.getProcessId()).thenReturn("value-process-id");
@@ -50,6 +54,11 @@ void testGetName() {
         assertThat(KogitoProcessContextResolver.get().readKey(context, "name")).isEqualTo("value-name");
     }
 
+    @Test
+    void testGetInput() {
+        assertThat(KogitoProcessContextResolver.get().readKey(context, "input")).isInstanceOf(JsonNode.class);
+    }
+
     @Test
     void testGetNonExistentKey() {
         assertThatIllegalArgumentException().isThrownBy(() -> KogitoProcessContextResolver.get().readKey(context, "nonexistent"));
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/expression.sw.json b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/main/resources/expression.sw.json
@@ -85,7 +85,7 @@
       "name": "finish",
       "type": "operation",
       "stateDataFilter": {
-        "input": "{result: .number, message: .message}"
+        "input": "{result: .number, message: .message, originalFirstX: $WORKFLOW.input.numbers[0].x}"
       },
       "actions": [
          {
diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExpressionRestIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/ExpressionRestIT.java
@@ -43,6 +43,7 @@ void testExpressionRest() {
                 .then()
                 .statusCode(201)
                 .body("workflowdata.result", is(4))
+                .body("workflowdata.originalFirstX", is(2))
                 .body("workflowdata.number", nullValue())
                 .body("workflowdata.message", is("my name is javierito and in my native language dog is translated to perro and the header pepe is pepa"))
                 .body("workflowdata.user", is("anonymous"))

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`public class JsonNodeModel implements Model, MapInput, MapInputId, MapOutput, MappableToModel<JsonNodeModelOutput> {`
`40`	`40`
`41`	`41`	`private JsonNode workflowdata;`
	`42`	`+ private JsonNode input;`
`42`	`43`	`private String id;`
`43`	`44`	`private Map<String, Object> additionalProperties = Collections.emptyMap();`
`44`	`45`
`@@ -57,6 +58,7 @@ public JsonNodeModel(String id, Object workflowdata) {`
`57`	`58`	`ObjectMapper mapper = ObjectMapperFactory.listenerAware();`
`58`	`59`	`this.workflowdata = workflowdata == null ? mapper.createObjectNode() : mapper.convertValue(workflowdata, JsonNode.class);`
`59`	`60`	`}`
	`61`	`+ this.input = this.workflowdata.deepCopy();`
`60`	`62`	`}`
`61`	`63`
`62`	`64`	`public String getId() {`
`@@ -122,6 +124,7 @@ public MapInput fromMap(Map<String, Object> params) {`
`122`	`124`	`public Map<String, Object> toMap() {`
`123`	`125`	`Map<String, Object> map = new HashMap<>();`
`124`	`126`	`map.put(SWFConstants.DEFAULT_WORKFLOW_VAR, workflowdata);`
	`127`	`+ map.put(SWFConstants.INPUT_WORKFLOW_VAR, input);`
`125`	`128`	`map.putAll(additionalProperties);`
`126`	`129`	`return map;`
`127`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`"name": "finish",`
`86`	`86`	`"type": "operation",`
`87`	`87`	`"stateDataFilter": {`
`88`		`- "input": "{result: .number, message: .message}"`
	`88`	`+ "input": "{result: .number, message: .message, originalFirstX: $WORKFLOW.input.numbers[0].x}"`
`89`	`89`	`},`
`90`	`90`	`"actions": [`
`91`	`91`	`{`