Only one Condition type

Author: csviri

…t/workflow/condition/ReadyCondition.java …essing/dependent/workflow/Condition.javaoperator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/condition/ReadyCondition.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/Condition.java operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/condition/ReadyCondition.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/Condition.java

@@ -1,11 +1,10 @@
-package io.javaoperatorsdk.operator.processing.dependent.workflow.condition;
+package io.javaoperatorsdk.operator.processing.dependent.workflow;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 
-public interface ReadyCondition<R, P extends HasMetadata> {
+public interface Condition<R, P extends HasMetadata> {
 
   boolean isMet(DependentResource<R, P> dependentResource, P primary, Context<P> context);
-
 }

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

@@ -6,29 +6,26 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.CleanupCondition;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReadyCondition;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReconcileCondition;
 
 public class DependentResourceNode<R, P extends HasMetadata> {
 
   private final DependentResource<R, P> dependentResource;
-  private ReconcileCondition<P> reconcileCondition;
-  private CleanupCondition cleanupCondition;
-  private ReadyCondition<R, P> readyCondition;
+  private Condition reconcileCondition;
+  private Condition cleanupCondition;
+  private Condition readyCondition;
   private List<DependentResourceNode> dependsOn = new ArrayList<>(1);
 
   public DependentResourceNode(DependentResource<R, P> dependentResource) {
     this(dependentResource, null, null);
   }
 
   public DependentResourceNode(DependentResource<R, P> dependentResource,
-      ReconcileCondition<P> reconcileCondition) {
+      Condition reconcileCondition) {
     this(dependentResource, reconcileCondition, null);
   }
 
   public DependentResourceNode(DependentResource<R, P> dependentResource,
-      ReconcileCondition<P> reconcileCondition, CleanupCondition cleanupCondition) {
+      Condition reconcileCondition, Condition cleanupCondition) {
     this.dependentResource = dependentResource;
     this.reconcileCondition = reconcileCondition;
     this.cleanupCondition = cleanupCondition;
@@ -38,11 +35,11 @@ public DependentResource<R, P> getDependentResource() {
     return dependentResource;
   }
 
-  public Optional<ReconcileCondition<P>> getReconcileCondition() {
+  public Optional<Condition> getReconcileCondition() {
     return Optional.ofNullable(reconcileCondition);
   }
 
-  public Optional<CleanupCondition> getCleanupCondition() {
+  public Optional<Condition> getCleanupCondition() {
     return Optional.ofNullable(cleanupCondition);
   }
 
@@ -66,21 +63,21 @@ public String toString() {
   }
 
   public DependentResourceNode<R, P> setReconcileCondition(
-      ReconcileCondition<P> reconcileCondition) {
+      Condition reconcileCondition) {
     this.reconcileCondition = reconcileCondition;
     return this;
   }
 
-  public DependentResourceNode<R, P> setCleanupCondition(CleanupCondition cleanupCondition) {
+  public DependentResourceNode<R, P> setCleanupCondition(Condition cleanupCondition) {
     this.cleanupCondition = cleanupCondition;
     return this;
   }
 
-  public Optional<ReadyCondition<R, P>> getReadyCondition() {
+  public Optional<Condition<R, P>> getReadyCondition() {
     return Optional.ofNullable(readyCondition);
   }
 
-  public DependentResourceNode<R, P> setReadyCondition(ReadyCondition<R, P> readyCondition) {
+  public DependentResourceNode<R, P> setReadyCondition(Condition readyCondition) {
     this.readyCondition = readyCondition;
     return this;
   }

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

@@ -11,7 +11,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReconcileCondition;
 
 public class WorkflowReconcileExecutor<P extends HasMetadata> {
 
@@ -189,7 +188,7 @@ private boolean alreadyReconciled(
 
 
   private void handleReconcileCondition(DependentResourceNode<?, ?> dependentResourceNode,
-      ReconcileCondition reconcileCondition) {
+      Condition reconcileCondition) {
     boolean conditionMet =
         reconcileCondition.isMet(dependentResourceNode.getDependentResource(), primary, context);
     if (!conditionMet) {

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

@@ -2,10 +2,8 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 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.condition.CleanupCondition;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReadyCondition;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReconcileCondition;
 
 public class DependentBuilder<P extends HasMetadata> {
 
@@ -25,17 +23,17 @@ public DependentBuilder<P> dependsOn(DependentResource<?, ?>... dependentResourc
     return this;
   }
 
-  public DependentBuilder<P> withReconcileCondition(ReconcileCondition reconcileCondition) {
+  public DependentBuilder<P> withReconcileCondition(Condition reconcileCondition) {
     node.setReconcileCondition(reconcileCondition);
     return this;
   }
 
-  public DependentBuilder<P> withReadyCondition(ReadyCondition readyCondition) {
+  public DependentBuilder<P> withReadyCondition(Condition readyCondition) {
     node.setReadyCondition(readyCondition);
     return this;
   }
 
-  public DependentBuilder<P> withCleanupCondition(CleanupCondition readyCondition) {
+  public DependentBuilder<P> withCleanupCondition(Condition readyCondition) {
     node.setCleanupCondition(readyCondition);
     return this;
   }

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

@@ -3,7 +3,6 @@
 import org.junit.jupiter.api.Test;
 
 import io.javaoperatorsdk.operator.processing.dependent.workflow.builder.WorkflowBuilder;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.CleanupCondition;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
 import static io.javaoperatorsdk.operator.processing.dependent.workflow.ExecutionAssert.assertThat;
@@ -16,9 +15,9 @@ class WorkflowCleanupExecutorTest extends AbstractWorkflowExecutorTest {
 
   protected TestErrorDeleterDependent errorDD = new TestErrorDeleterDependent("ERROR_DELETER");
 
-  private final CleanupCondition noMetCleanupCondition =
+  private final Condition noMetCleanupCondition =
       (dependentResource, primary, context) -> false;
-  private final CleanupCondition metCleanupCondition =
+  private final Condition metCleanupCondition =
       (dependentResource, primary, context) -> true;
 
   @Test

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

@@ -5,8 +5,6 @@
 
 import io.javaoperatorsdk.operator.AggregatedOperatorException;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.builder.WorkflowBuilder;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReadyCondition;
-import io.javaoperatorsdk.operator.processing.dependent.workflow.condition.ReconcileCondition;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
 import static io.javaoperatorsdk.operator.processing.dependent.workflow.ExecutionAssert.*;
@@ -15,17 +13,17 @@
 class WorkflowReconcileExecutorTest extends AbstractWorkflowExecutorTest {
 
   public static final String NOT_READY_YET = "NOT READY YET";
-  private ReconcileCondition met_reconcile_condition =
+  private Condition met_reconcile_condition =
       (dependentResource, primary, context) -> true;
-  private ReconcileCondition not_met_reconcile_condition =
+  private Condition not_met_reconcile_condition =
       (dependentResource, primary, context) -> false;
 
-  private ReadyCondition<String, TestCustomResource> metReadyCondition =
+  private Condition<String, TestCustomResource> metReadyCondition =
       (dependentResource, primary, context) -> true;
-  private ReadyCondition<String, TestCustomResource> notMetReadyCondition =
+  private Condition<String, TestCustomResource> notMetReadyCondition =
       (dependentResource, primary, context) -> false;
 
-  private ReadyCondition<String, TestCustomResource> notMetReadyConditionWithStatusUpdate =
+  private Condition<String, TestCustomResource> notMetReadyConditionWithStatusUpdate =
       (dependentResource, primary, context) -> false;
 
   @Test