Change json deep copy to in/out parameter handling

Author: tijsrademakers

modules/flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/impl/util/IOParameterUtil.java

@@ -24,6 +24,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * @author Filip Hrisafov
  */
@@ -61,6 +63,10 @@ protected static void processParameters(List<IOParameter> parameters, VariableCo
             } else {
                 value = sourceContainer.getVariable(parameter.getSource());
             }
+            
+            if (value != null && value instanceof JsonNode) {
+                value = ((JsonNode) value).deepCopy();
+            }
 
             String variableName = null;
             if (StringUtils.isNotEmpty(parameter.getTargetExpression())) {

modules/flowable-engine/src/main/java/org/flowable/engine/impl/util/IOParameterUtil.java

@@ -26,6 +26,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.fasterxml.jackson.databind.JsonNode;
+
 /**
  * @author Filip Hrisafov
  */
@@ -74,6 +76,10 @@ protected static void processParameters(List<IOParameter> parameters, VariableCo
             } else {
                 value = sourceContainer.getVariable(parameter.getSource());
             }
+            
+            if (value != null && value instanceof JsonNode) {
+                value = ((JsonNode) value).deepCopy();
+            }
 
             String variableName = null;
             if (StringUtils.isNotEmpty(parameter.getTargetExpression())) {

modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceNoWaitStatesTest.java

@@ -30,9 +30,14 @@
 import org.flowable.engine.runtime.ProcessInstance;
 import org.flowable.engine.test.Deployment;
 import org.flowable.job.api.Job;
+import org.flowable.task.api.Task;
 import org.flowable.variable.api.persistence.entity.VariableInstance;
 import org.junit.jupiter.api.Test;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 /**
  * @author Filip Hrisafov
  * @author Joram Barrez
@@ -144,8 +149,6 @@ public void testParallelAsyncAndExclusiveSubProcess() {
         assertNoJobsAndNoProcessInstances();
     }
 
-
-
     @Test
     @Deployment
     public void testNestedParallelAsyncAndExclusiveSubProcess() {
@@ -181,6 +184,30 @@ public void testNestedParallelAsyncAndExclusiveCallActivity() {
         waitForJobExecutorToProcessAllJobs(Duration.ofMinutes(5).toMillis(), 200);
         assertNoJobsAndNoProcessInstances();
     }
+    
+    @Test
+    @Deployment
+    public void testJsonArrayVariable() {
+        ArrayNode customerArray = processEngineConfiguration.getObjectMapper().createArrayNode();
+        ObjectNode customer1Node = customerArray.addObject();
+        customer1Node.put("name", "John Doe");
+        ObjectNode customer2Node = customerArray.addObject();
+        customer2Node.put("name", "Jane Doe");
+        
+        ProcessInstance processInstance = runtimeService.createProcessInstanceBuilder()
+            .processDefinitionKey("jsonVarTest")
+            .variable("customerList", customerArray)
+            .start();
+        
+        Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+        taskService.complete(task.getId());
+        
+        ArrayNode persistedCustomerArray = (ArrayNode) runtimeService.getVariable(processInstance.getId(), "customerList");
+        JsonNode persistedCustomer1Object = persistedCustomerArray.get(0);
+        
+        assertThat(persistedCustomer1Object.has("newProperty")).isTrue();
+        assertThat(persistedCustomer1Object.get("newProperty").asText()).isEqualTo("test");
+    }
 
     protected void assertNoJobsAndNoProcessInstances() {
         assertThat(managementService.createJobQuery().count()).isEqualTo(0);

modules/flowable-engine/src/test/java/org/flowable/engine/test/bpmn/multiinstance/TestJsonDelegate.java

@@ -0,0 +1,28 @@
+/* Licensed 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.flowable.engine.test.bpmn.multiinstance;
+
+import org.flowable.engine.delegate.DelegateExecution;
+import org.flowable.engine.delegate.JavaDelegate;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+public class TestJsonDelegate implements JavaDelegate {
+
+    @Override
+    public void execute(DelegateExecution execution) {
+        ObjectNode customerNode = (ObjectNode) execution.getVariable("customer");
+        customerNode.put("newProperty", "test");
+    }
+
+}

modules/flowable-engine/src/test/resources/org/flowable/engine/test/bpmn/multiinstance/MultiInstanceNoWaitStatesTest.testJsonArrayVariable.bpmn20.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions id="definition"
+             xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xmlns:flowable="http://flowable.org/bpmn"
+             targetNamespace="Examples">
+
+  <process id="jsonVarTest">
+
+    <startEvent id="theStart" />
+    <sequenceFlow id="flow1" sourceRef="theStart" targetRef="task1" />
+    
+    <userTask id="task1" />
+    
+    <sequenceFlow id="flow2" sourceRef="task1" targetRef="serviceTask1" />
+
+    <serviceTask id="serviceTask1" flowable:class="org.flowable.engine.test.bpmn.multiinstance.TestJsonDelegate">
+        <multiInstanceLoopCharacteristics isSequential="true" flowable:collection="${customerList}" flowable:elementVariable="customer" />
+    </serviceTask>
+    
+    <sequenceFlow id="flow3" sourceRef="serviceTask1" targetRef="task2" />
+    
+    <userTask id="task2" />
+
+    <sequenceFlow id="flow4" sourceRef="task2" targetRef="theEnd" />
+
+    <endEvent id="theEnd" />
+
+  </process>
+
+</definitions>

modules/flowable-variable-service/src/main/java/org/flowable/variable/service/impl/types/JsonType.java

@@ -117,8 +117,6 @@ public void setValue(Object value, ValueFields valueFields) {
         } else {
             JsonNode jsonNode = (JsonNode) value;
 
-            jsonNode = jsonNode.deepCopy();
-
             String textValue = value.toString();
             if (textValue.length() <= maxLength) {
                 valueFields.setTextValue(textValue);