Improved the visitor pattern

Signed-off-by: cmoulliard <[email protected]>

src/main/java/dev/snowdrop/visitorpattern/AbstractRun.java

@@ -0,0 +1,9 @@
+package dev.snowdrop.visitorpattern;
+
+public abstract class AbstractRun implements Visitable {
+
+    public AbstractRun() {}
+
+    @Override
+    public abstract AbstractRun accept(Visitor visitor);
+}

src/main/java/dev/snowdrop/visitorpattern/JobFactory.java

@@ -8,11 +8,7 @@ public static Visitable createResource(Configurator config) {
         if (config.getResourceType().equalsIgnoreCase("PipelineRun")) {
             return new PipelineRun(config);
         } else if (config.getResourceType().equalsIgnoreCase("TaskRun")) {
-            // Convert Actions to Steps
-            List<Step> steps = config.getJob().getActions().stream()
-                .map(action -> new Step(action.getName()))
-                .collect(Collectors.toList());
-            return new TaskRun(config.getName(), steps);
+            return new TaskRun(config);
         }
         throw new IllegalArgumentException("Unknown resource type: " + config.getResourceType());
     }

src/main/java/dev/snowdrop/visitorpattern/MainApp.java

@@ -1,8 +1,11 @@
 package dev.snowdrop.visitorpattern;
 
+import lombok.extern.slf4j.Slf4j;
+
 import java.util.Arrays;
 import java.util.List;
 
+@Slf4j
 public class MainApp {
     public static void main(String[] args) {
         // Create a sample Configurator
@@ -15,7 +18,7 @@ public static void main(String[] args) {
         job.setActions(actions);
 
         Configurator configurator = new Configurator();
-        configurator.setName("Example Config");
+        configurator.setName("PipelineRun example");
         configurator.setResourceType("PipelineRun"); // Or "TaskRun"
         configurator.setJob(job);
 
@@ -24,6 +27,28 @@ public static void main(String[] args) {
 
         // Process resource using visitor
         ResourceVisitor visitor = new ResourceVisitor();
-        resource.accept(visitor);
+        AbstractRun run = resource.accept(visitor);
+        if (run instanceof PipelineRun) {
+            System.out.println("A PipelineRun : " + ((PipelineRun)run).getName());
+        } else {
+            log.info("A TaskRun : " + ((TaskRun) run).getName());
+        }
+
+        configurator.setName("TaskRun example");
+        configurator.setResourceType("TaskRun"); // Or "TaskRun"
+        configurator.setJob(job);
+
+        // Create resource (PipelineRun or TaskRun)
+        resource = JobFactory.createResource(configurator);
+
+        // Process resource using visitor
+        visitor = new ResourceVisitor();
+        run = resource.accept(visitor);
+        if (run instanceof PipelineRun) {
+            System.out.println("A PipelineRun : " + ((PipelineRun)run).getName());
+        } else {
+            System.out.println("A TaskRun : " + ((TaskRun)run).getName());
+        }
+
     }
 }

src/main/java/dev/snowdrop/visitorpattern/PipelineRun.java

@@ -7,18 +7,18 @@
 
 @Getter
 @Setter
-public class PipelineRun implements Visitable {
-    private String name;
-    private List<Action> actions;
+public class PipelineRun extends AbstractRun {
+    public String name;
+    public List<Action> actions;
+    private Configurator config;
 
     public PipelineRun(Configurator cfg) {
-        this.name = cfg.getName();
-        this.actions = cfg.getJob().getActions();
+        this.config = cfg;
     }
 
     @Override
-    public void accept(Visitor visitor) {
-        visitor.visit(this);
+    public AbstractRun accept(Visitor visitor) {
+        return visitor.visit(this);
     }
 
     // Other methods related to PipelineRun

src/main/java/dev/snowdrop/visitorpattern/ResourceVisitor.java

@@ -1,16 +1,26 @@
 package dev.snowdrop.visitorpattern;
 
+import java.util.stream.Collectors;
+
 public class ResourceVisitor implements Visitor {
 
     @Override
-    public void visit(PipelineRun pipelineRun) {
-        System.out.println("Processing PipelineRun: " + pipelineRun.getName());
-        // Logic to process PipelineRun
+    public AbstractRun visit(PipelineRun pipelineRun) {
+        System.out.println("Processing PipelineRun ...");
+        Configurator cfg = pipelineRun.getConfig();
+        pipelineRun.setActions(cfg.getJob().getActions());
+        pipelineRun.setName(cfg.getName());
+        return pipelineRun;
     }
 
     @Override
-    public void visit(TaskRun taskRun) {
-        System.out.println("Processing TaskRun: " + taskRun.getName());
-        // Logic to process TaskRun
+    public TaskRun visit(TaskRun taskRun) {
+        System.out.println("Processing TaskRun ...");
+        Configurator cfg = taskRun.getConfig();
+        taskRun.setSteps(cfg.getJob().getActions().stream()
+            .map(action -> new Step(action.getName()))
+            .collect(Collectors.toList()));
+        taskRun.setName(cfg.getName());
+        return taskRun;
     }
 }

src/main/java/dev/snowdrop/visitorpattern/TaskRun.java

@@ -3,23 +3,22 @@
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Arrays;
 import java.util.List;
 
 @Getter
 @Setter
-public class TaskRun implements Visitable {
+public class TaskRun extends AbstractRun {
     private String name;
     private List<Step> steps;
+    private Configurator config;
 
-    public TaskRun(String name, List<Step> steps) {
-        this.name = name;
-        this.steps = steps;
+    public TaskRun(Configurator cfg) {
+        this.config = cfg;
     }
 
     @Override
-    public void accept(Visitor visitor) {
-        visitor.visit(this);
+    public AbstractRun accept(Visitor visitor) {
+        return visitor.visit(this);
     }
 
     // Other methods related to TaskRun

src/main/java/dev/snowdrop/visitorpattern/Visitable.java

@@ -1,6 +1,6 @@
 package dev.snowdrop.visitorpattern;
 
 public interface Visitable {
-    void accept(Visitor visitor);
+    AbstractRun accept(Visitor visitor);
 }
 

src/main/java/dev/snowdrop/visitorpattern/Visitor.java

@@ -1,7 +1,7 @@
 package dev.snowdrop.visitorpattern;
 
 public interface Visitor {
-    void visit(PipelineRun pipelineRun);
-    void visit(TaskRun taskRun);
+    AbstractRun visit(PipelineRun pipelineRun);
+    AbstractRun visit(TaskRun taskRun);
 }