refactor: simplify WorkflowBuilder, clean up docs

Author: metacosm

docs/documentation/workflows.md

@@ -1,12 +1,14 @@
 package io.javaoperatorsdk.operator.processing.dependent.workflow.builder;
 
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.DependentResourceNode;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Workflow;
 
@@ -18,14 +20,42 @@ public class WorkflowBuilder<P extends HasMetadata> {
   private final Set<DependentResourceNode<?, P>> dependentResourceNodes = new HashSet<>();
   private boolean throwExceptionAutomatically = THROW_EXCEPTION_AUTOMATICALLY_DEFAULT;
 
-  public DependentBuilder<P> addDependentResource(DependentResource dependentResource) {
-    DependentResourceNode node = new DependentResourceNode<>(dependentResource);
-    dependentResourceNodes.add(node);
-    return new DependentBuilder<>(this, node);
+  private DependentResourceNode currentNode;
+
+  public WorkflowBuilder<P> addDependentResource(DependentResource dependentResource) {
+    currentNode = new DependentResourceNode<>(dependentResource);
+    dependentResourceNodes.add(currentNode);
+    return this;
+  }
+
+  public WorkflowBuilder<P> dependsOn(Set<DependentResource> dependentResources) {
+    for (var dependentResource : dependentResources) {
+      var dependsOn = getNodeByDependentResource(dependentResource);
+      currentNode.addDependsOnRelation(dependsOn);
+    }
+    return this;
+  }
+
+  public WorkflowBuilder<P> dependsOn(DependentResource... dependentResources) {
+    if (dependentResources != null) {
+      return dependsOn(new HashSet<>(Arrays.asList(dependentResources)));
+    }
+    return this;
   }
 
-  void addDependentResourceNode(DependentResourceNode node) {
-    dependentResourceNodes.add(node);
+  public WorkflowBuilder<P> withReconcilePrecondition(Condition reconcilePrecondition) {
+    currentNode.setReconcilePrecondition(reconcilePrecondition);
+    return this;
+  }
+
+  public WorkflowBuilder<P> withReadyPostcondition(Condition readyPostcondition) {
+    currentNode.setReadyPostcondition(readyPostcondition);
+    return this;
+  }
+
+  public WorkflowBuilder<P> withDeletePostcondition(Condition deletePostcondition) {
+    currentNode.setDeletePostcondition(deletePostcondition);
+    return this;
   }
 
   DependentResourceNode getNodeByDependentResource(DependentResource<?, ?> dependentResource) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/builder/DependentBuilder.java

@@ -19,10 +19,10 @@ class WorkflowCleanupExecutorTest extends AbstractWorkflowExecutorTest {
   @Test
   void cleanUpDiamondWorkflow() {
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(dd1).build()
-        .addDependentResource(dr1).dependsOn(dd1).build()
-        .addDependentResource(dd2).dependsOn(dd1).build()
-        .addDependentResource(dd3).dependsOn(dr1, dd2).build()
+        .addDependentResource(dd1)
+        .addDependentResource(dr1).dependsOn(dd1)
+        .addDependentResource(dd2).dependsOn(dd1)
+        .addDependentResource(dd3).dependsOn(dr1, dd2)
         .build();
 
     var res = workflow.cleanup(new TestCustomResource(), null);
@@ -38,10 +38,10 @@ void cleanUpDiamondWorkflow() {
   @Test
   void dontDeleteIfDependentErrored() {
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(dd1).build()
-        .addDependentResource(dd2).dependsOn(dd1).build()
-        .addDependentResource(dd3).dependsOn(dd2).build()
-        .addDependentResource(errorDD).dependsOn(dd2).build()
+        .addDependentResource(dd1)
+        .addDependentResource(dd2).dependsOn(dd1)
+        .addDependentResource(dd3).dependsOn(dd2)
+        .addDependentResource(errorDD).dependsOn(dd2)
         .withThrowExceptionFurther(false)
         .build();
 
@@ -60,9 +60,8 @@ void dontDeleteIfDependentErrored() {
   @Test
   void cleanupConditionTrivialCase() {
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(dd1).build()
+        .addDependentResource(dd1)
         .addDependentResource(dd2).dependsOn(dd1).withDeletePostcondition(noMetDeletePostCondition)
-        .build()
         .build();
 
     var res = workflow.cleanup(new TestCustomResource(), null);
@@ -76,9 +75,8 @@ void cleanupConditionTrivialCase() {
   @Test
   void cleanupConditionMet() {
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(dd1).build()
+        .addDependentResource(dd1)
         .addDependentResource(dd2).dependsOn(dd1).withDeletePostcondition(metDeletePostCondition)
-        .build()
         .build();
 
     var res = workflow.cleanup(new TestCustomResource(), null);
@@ -95,11 +93,10 @@ void cleanupConditionDiamondWorkflow() {
     TestDeleterDependent dd4 = new TestDeleterDependent("DR_DELETER_4");
 
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(dd1).build()
-        .addDependentResource(dd2).dependsOn(dd1).build()
+        .addDependentResource(dd1)
+        .addDependentResource(dd2).dependsOn(dd1)
         .addDependentResource(dd3).dependsOn(dd1).withDeletePostcondition(noMetDeletePostCondition)
-        .build()
-        .addDependentResource(dd4).dependsOn(dd2, dd3).build()
+        .addDependentResource(dd4).dependsOn(dd2, dd3)
         .build();
 
     var res = workflow.cleanup(new TestCustomResource(), null);
@@ -119,7 +116,7 @@ void cleanupConditionDiamondWorkflow() {
   void dontDeleteIfGarbageCollected() {
     GarbageCollectedDeleter gcDel = new GarbageCollectedDeleter("GC_DELETER");
     var workflow = new WorkflowBuilder<TestCustomResource>()
-        .addDependentResource(gcDel).build()
+        .addDependentResource(gcDel)
         .build();
 
     var res = workflow.cleanup(new TestCustomResource(), null);