#72 remove schema

Author: xlorne

flow-engine-framework/src/main/java/com/codingapi/flow/workflow/Workflow.java

@@ -77,12 +77,6 @@ public class Workflow {
      */
     private List<IFlowNode> nodes;
 
-
-    /**
-     * 流程设计
-     */
-    private String schema;
-
     /**
      * 流程策略
      */
@@ -158,10 +152,6 @@ protected void setNodes(List<IFlowNode> nodes) {
         this.nodes = nodes;
     }
 
-    protected void setSchema(String schema) {
-        this.schema = schema;
-    }
-
     protected void setCreatedTime(long createdTime) {
         this.createdTime = createdTime;
     }
@@ -180,7 +170,7 @@ protected void setStrategies(List<IWorkflowStrategy> strategies) {
      *
      * @return json
      */
-    public String toJson(boolean hasSchema) {
+    public String toJson() {
         Map<String, Object> map = new HashMap<>();
         map.put("id", id);
         map.put("code", code);
@@ -195,7 +185,6 @@ public String toJson(boolean hasSchema) {
         map.put("nodes", nodes.stream().map(IFlowNode::toMap).toList());
         map.put("createdTime", String.valueOf(createdTime));
         map.put("updatedTime", String.valueOf(updatedTime));
-        map.put("schema", hasSchema ? schema : null);
         map.put("strategies", strategies.stream().map(IWorkflowStrategy::toMap).toList());
         return JSON.toJSONString(map);
     }
@@ -210,7 +199,6 @@ public static Workflow formJson(String json) {
         workflow.setId((String) data.get("id"));
         workflow.setCode((String) data.get("code"));
         workflow.setTitle((String) data.get("title"));
-        workflow.setSchema((String) data.get("schema"));
         workflow.setCreatedTime(Long.parseLong((String) data.get("createdTime")));
         workflow.setUpdatedTime(Long.parseLong((String) data.get("updatedTime")));
         workflow.setCreatedOperator(GatewayContext.getInstance().getFlowOperator(createOperator));

flow-engine-framework/src/main/java/com/codingapi/flow/workflow/WorkflowVersion.java

@@ -78,10 +78,6 @@ public class WorkflowVersion {
      */
     private List<IFlowNode> nodes;
 
-    /**
-     * 流程设计
-     */
-    private String schema;
 
     /**
      * 流程策略
@@ -118,7 +114,6 @@ public WorkflowVersion(Workflow workflow) {
         this.form = workflow.getForm();
         this.operatorCreateScript = workflow.getOperatorCreateScript();
         this.nodes = workflow.getNodes();
-        this.schema = workflow.getSchema();
         this.strategies = workflow.getStrategies();
         this.enable = workflow.isEnable();
         this.current = true;
@@ -135,7 +130,6 @@ public Workflow toWorkflow() {
                 this.form,
                 this.operatorCreateScript,
                 this.nodes,
-                this.schema,
                 this.strategies,
                 this.enable
         );

flow-engine-framework/src/main/java/com/codingapi/flow/workflow/runtime/WorkflowRuntime.java

@@ -42,7 +42,7 @@ public class WorkflowRuntime {
 
 
     public WorkflowRuntime(Workflow workflow) {
-        this.workflow = workflow.toJson(false);
+        this.workflow = workflow.toJson();
         this.workId = workflow.getId();
         this.workCode = workflow.getCode();
         this.workTitle = workflow.getTitle();

flow-engine-framework/src/test/java/com/codingapi/flow/workflow/WorkflowBuilderTest.java

@@ -88,7 +88,7 @@ void buildBasicWorkflow() {
         assertEquals(3, workflow.getNodes().size());
 
 
-        String json = workflow.toJson(true);
+        String json = workflow.toJson();
         System.out.println(json);
 
         Workflow workflowBck = Workflow.formJson(json);
@@ -100,7 +100,6 @@ void buildBasicWorkflow() {
         assertEquals(workflow.getCreatedOperator().getUserId(), workflowBck.getCreatedOperator().getUserId());
         assertEquals(workflow.getForm().getCode(), workflowBck.getForm().getCode());
         assertEquals(workflow.getNodes().size(), workflowBck.getNodes().size());
-        assertEquals(workflow.getSchema(), workflowBck.getSchema());
         assertEquals(workflow.getNodes().get(0).getId(), workflowBck.getNodes().get(0).getId());
 
     }

flow-engine-starter-api/src/main/java/com/codingapi/flow/api/controller/WorkflowController.java

@@ -66,7 +66,7 @@ public SingleResponse<JSONObject> create() {
         Workflow workflow = WorkflowBuilder.builder()
                 .build(false);
         workflow.addDefaultNodesAndEdges();
-        JSONObject jsonObject = JSONObject.parseObject(workflow.toJson(true));
+        JSONObject jsonObject = JSONObject.parseObject(workflow.toJson());
         return SingleResponse.of(jsonObject);
     }
 
@@ -95,7 +95,7 @@ public Response save(@RequestBody JSONObject request) {
     @GetMapping("/load")
     public SingleResponse<JSONObject> load(String id) {
         Workflow workflow = workflowService.getWorkflow(id);
-        JSONObject jsonObject = JSONObject.parseObject(workflow.toJson(true));
+        JSONObject jsonObject = JSONObject.parseObject(workflow.toJson());
         return SingleResponse.of(jsonObject);
     }
 

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/WorkflowConvertor.java

@@ -29,7 +29,6 @@ public static WorkflowEntity convert(Workflow workflow){
         entity.setForm(formMetaConvertor.convertToDatabaseColumn(workflow.getForm()));
         entity.setOperatorCreateScript(operatorMatchScriptConvertor.convertToDatabaseColumn(workflow.getOperatorCreateScript()));
         entity.setNodes(flowNodeListConvertor.convertToDatabaseColumn(workflow.getNodes()));
-        entity.setSchema(workflow.getSchema());
         entity.setStrategies(workflowStrategyListConvertor.convertToDatabaseColumn(workflow.getStrategies()));
         entity.setEnable(workflow.isEnable());
         return entity;
@@ -48,7 +47,6 @@ public static Workflow convert(WorkflowEntity entity){
                 formMetaConvertor.convertToEntityAttribute(entity.getForm()),
                 operatorMatchScriptConvertor.convertToEntityAttribute(entity.getOperatorCreateScript()),
                 flowNodeListConvertor.convertToEntityAttribute(entity.getNodes()),
-                entity.getSchema(),
                 workflowStrategyListConvertor.convertToEntityAttribute(entity.getStrategies()),
                 entity.getEnable());
     }

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/convert/WorkflowVersionConvertor.java

@@ -34,7 +34,6 @@ public static WorkflowVersionEntity convert(WorkflowVersion workflowVersion){
         entity.setForm(formMetaConvertor.convertToDatabaseColumn(workflowVersion.getForm()));
         entity.setOperatorCreateScript(operatorMatchScriptConvertor.convertToDatabaseColumn(workflowVersion.getOperatorCreateScript()));
         entity.setNodes(flowNodeListConvertor.convertToDatabaseColumn(workflowVersion.getNodes()));
-        entity.setSchema(workflowVersion.getSchema());
         entity.setStrategies(workflowStrategyListConvertor.convertToDatabaseColumn(workflowVersion.getStrategies()));
         entity.setEnable(workflowVersion.isEnable());
         return entity;
@@ -57,7 +56,6 @@ public static WorkflowVersion convert(WorkflowVersionEntity entity){
                 formMetaConvertor.convertToEntityAttribute(entity.getForm()),
                 operatorMatchScriptConvertor.convertToEntityAttribute(entity.getOperatorCreateScript()),
                 flowNodeListConvertor.convertToEntityAttribute(entity.getNodes()),
-                entity.getSchema(),
                 workflowStrategyListConvertor.convertToEntityAttribute(entity.getStrategies()),
                 entity.getEnable());
     }

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/WorkflowEntity.java

@@ -59,13 +59,6 @@ public class WorkflowEntity {
     @Lob
     private String nodes;
 
-    /**
-     * 流程设计
-     */
-    @Lob
-    @Column(name = "schema_meta")
-    private String schema;
-
     /**
      * 流程策略
      */

flow-engine-starter-infra/src/main/java/com/codingapi/flow/infra/entity/WorkflowVersionEntity.java

@@ -72,13 +72,6 @@ public class WorkflowVersionEntity {
     @Lob
     private String nodes;
 
-    /**
-     * 流程设计
-     */
-    @Lob
-    @Column(name = "schema_meta")
-    private String schema;
-
     /**
      * 流程策略
      */