fix #30

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/context/RepositoryHolderContext.java

@@ -6,7 +6,7 @@
 import com.codingapi.flow.operator.IFlowOperator;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.record.FlowTodoRecord;
-import com.codingapi.flow.record.FlowTodoMarge;
+import com.codingapi.flow.record.FlowTodoMerge;
 import com.codingapi.flow.repository.*;
 import com.codingapi.flow.service.FlowService;
 import com.codingapi.flow.service.impl.FlowActionService;
@@ -34,7 +34,7 @@ private RepositoryHolderContext() {
     @Getter
     private FlowTodoRecordRepository flowTodoRecordRepository;
     @Getter
-    private FlowTodoMargeRepository flowTodoMargeRepository;
+    private FlowTodoMergeRepository flowTodoMergeRepository;
     @Getter
     private FlowOperatorGateway flowOperatorGateway;
     @Getter
@@ -53,7 +53,7 @@ public boolean isRegistered() {
                 && workflowBackupRepository != null
                 && flowRecordRepository != null
                 && flowTodoRecordRepository != null
-                && flowTodoMargeRepository != null
+                && flowTodoMergeRepository != null
                 && flowOperatorGateway != null
                 && workflowRepository != null
                 && urgeIntervalRepository != null;
@@ -70,7 +70,7 @@ public void register(WorkflowRepository workflowRepository,
                          WorkflowBackupRepository workflowBackupRepository,
                          FlowRecordRepository flowRecordRepository,
                          FlowTodoRecordRepository flowTodoRecordRepository,
-                         FlowTodoMargeRepository flowTodoMargeRepository,
+                         FlowTodoMergeRepository flowTodoMergeRepository,
                          FlowOperatorGateway flowOperatorGateway,
                          ParallelBranchRepository parallelBranchRepository,
                          DelayTaskRepository delayTaskRepository,
@@ -79,7 +79,7 @@ public void register(WorkflowRepository workflowRepository,
         this.workflowBackupRepository = workflowBackupRepository;
         this.flowRecordRepository = flowRecordRepository;
         this.flowTodoRecordRepository = flowTodoRecordRepository;
-        this.flowTodoMargeRepository = flowTodoMargeRepository;
+        this.flowTodoMergeRepository = flowTodoMergeRepository;
         this.flowOperatorGateway = flowOperatorGateway;
         this.parallelBranchRepository = parallelBranchRepository;
         this.delayTaskRepository = delayTaskRepository;
@@ -125,7 +125,7 @@ public FlowService createFlowService() {
                 flowOperatorGateway,
                 flowRecordRepository,
                 flowTodoRecordRepository,
-                flowTodoMargeRepository,
+                flowTodoMergeRepository,
                 workflowBackupRepository,
                 parallelBranchRepository,
                 delayTaskRepository,
@@ -198,20 +198,20 @@ private static class FlowRecordRepositoryService {
 
         private final List<FlowRecord> flowRecords;
         private final FlowTodoRecordRepository flowTodoRecordRepository;
-        private final FlowTodoMargeRepository flowTodoMargeRepository;
+        private final FlowTodoMergeRepository flowTodoMergeRepository;
         private final FlowRecordRepository flowRecordRepository;
 
 
         public FlowRecordRepositoryService(List<FlowRecord> flowRecords) {
             this.flowTodoRecordRepository = RepositoryHolderContext.getInstance().getFlowTodoRecordRepository();
-            this.flowTodoMargeRepository = RepositoryHolderContext.getInstance().getFlowTodoMargeRepository();
+            this.flowTodoMergeRepository = RepositoryHolderContext.getInstance().getFlowTodoMergeRepository();
             this.flowRecordRepository = RepositoryHolderContext.getInstance().getFlowRecordRepository();
             this.flowRecords = flowRecords;
         }
 
         public FlowRecordRepositoryService(FlowRecord flowRecord) {
             this.flowTodoRecordRepository = RepositoryHolderContext.getInstance().getFlowTodoRecordRepository();
-            this.flowTodoMargeRepository = RepositoryHolderContext.getInstance().getFlowTodoMargeRepository();
+            this.flowTodoMergeRepository = RepositoryHolderContext.getInstance().getFlowTodoMergeRepository();
             this.flowRecordRepository = RepositoryHolderContext.getInstance().getFlowRecordRepository();
             this.flowRecords = new ArrayList<>();
             this.flowRecords.add(flowRecord);
@@ -224,7 +224,7 @@ private void saveTodoMargeRecords() {
                 if (flowRecord.isTodo()) {
                     FlowTodoRecord todoMargeRecord = null;
                     if (flowRecord.isMergeable()) {
-                        todoMargeRecord = flowTodoRecordRepository.getByMageKey(flowRecord.getMergeKey());
+                        todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
                         if (todoMargeRecord == null) {
                             todoMargeRecord = new FlowTodoRecord(flowRecord);
                         } else {
@@ -242,13 +242,13 @@ private void saveTodoMargeRecords() {
             }
 
             if (!flowTodoRecords.isEmpty()) {
-                List<FlowTodoMarge> relationList = new ArrayList<>();
+                List<FlowTodoMerge> relationList = new ArrayList<>();
                 for (FlowTodoRecord margeRecord : flowTodoRecords) {
                     if(margeRecord.isMergeable()) {
-                        relationList.add(new FlowTodoMarge(margeRecord));
+                        relationList.add(new FlowTodoMerge(margeRecord));
                     }
                 }
-                flowTodoMargeRepository.saveAll(relationList);
+                flowTodoMergeRepository.saveAll(relationList);
             }
         }
 
@@ -263,13 +263,13 @@ private void removeTodoMargeRecords() {
             for (FlowRecord flowRecord : flowRecords) {
                 if (flowRecord.isDone()) {
                     if (flowRecord.isMergeable()) {
-                        FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMageKey(flowRecord.getMergeKey());
+                        FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
                         if(todoMargeRecord!=null) {
-                            List<FlowTodoMarge> margeRelations = flowTodoMargeRepository.findByTodoId(todoMargeRecord.getId());
+                            List<FlowTodoMerge> margeRelations = flowTodoMergeRepository.findByTodoId(todoMargeRecord.getId());
                             if(margeRelations!=null && !margeRelations.isEmpty()) {
-                                for (FlowTodoMarge margeRelation : margeRelations) {
+                                for (FlowTodoMerge margeRelation : margeRelations) {
                                     if (margeRelation.isRecord(flowRecord.getId())) {
-                                        flowTodoMargeRepository.remove(margeRelation);
+                                        flowTodoMergeRepository.remove(margeRelation);
                                         todoMargeRecord.divMargeCount();
                                         if (todoMargeRecord.hasMargeCount()) {
                                             flowTodoRecordRepository.save(todoMargeRecord);
@@ -281,7 +281,7 @@ private void removeTodoMargeRecords() {
                             }
                         }
                     } else {
-                        FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMageKey(flowRecord.getMergeKey());
+                        FlowTodoRecord todoMargeRecord = flowTodoRecordRepository.getByMergeKey(flowRecord.getMergeKey());
                         if (todoMargeRecord != null) {
                             flowTodoRecordRepository.remove(todoMargeRecord);
                         }

…codingapi/flow/record/FlowTodoMarge.java …codingapi/flow/record/FlowTodoMerge.javaflow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoMarge.java renamed to flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoMerge.java flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoMarge.java renamed to flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoMerge.java

@@ -10,7 +10,7 @@
  */
 @Getter
 @AllArgsConstructor
-public class FlowTodoMarge {
+public class FlowTodoMerge {
 
     @Setter
     private long id;
@@ -27,7 +27,7 @@ public class FlowTodoMarge {
      */
     private long createTime;
 
-    public FlowTodoMarge(FlowTodoRecord margeRecord){
+    public FlowTodoMerge(FlowTodoRecord margeRecord){
         this.todoId = margeRecord.getId();
         this.recordId = margeRecord.getRecordId();
         this.createTime = margeRecord.getCreateTime();

flow-engine-framework/src/main/java/com/codingapi/flow/record/FlowTodoRecord.java

@@ -77,7 +77,7 @@ public class FlowTodoRecord {
      * 合并记录id,当存在合并记录数据时待办记录数量不会增加，内容会更新至最新的待办数据信息。
      * {@link FlowRecord#getMergeKey()}
      */
-    private String margeKey;
+    private String mergeKey;
 
     /**
      * 合并记录数量
@@ -118,7 +118,7 @@ public void update(FlowRecord flowRecord){
         this.createTime = flowRecord.getCreateTime();
         this.createOperatorId = flowRecord.getCreateOperatorId();
         this.createOperatorName = flowRecord.getCreateOperatorName();
-        this.margeKey = flowRecord.getMergeKey();
+        this.mergeKey = flowRecord.getMergeKey();
         this.mergeable = flowRecord.isMergeable();
         this.recordId = flowRecord.getId();
         this.timeoutTime = flowRecord.getTimeoutTime();

flow-engine-framework/src/main/java/com/codingapi/flow/repository/FlowTodoMargeRepository.java

@@ -0,0 +1,15 @@
+package com.codingapi.flow.repository;
+
+import com.codingapi.flow.record.FlowTodoMerge;
+
+import java.util.List;
+
+public interface FlowTodoMergeRepository {
+
+    void saveAll(List<FlowTodoMerge> list);
+
+    void remove(FlowTodoMerge todoMerge);
+
+    List<FlowTodoMerge> findByTodoId(long todoId);
+
+}

flow-engine-framework/src/main/java/com/codingapi/flow/repository/FlowTodoMergeRepository.java

@@ -8,7 +8,7 @@ public interface FlowTodoRecordRepository {
 
     void saveAll(List<FlowTodoRecord> margeRecords);
 
-    FlowTodoRecord getByMageKey(String key);
+    FlowTodoRecord getByMergeKey(String key);
 
     void remove(FlowTodoRecord margeRecord);
 

flow-engine-framework/src/main/java/com/codingapi/flow/repository/FlowTodoRecordRepository.java

@@ -20,7 +20,7 @@ public FlowService(WorkflowRepository workflowRepository,
                        FlowOperatorGateway flowOperatorGateway,
                        FlowRecordRepository flowRecordRepository,
                        FlowTodoRecordRepository flowTodoRecordRepository,
-                       FlowTodoMargeRepository flowTodoMargeRepository,
+                       FlowTodoMergeRepository flowTodoMergeRepository,
                        WorkflowBackupRepository workflowBackupRepository,
                        ParallelBranchRepository parallelBranchRepository,
                        DelayTaskRepository delayTaskRepository,
@@ -30,7 +30,7 @@ public FlowService(WorkflowRepository workflowRepository,
                         workflowBackupRepository,
                         flowRecordRepository,
                         flowTodoRecordRepository,
-                        flowTodoMargeRepository,
+                        flowTodoMergeRepository,
                         flowOperatorGateway,
                         parallelBranchRepository,
                         delayTaskRepository,

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

@@ -1,16 +1,16 @@
 package com.codingapi.flow.repository;
 
-import com.codingapi.flow.record.FlowTodoMarge;
+import com.codingapi.flow.record.FlowTodoMerge;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class FlowTodoMargeRepositoryImpl implements FlowTodoMargeRepository {
+public class FlowTodoMergeRepositoryImpl implements FlowTodoMergeRepository {
 
-    private final Map<Long, FlowTodoMarge> cache = new HashMap<>();
+    private final Map<Long, FlowTodoMerge> cache = new HashMap<>();
 
-    private void save(FlowTodoMarge relation) {
+    private void save(FlowTodoMerge relation) {
         if (relation.getId() > 0) {
             cache.put(relation.getId(), relation);
         } else {
@@ -21,19 +21,19 @@ private void save(FlowTodoMarge relation) {
     }
 
     @Override
-    public void remove(FlowTodoMarge relation) {
-        this.cache.remove(relation.getId());
+    public void remove(FlowTodoMerge todoMerge) {
+        this.cache.remove(todoMerge.getId());
     }
 
     @Override
-    public void saveAll(List<FlowTodoMarge> relations) {
-        for (FlowTodoMarge relation : relations){
+    public void saveAll(List<FlowTodoMerge> list) {
+        for (FlowTodoMerge relation : list){
             this.save(relation);
         }
     }
 
     @Override
-    public List<FlowTodoMarge> findByTodoId(long todoId) {
+    public List<FlowTodoMerge> findByTodoId(long todoId) {
         return cache.values().stream().
                 filter(relation -> relation.getTodoId() == todoId)
                 .toList();

…ository/FlowTodoMargeRepositoryImpl.java …ository/FlowTodoMergeRepositoryImpl.javaflow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoMargeRepositoryImpl.java renamed to flow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoMergeRepositoryImpl.java flow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoMargeRepositoryImpl.java renamed to flow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoMergeRepositoryImpl.java

@@ -20,7 +20,7 @@ public void save(FlowTodoRecord record) {
             record.setId(id);
             cache.put(id, record);
         }
-        cacheByMageKey.put(record.getMargeKey(), record);
+        cacheByMageKey.put(record.getMergeKey(), record);
     }
 
     @Override
@@ -32,12 +32,12 @@ public void saveAll(List<FlowTodoRecord> margeRecords) {
 
     @Override
     public void remove(FlowTodoRecord margeRecord) {
-        cacheByMageKey.remove(margeRecord.getMargeKey());
+        cacheByMageKey.remove(margeRecord.getMergeKey());
         cache.remove(margeRecord.getId());
     }
 
     @Override
-    public FlowTodoRecord getByMageKey(String key) {
+    public FlowTodoRecord getByMergeKey(String key) {
         return cacheByMageKey.get(key);
     }
 

flow-engine-framework/src/test/java/com/codingapi/flow/repository/FlowTodoRecordRepositoryImpl.java

@@ -18,7 +18,7 @@
 import com.codingapi.flow.pojo.request.FlowCreateRequest;
 import com.codingapi.flow.record.FlowRecord;
 import com.codingapi.flow.record.FlowTodoRecord;
-import com.codingapi.flow.record.FlowTodoMarge;
+import com.codingapi.flow.record.FlowTodoMerge;
 import com.codingapi.flow.repository.*;
 import com.codingapi.flow.strategy.node.FormFieldPermissionStrategy;
 import com.codingapi.flow.strategy.node.OperatorLoadStrategy;
@@ -38,7 +38,7 @@
 public class FlowMergeableServiceTest {
 
     private final FlowTodoRecordRepositoryImpl flowTodoMargeRecordRepository = new FlowTodoRecordRepositoryImpl();
-    private final FlowTodoMargeRepositoryImpl flowTodoMargeRelationRepository = new FlowTodoMargeRepositoryImpl();
+    private final FlowTodoMergeRepositoryImpl flowTodoMargeRelationRepository = new FlowTodoMergeRepositoryImpl();
     private final FlowRecordRepositoryImpl flowRecordRepository = new FlowRecordRepositoryImpl();
     private final UserGateway userGateway = new UserGateway();
     private final WorkflowBackupRepository workflowBackupRepository = new WorkflowBackupRepositoryImpl();
@@ -147,7 +147,7 @@ void mergeableRecords() {
         assertEquals(1, todoMargeRecords.size());
 
         FlowTodoRecord todoMargeRecord = todoMargeRecords.get(0);
-        List<FlowTodoMarge> relationList = flowTodoMargeRelationRepository.findByTodoId(todoMargeRecord.getId());
+        List<FlowTodoMerge> relationList = flowTodoMargeRelationRepository.findByTodoId(todoMargeRecord.getId());
         assertEquals(count, relationList.size());