refactor: move ConditionWithType to top level

Signed-off-by: Chris Laprun <claprun@redhat.com>

Author: metacosm

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

@@ -134,7 +134,7 @@ protected synchronized void handleNodeExecutionFinish(
 
   @SuppressWarnings("unchecked")
   protected <R> boolean isConditionMet(
-      Optional<DependentResourceNode.ConditionWithType<R, P, ?>> condition,
+      Optional<ConditionWithType<R, P, ?>> condition,
       DependentResourceNode<R, P> dependentResource) {
     final var dr = dependentResource.getDependentResource();
     return condition.map(c -> {

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

@@ -0,0 +1,31 @@
+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;
+
+class ConditionWithType<R, P extends HasMetadata, T> implements ResultCondition<R, P, T> {
+  private final Condition<R, P> condition;
+  private final Type type;
+
+  ConditionWithType(Condition<R, P> condition, Type type) {
+    this.condition = condition;
+    this.type = type;
+  }
+
+  public Type type() {
+    return type;
+  }
+
+  @SuppressWarnings("unchecked")
+  @Override
+  public Result<T> detailedIsMet(DependentResource<R, P> dependentResource, P primary,
+      Context<P> context) {
+    if (condition instanceof ResultCondition resultCondition) {
+      return resultCondition.detailedIsMet(dependentResource, primary, context);
+    } else {
+      return Result
+          .withoutResult(condition.isMet(dependentResource, primary, context));
+    }
+  }
+}

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

@@ -5,7 +5,6 @@
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 
 @SuppressWarnings("rawtypes")
@@ -20,32 +19,6 @@ class DependentResourceNode<R, P extends HasMetadata> {
   private ConditionWithType<R, P, ?> activationCondition;
   private final DependentResource<R, P> dependentResource;
 
-  static class ConditionWithType<R, P extends HasMetadata, T> implements ResultCondition<R, P, T> {
-    private final Condition<R, P> condition;
-    private final Type type;
-
-    ConditionWithType(Condition<R, P> condition, Type type) {
-      this.condition = condition;
-      this.type = type;
-    }
-
-    public Type type() {
-      return type;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Result<T> detailedIsMet(DependentResource<R, P> dependentResource, P primary,
-        Context<P> context) {
-      if (condition instanceof ResultCondition resultCondition) {
-        return resultCondition.detailedIsMet(dependentResource, primary, context);
-      } else {
-        return ResultCondition.Result
-            .withoutResult(condition.isMet(dependentResource, primary, context));
-      }
-    }
-  }
-
   DependentResourceNode(DependentResource<R, P> dependentResource) {
     this(null, null, null, null, dependentResource);
   }

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

@@ -104,7 +104,7 @@ Detail<R> build() {
     }
 
     DetailBuilder<R> withResultForCondition(
-        DependentResourceNode.ConditionWithType conditionWithType,
+        ConditionWithType conditionWithType,
         ResultCondition.Result conditionResult) {
       switch (conditionWithType.type()) {
         case ACTIVATION -> activationConditionResult = conditionResult;