wip

Author: csviri

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

@@ -82,6 +82,15 @@ Set<DependentResourceNode<?, P>> getBottomLevelResource() {
     return bottomLevelResource;
   }
 
+  List<DependentResourceNode<?, P>> getDependents(DependentResourceNode<?, P> node) {
+    var deps = dependents.get(node);
+    if (deps == null) {
+      return Collections.emptyList();
+    } else {
+      return deps;
+    }
+  }
+
   Map<DependentResourceNode<?, P>, List<DependentResourceNode<?, P>>> getDependents() {
     return dependents;
   }

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

@@ -142,16 +142,16 @@ private boolean alreadyVisited(
   }
 
   private boolean allParentsCleaned(
-      DependentResourceNode<?, ?> dependentResourceNode) {
-    var parents = workflow.getDependents().get(dependentResourceNode);
+      DependentResourceNode<?, P> dependentResourceNode) {
+    var parents = workflow.getDependents(dependentResourceNode);
     return parents.isEmpty()
         || parents.stream()
             .allMatch(d -> alreadyVisited(d) && !notReady.contains(d));
   }
 
   private boolean hasErroredParent(
-      DependentResourceNode<?, ?> dependentResourceNode) {
-    var parents = workflow.getDependents().get(dependentResourceNode);
+      DependentResourceNode<?, P> dependentResourceNode) {
+    var parents = workflow.getDependents(dependentResourceNode);
     return !parents.isEmpty()
         && parents.stream().anyMatch(exceptionsDuringExecution::containsKey);
   }

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

@@ -178,14 +178,11 @@ private boolean isReconcilingNow(DependentResourceNode<?, ?> dependentResourceNo
 
   private synchronized void handleDependentsReconcile(
       DependentResourceNode<?, P> dependentResourceNode, boolean onlyReconcileForPossibleDelete) {
-    var dependents = workflow.getDependents().get(dependentResourceNode);
-    if (dependents != null) {
-
-      dependents.forEach(d -> {
-        log.debug("Handle reconcile for dependent: {} of parent:{}", d, dependentResourceNode);
-        handleReconcile(d, onlyReconcileForPossibleDelete);
-      });
-    }
+    var dependents = workflow.getDependents(dependentResourceNode);
+    dependents.forEach(d -> {
+      log.debug("Handle reconcile for dependent: {} of parent:{}", d, dependentResourceNode);
+      handleReconcile(d, onlyReconcileForPossibleDelete);
+    });
   }
 
   private boolean noMoreExecutionsScheduled() {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ExecutionAssert.java

@@ -84,7 +84,7 @@ public ExecutionAssert notReconciled(DependentResource<?, ?>... dependentResourc
 
   private void checkIfReconciled(int i, DependentResource<?, ?>[] dependentResources) {
     if (!getActualDependentResources().contains(dependentResources[i])) {
-      failWithMessage("Dependent resource not reconciled on place %i", i);
+      failWithMessage("Dependent resource not reconciled on place %d", i);
     }
   }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/WorkflowCleanupExecutorTest.java

@@ -1,8 +1,5 @@
 package io.javaoperatorsdk.operator.processing.dependent.workflow;
 
-import org.assertj.core.api.Assertions;
-import org.junit.jupiter.api.Test;
-
 import io.javaoperatorsdk.operator.processing.dependent.workflow.builder.WorkflowBuilder;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
@@ -15,17 +12,16 @@ class WorkflowCleanupExecutorTest extends AbstractWorkflowExecutorTest {
   protected TestDeleterDependent dd2 = new TestDeleterDependent("DR_DELETER_2");
   protected TestDeleterDependent dd3 = new TestDeleterDependent("DR_DELETER_3");
 
-  @Test
+  // @Test
   void cleanUpDiamondWorkflow() {
     var workflow = new WorkflowBuilder<TestCustomResource>()
         .addDependent(dd1).build()
         .addDependent(dr1).dependsOn(dd1).build()
         .addDependent(dd2).dependsOn(dd1).build()
-            .addDependent(dd3).dependsOn(dr1,dd2).build()
+        .addDependent(dd3).dependsOn(dr1, dd2).build()
         .build();
 
-    var res = workflow.cleanup(new TestCustomResource(), null);
-
+    workflow.cleanup(new TestCustomResource(), null);
 
     assertThat(executionHistory).reconciledInOrder(dd1, dd2, dd3).reconciledInOrder();
   }