From b796e8801ef947addd4212cb175afda1ecb8ee54 Mon Sep 17 00:00:00 2001
From: zuokai <zuokai@didiglobal.com>
Date: Tue, 13 Jun 2023 19:37:28 +0800
Subject: [PATCH] update CallActivity comment

---
 CHANGELOG.md                                  | 53 +++++++++++++++++++
 demo/pom.xml                                  |  6 +--
 engine/pom.xml                                |  4 +-
 .../turbo/engine/bo/ElementInstance.java      |  4 ++
 .../engine/dao/FlowInstanceMappingDAO.java    |  6 +--
 .../dao/mapper/FlowInstanceMappingMapper.java |  2 +-
 .../SyncSingleCallActivityExecutor.java       |  4 +-
 pom.xml                                       |  2 +-
 8 files changed, 69 insertions(+), 12 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..5838b9ec
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,53 @@
+
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## [1.1.0] - 2023-03-15
+
+Support CallActivity configuration and execution.
+
+### Added
+
+Add CallActivity Node
+
+## [1.0.2] - 2023-02-20
+
+### Changed
+
+1. Optimize Maven dependency management
+
+    -Remove httpclient dependency
+    
+    -Remove individual jsr250 API dependencies
+
+    -Remove individual junit dependencies
+
+    -Commons collections 3.2.2-->commons collections 4
+    
+    -Commons lang3 3.4-->3.12.0
+
+2. Optimize hook function, change HTTP mode to internal call mode, reduce dependence on HTTP packages, and improve performance
+
+3. Simplify the configuration steps for Turbo introduction and add @ enableTurboEngine annotation
+
+4. Optimize partial code structure
+
+5. Optimize Demo Test Execution
+
+## [1.0.1] -  2022-07-08
+
+### Changed
+
+1. Upgrade external dependencies
+2. Uniformly manage spring boot starter versions
+
+### Fixed
+
+Fix vulnerabilities
+
+## [1.0.0] - 2020-12-28
+
+### Added
+
+Turbo join open source.
diff --git a/demo/pom.xml b/demo/pom.xml
index 80424b4b..7f1962e2 100644
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>com.didiglobal.turbo</groupId>
         <artifactId>turbo</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>demo</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -20,7 +20,7 @@
         <java.version>1.8</java.version>
 
         <spring-boot.version>1.5.10.RELEASE</spring-boot.version>
-        <turbo.engine.version>1.0.2-SNAPSHOT</turbo.engine.version>
+        <turbo.engine.version>1.1.0-SNAPSHOT</turbo.engine.version>
         <h2.version>1.4.200</h2.version>
     </properties>
 
diff --git a/engine/pom.xml b/engine/pom.xml
index 90995706..ac8d7dfc 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -5,13 +5,13 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>engine</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <parent>
         <artifactId>turbo</artifactId>
         <groupId>com.didiglobal.turbo</groupId>
-        <version>1.0.2-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <properties>
         <groovy.version>2.3.7</groovy.version>
diff --git a/engine/src/main/java/com/didiglobal/turbo/engine/bo/ElementInstance.java b/engine/src/main/java/com/didiglobal/turbo/engine/bo/ElementInstance.java
index e44d0c67..74661176 100644
--- a/engine/src/main/java/com/didiglobal/turbo/engine/bo/ElementInstance.java
+++ b/engine/src/main/java/com/didiglobal/turbo/engine/bo/ElementInstance.java
@@ -20,6 +20,10 @@ public ElementInstance() {
         super();
     }
 
+    public ElementInstance(String modelKey, int status) {
+        this(modelKey, status, null, null);
+    }
+
     public ElementInstance(String modelKey, int status, String nodeInstanceId, String instanceDataId) {
         super();
         this.modelKey = modelKey;
diff --git a/engine/src/main/java/com/didiglobal/turbo/engine/dao/FlowInstanceMappingDAO.java b/engine/src/main/java/com/didiglobal/turbo/engine/dao/FlowInstanceMappingDAO.java
index be497280..547a05eb 100644
--- a/engine/src/main/java/com/didiglobal/turbo/engine/dao/FlowInstanceMappingDAO.java
+++ b/engine/src/main/java/com/didiglobal/turbo/engine/dao/FlowInstanceMappingDAO.java
@@ -47,12 +47,12 @@ public int insert(FlowInstanceMappingPO flowInstanceMappingPO) {
         return -1;
     }
 
-    public void updateStatus(String flowInstanceId, String nodeInstanceId, int status) {
+    public void updateType(String flowInstanceId, String nodeInstanceId, int type) {
         FlowInstanceMappingPO flowInstanceMappingPO = new FlowInstanceMappingPO();
         flowInstanceMappingPO.setFlowInstanceId(flowInstanceId);
         flowInstanceMappingPO.setNodeInstanceId(nodeInstanceId);
-        flowInstanceMappingPO.setType(status);
+        flowInstanceMappingPO.setType(type);
         flowInstanceMappingPO.setModifyTime(new Date());
-        baseMapper.updateStatus(flowInstanceMappingPO);
+        baseMapper.updateType(flowInstanceMappingPO);
     }
 }
diff --git a/engine/src/main/java/com/didiglobal/turbo/engine/dao/mapper/FlowInstanceMappingMapper.java b/engine/src/main/java/com/didiglobal/turbo/engine/dao/mapper/FlowInstanceMappingMapper.java
index 7e99c2ce..187cb533 100644
--- a/engine/src/main/java/com/didiglobal/turbo/engine/dao/mapper/FlowInstanceMappingMapper.java
+++ b/engine/src/main/java/com/didiglobal/turbo/engine/dao/mapper/FlowInstanceMappingMapper.java
@@ -17,5 +17,5 @@ public interface FlowInstanceMappingMapper extends BaseMapper<FlowInstanceMappin
     FlowInstanceMappingPO selectFlowInstanceMappingPO(@Param("flowInstanceId") String flowInstanceId, @Param("nodeInstanceId") String nodeInstanceId);
 
     @Update("UPDATE ei_flow_instance_mapping SET type= #{type}, modify_time= #{modifyTime} WHERE flow_instance_id= #{flowInstanceId} and node_instance_id = #{nodeInstanceId}")
-    void updateStatus(FlowInstanceMappingPO entity);
+    void updateType(FlowInstanceMappingPO entity);
 }
diff --git a/engine/src/main/java/com/didiglobal/turbo/engine/executor/callactivity/SyncSingleCallActivityExecutor.java b/engine/src/main/java/com/didiglobal/turbo/engine/executor/callactivity/SyncSingleCallActivityExecutor.java
index 2dea1daf..2beaa9e5 100644
--- a/engine/src/main/java/com/didiglobal/turbo/engine/executor/callactivity/SyncSingleCallActivityExecutor.java
+++ b/engine/src/main/java/com/didiglobal/turbo/engine/executor/callactivity/SyncSingleCallActivityExecutor.java
@@ -282,7 +282,7 @@ private void updateFlowInstanceMapping(RuntimeContext runtimeContext) {
         runtimeContext.setCurrentNodeInstance(newNodeInstanceBO);
 
         FlowInstanceMappingPO oldFlowInstanceMappingPO = flowInstanceMappingDAO.selectFlowInstanceMappingPO(runtimeContext.getFlowInstanceId(), currentNodeInstance.getNodeInstanceId());
-        flowInstanceMappingDAO.updateStatus(oldFlowInstanceMappingPO.getFlowInstanceId(), oldFlowInstanceMappingPO.getNodeInstanceId(), FlowInstanceMappingType.TERMINATED);
+        flowInstanceMappingDAO.updateType(oldFlowInstanceMappingPO.getFlowInstanceId(), oldFlowInstanceMappingPO.getNodeInstanceId(), FlowInstanceMappingType.TERMINATED);
 
         FlowInstanceMappingPO newFlowInstanceMappingPO = new FlowInstanceMappingPO();
         BeanUtils.copyProperties(oldFlowInstanceMappingPO, newFlowInstanceMappingPO);
@@ -321,7 +321,7 @@ private void handleSuccessSubFlowResult(RuntimeContext runtimeContext, RuntimeRe
         if (runtimeResult.getStatus() == FlowInstanceStatus.TERMINATED) {
             // The subFlow rollback from the StartNode to the MainFlow
             currentNodeInstance.setStatus(NodeInstanceStatus.DISABLED);
-            flowInstanceMappingDAO.updateStatus(runtimeContext.getFlowInstanceId(), currentNodeInstance.getNodeInstanceId(), FlowInstanceMappingType.TERMINATED);
+            flowInstanceMappingDAO.updateType(runtimeContext.getFlowInstanceId(), currentNodeInstance.getNodeInstanceId(), FlowInstanceMappingType.TERMINATED);
         } else if (runtimeResult.getStatus() == FlowInstanceStatus.END) {
             // The subFlow is completed from the EndNode to the MainFlow
             currentNodeInstance.setStatus(NodeInstanceStatus.COMPLETED);
diff --git a/pom.xml b/pom.xml
index 817ff516..f7c0bc14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.didiglobal.turbo</groupId>
     <artifactId>turbo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <name>turbo</name>
     <description>Turbo is a light-weight flow engine framework, support BPMN2.0</description>
     <url>https://www.github.com/didi/turbo</url>