fix processNodes NPE

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/service/impl/FlowProcessNodeService.java

@@ -2,6 +2,7 @@
 
 import com.codingapi.flow.action.IFlowAction;
 import com.codingapi.flow.action.actions.PassAction;
+import com.codingapi.flow.cache.FlowOperatorLocalThreadCache;
 import com.codingapi.flow.exception.FlowNotFoundException;
 import com.codingapi.flow.form.FormData;
 import com.codingapi.flow.manager.ActionManager;
@@ -94,30 +95,31 @@ private IFlowOperator loadRecordOperator(long operatorId) {
         return flowOperator;
     }
 
-    private void fetchFlowRecordOperatorList(){
+    private void fetchFlowRecordOperatorList() {
         List<Long> operatorIds = new ArrayList<>();
 
-        for(FlowRecord flowRecord:this.recordList){
-            if(!operatorIds.contains(flowRecord.getCreateOperatorId())){
+        for (FlowRecord flowRecord : this.recordList) {
+            if (!operatorIds.contains(flowRecord.getCreateOperatorId())) {
                 operatorIds.add(flowRecord.getCreateOperatorId());
             }
-            if(!operatorIds.contains(flowRecord.getCurrentOperatorId())){
+            if (!operatorIds.contains(flowRecord.getCurrentOperatorId())) {
                 operatorIds.add(flowRecord.getCurrentOperatorId());
             }
-            if(!operatorIds.contains(flowRecord.getSubmitOperatorId())){
+            if (!operatorIds.contains(flowRecord.getSubmitOperatorId())) {
                 operatorIds.add(flowRecord.getSubmitOperatorId());
             }
         }
 
         List<IFlowOperator> operatorList = this.repositoryHolder.findOperatorByIds(operatorIds);
-        if(operatorList!=null && !operatorList.isEmpty()){
-            for(IFlowOperator operator:operatorList){
+        if (operatorList != null && !operatorList.isEmpty()) {
+            for (IFlowOperator operator : operatorList) {
                 this.recordOperatorMap.put(operator.getUserId(), operator);
             }
         }
     }
 
     public List<ProcessNode> processNodes() {
+        FlowOperatorLocalThreadCache.getInstance().clear();
         // load history data
         if (this.flowRecord != null) {
             this.loadHistoryData();
@@ -151,9 +153,6 @@ private void loadEndNode(boolean finish) {
     }
 
 
-
-
-
     private List<FlowRecord> loadLatestRecords() {
         List<FlowRecord> flowRecords = new ArrayList<>();
         for (FlowRecord flowRecord : this.recordList) {
@@ -169,7 +168,11 @@ private void loadNextData() {
         if (this.flowRecord == null) {
             IFlowNode currentNode = this.workflow.getStartNode();
             IFlowOperator currentOperator = this.loadRecordOperator(this.request.getOperatorId());
-            FlowSession flowSession = this.buildFlowSession(currentNode, currentOperator, currentOperator, currentOperator, 0);
+            FlowSession flowSession = this.buildFlowSession(null, currentNode, currentOperator, currentOperator, currentOperator, 0);
+            List<FlowRecord> flowRecords = currentNode.generateCurrentRecords(flowSession);
+            FlowRecord startRecord = flowRecords.get(0);
+            flowSession.setCurrentRecord(startRecord);
+
             this.addFlowNode(currentNode, flowSession);
             this.fetchFlowNode(flowSession);
         } else {
@@ -181,19 +184,21 @@ private void loadNextData() {
                     IFlowOperator createOperator = this.loadRecordOperator(todoRecord.getCreateOperatorId());
                     IFlowOperator submitOperator = this.loadRecordOperator(todoRecord.getSubmitOperatorId());
 
-                    FlowSession flowSession = this.buildFlowSession(currentNode, currentOperator, createOperator, submitOperator, todoRecord.getWorkRuntimeId());
+                    FlowSession flowSession = this.buildFlowSession(todoRecord, currentNode, currentOperator, createOperator, submitOperator, todoRecord.getWorkRuntimeId());
                     this.fetchFlowNode(flowSession);
                 }
             }
         }
     }
 
 
-    private FlowSession buildFlowSession(IFlowNode currentNode,
-                                         IFlowOperator currentOperator,
-                                         IFlowOperator createdOperator,
-                                         IFlowOperator submitOperator,
-                                         long backupId) {
+    private FlowSession buildFlowSession(
+            FlowRecord flowRecord,
+            IFlowNode currentNode,
+            IFlowOperator currentOperator,
+            IFlowOperator createdOperator,
+            IFlowOperator submitOperator,
+            long backupId) {
         ActionManager actionManager = currentNode.actionManager();
         IFlowAction flowAction = actionManager.getAction(PassAction.class);
         FormData formData = new FormData(this.workflow.getForm());
@@ -208,7 +213,7 @@ private FlowSession buildFlowSession(IFlowNode currentNode,
                 currentNode,
                 flowAction,
                 formData,
-                this.flowRecord,
+                flowRecord,
                 new ArrayList<>(),
                 backupId,
                 FlowAdvice.nullFlowAdvice()

flow-engine-framework/src/test/java/com/codingapi/flow/service/FlowSampleServiceTest.java

@@ -931,6 +931,11 @@ void parallel() {
         List<FlowRecord> userRecordList = factory.flowRecordRepository.findTodoByOperator(user.getUserId());
         assertEquals(1, userRecordList.size());
 
+
+        List<ProcessNode> nodeList = factory.flowService.processNodes(new FlowProcessNodeRequest(workflow.getId(), user.getUserId(),data));
+        assertEquals(5,nodeList.size());
+        assertEquals(0,nodeList.stream().filter(ProcessNode::isHistory).toList().size());
+
         FlowActionRequest userRequest = new FlowActionRequest();
         userRequest.setFormData(data);
         userRequest.setRecordId(userRecordList.get(0).getId());