apply yaml model interface

Author: gy2006

src/main/java/com/flowci/build/business/impl/CreateBuildImpl.java

@@ -10,7 +10,7 @@
 import com.flowci.flow.business.FetchFlow;
 import com.flowci.flow.business.FetchFlowYamlContent;
 import com.flowci.flow.model.Flow;
-import com.flowci.yaml.business.ParseYamlV2;
+import com.flowci.yaml.business.ParseYaml;
 import jakarta.annotation.Nullable;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
@@ -27,7 +27,7 @@ public class CreateBuildImpl implements CreateBuild {
 
     private final FetchFlow fetchFlow;
     private final FetchFlowYamlContent fetchFlowYamlContent;
-    private final ParseYamlV2 parseYamlV2;
+    private final ParseYaml parseYamlV2;
     private final BuildRepo buildRepo;
     private final BuildYamlRepo buildYamlRepo;
     private final RequestContextHolder requestContextHolder;

src/main/java/com/flowci/flow/business/impl/UpdateFlowYamlContentImpl.java

@@ -4,7 +4,7 @@
 import com.flowci.common.exception.NotAvailableException;
 import com.flowci.flow.business.UpdateFlowYamlContent;
 import com.flowci.flow.repo.FlowYamlRepo;
-import com.flowci.yaml.business.ParseYamlV2;
+import com.flowci.yaml.business.ParseYaml;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -18,7 +18,7 @@
 @AllArgsConstructor
 public class UpdateFlowYamlContentImpl implements UpdateFlowYamlContent {
 
-    private final ParseYamlV2 parseYamlV2;
+    private final ParseYaml parseYamlV2;
     private final FlowYamlRepo flowYamlRepo;
     private final RequestContextHolder requestContextHolder;
 

src/main/java/com/flowci/yaml/business/ParseYaml.java

@@ -0,0 +1,7 @@
+package com.flowci.yaml.business;
+
+import com.flowci.yaml.model.Flow;
+
+public interface ParseYaml {
+    Flow invoke(String yaml);
+}

src/main/java/com/flowci/yaml/business/ParseYamlV2.java

@@ -4,23 +4,24 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.flowci.common.validator.ValidName;
-import com.flowci.yaml.business.ParseYamlV2;
+import com.flowci.yaml.business.ParseYaml;
 import com.flowci.yaml.exception.InvalidYamlException;
-import com.flowci.yaml.model.FlowV2;
-import com.flowci.yaml.model.StepV2;
+import com.flowci.yaml.model.v2.FlowV2;
+import com.flowci.yaml.model.v2.StepV2;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
 
 import static java.lang.String.format;
 import static org.springframework.util.CollectionUtils.isEmpty;
 import static org.springframework.util.StringUtils.hasText;
 
 @Slf4j
 @Component
-public class ParseYamlV2Impl implements ParseYamlV2 {
+public class ParseYamlV2Impl implements ParseYaml {
 
     private static final ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
     private static final ValidName.NameValidator nameValidator = new ValidName.NameValidator();
@@ -48,7 +49,7 @@ public FlowV2 invoke(String yaml) {
 
     private void validateSteps(FlowV2 flow) {
         var steps = flow.getSteps();
-        if (CollectionUtils.isEmpty(steps)) {
+        if (isEmpty(steps)) {
             throw new InvalidYamlException("at least one step is required");
         }
 
@@ -78,7 +79,7 @@ private void validateSteps(FlowV2 flow) {
 
     private void validateCommands(StepV2 step) {
         var commands = step.getCommands();
-        if (CollectionUtils.isEmpty(commands)) {
+        if (isEmpty(commands)) {
             throw new InvalidYamlException(format("at least one command under step '%s' is required", step.getName()));
         }
 
@@ -101,7 +102,7 @@ private void buildGraph(FlowV2 flow) {
         }
 
         for (var step : steps) {
-            if (CollectionUtils.isEmpty(step.getDependsOn())) {
+            if (isEmpty(step.getDependsOn())) {
                 continue;
             }
 
@@ -137,13 +138,4 @@ private void checkCircularDependencies(List<StepV2> steps, HashMap<StepV2, Integ
             checkCircularDependencies(step.getNext(), traversed);
         }
     }
-
-    /**
-     * Ex:
-     *  A <-- B <-- C
-     *  A <-- C
-     */
-    private void checkDuplicatedDependsOn(List<StepV2> steps) {
-
-    }
 }

src/main/java/com/flowci/yaml/business/impl/ParseYamlV2Impl.java

@@ -0,0 +1,23 @@
+package com.flowci.yaml.model;
+
+import com.flowci.yaml.model.v2.DockerV2;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface Base {
+
+    Map<String, String> getVariables();
+
+    // condition script , todo: python or groovy?
+    String getCondition();
+
+    Integer getTimeout();
+
+    Set<String> getAgents();
+
+    Docker getDocker();
+
+    List<DockerV2> getDockers();
+}

src/main/java/com/flowci/yaml/model/Base.java

@@ -0,0 +1,8 @@
+package com.flowci.yaml.model;
+
+public interface Command {
+
+    String getBash();
+
+    String getPwsh();
+}

src/main/java/com/flowci/yaml/model/Command.java

@@ -0,0 +1,21 @@
+package com.flowci.yaml.model;
+
+import java.util.List;
+import java.util.Map;
+
+public interface Docker {
+
+    String getImage();
+
+    String getNetwork();
+
+    List<String> getPorts();
+
+    List<String> getEntrypoint();
+
+    List<String> getCommand();
+
+    Map<String, String> getEnvironment();
+
+    Boolean getIsRuntime();
+}

src/main/java/com/flowci/yaml/model/Docker.java

@@ -0,0 +1,8 @@
+package com.flowci.yaml.model;
+
+import java.util.List;
+
+public interface Flow<S extends Step<?>> extends Base {
+
+    List<S> getSteps();
+}

src/main/java/com/flowci/yaml/model/Flow.java

@@ -0,0 +1,16 @@
+package com.flowci.yaml.model;
+
+import java.util.List;
+
+public interface Step<C extends Command> extends Base {
+
+    String getName();
+
+    Boolean getAllowFailure();
+
+    Integer getRetry();
+
+    List<String> getDependsOn();
+
+    List<C> getCommands();
+}