feat: re-introduce getSecondaryResource and simplify

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/DependentResource.java

@@ -1,5 +1,7 @@
 package io.javaoperatorsdk.operator.api.reconciler.dependent;
 
+import java.util.Optional;
+
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 
@@ -27,6 +29,10 @@ public interface DependentResource<R, P extends HasMetadata> {
    */
   Class<R> resourceType();
 
+  default Optional<R> getSecondaryResource(P primary, Context<P> context) {
+    return Optional.empty();
+  }
+
   /**
    * Computes a default name for the specified DependentResource class
    *

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

@@ -32,7 +32,6 @@ public AbstractDependentResource() {
     updater = updatable ? (Updater<R, P>) this : null;
   }
 
-  @SuppressWarnings("unchecked")
   @Override
   public ReconcileResult<R> reconcile(P primary, Context<P> context) {
     Optional<R> maybeActual = getSecondaryResource(primary, context);
@@ -68,12 +67,9 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
     return ReconcileResult.noOperation(maybeActual.orElse(null));
   }
 
-  protected Optional<R> getSecondaryResource(P primary, Context<P> context) {
-    if (resourceDiscriminator == null) {
-      return context.getSecondaryResource(resourceType());
-    } else {
-      return context.getSecondaryResource(resourceType(), resourceDiscriminator);
-    }
+  public Optional<R> getSecondaryResource(P primary, Context<P> context) {
+    return resourceDiscriminator == null ? context.getSecondaryResource(resourceType())
+        : resourceDiscriminator.distinguish(resourceType(), primary, context);
   }
 
   private void throwIfNull(R desired, P primary, String descriptor) {

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

@@ -5,6 +5,7 @@
 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")
@@ -85,4 +86,8 @@ public DependentResourceNode<R, P> setReadyPostcondition(Condition<R, P> readyPo
   public List<DependentResourceNode> getParents() {
     return parents;
   }
+
+  protected R getSecondaryResource(P primary, Context<P> context) {
+    return getDependentResource().getSecondaryResource(primary, context).orElse(null);
+  }
 }

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

@@ -13,10 +13,8 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
-import io.javaoperatorsdk.operator.processing.dependent.AbstractDependentResource;
 
 @SuppressWarnings("rawtypes")
 public class WorkflowCleanupExecutor<P extends HasMetadata> {
@@ -106,11 +104,10 @@ public void run() {
           ((Deleter<P>) dependentResourceNode.getDependentResource()).delete(primary, context);
           deleteCalled.add(dependentResourceNode);
         }
-        boolean deletePostConditionMet =
-            deletePostCondition
-                .map(c -> c.isMet(primary, getSecondaryResource(dependentResourceNode),
-                    context))
-                .orElse(true);
+        boolean deletePostConditionMet = deletePostCondition
+            .map(c -> c.isMet(primary, dependentResourceNode.getSecondaryResource(primary, context),
+                context))
+            .orElse(true);
         if (deletePostConditionMet) {
           alreadyVisited.add(dependentResourceNode);
           handleDependentCleaned(dependentResourceNode);
@@ -128,24 +125,6 @@ public void run() {
     }
   }
 
-  @SuppressWarnings("unchecked")
-  private <R> R getSecondaryResource(DependentResourceNode<R, P> dependentResourceNode) {
-    if (dependentResourceNode.getDependentResource() instanceof AbstractDependentResource &&
-        ((AbstractDependentResource) dependentResourceNode.getDependentResource())
-            .getResourceDiscriminator() != null) {
-      ResourceDiscriminator<R, P> discriminator =
-          ((AbstractDependentResource) dependentResourceNode.getDependentResource())
-              .getResourceDiscriminator();
-      return context
-          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType(),
-              discriminator)
-          .orElse(null);
-    } else {
-      return context
-          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType())
-          .orElse(null);
-    }
-  }
 
   private synchronized void handleDependentCleaned(
       DependentResourceNode<?, P> dependentResourceNode) {

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

@@ -13,12 +13,10 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
-import io.javaoperatorsdk.operator.processing.dependent.AbstractDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
@@ -87,7 +85,7 @@ private synchronized <R> void handleReconcile(DependentResourceNode<R, P> depend
     }
 
     boolean reconcileConditionMet = dependentResourceNode.getReconcilePrecondition()
-        .map(rc -> rc.isMet(primary, getSecondaryResource(dependentResourceNode),
+        .map(rc -> rc.isMet(primary, dependentResourceNode.getSecondaryResource(primary, context),
             context))
         .orElse(true);
 
@@ -101,25 +99,6 @@ private synchronized <R> void handleReconcile(DependentResourceNode<R, P> depend
     }
   }
 
-  @SuppressWarnings("unchecked")
-  private <R> R getSecondaryResource(DependentResourceNode<R, P> dependentResourceNode) {
-    if (dependentResourceNode.getDependentResource() instanceof AbstractDependentResource &&
-        ((AbstractDependentResource) dependentResourceNode.getDependentResource())
-            .getResourceDiscriminator() != null) {
-      ResourceDiscriminator<R, P> discriminator =
-          ((AbstractDependentResource) dependentResourceNode.getDependentResource())
-              .getResourceDiscriminator();
-      return context
-          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType(),
-              discriminator)
-          .orElse(null);
-    } else {
-      return context
-          .getSecondaryResource(dependentResourceNode.getDependentResource().resourceType())
-          .orElse(null);
-    }
-  }
-
   private synchronized void handleDelete(DependentResourceNode dependentResourceNode) {
     log.debug("Submitting for delete: {}", dependentResourceNode);
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java

@@ -173,8 +173,7 @@ public ControllerResourceEventSource<P> getControllerResourceEventSource() {
   }
 
   @Override
-  public <R> ResourceEventSource<R, P> getResourceEventSourceFor(
-      Class<R> dependentType) {
+  public <R> ResourceEventSource<R, P> getResourceEventSourceFor(Class<R> dependentType) {
     return getResourceEventSourceFor(dependentType, null);
   }
 

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

@@ -79,7 +79,7 @@ public Class<ConfigMap> resourceType() {
     }
 
     @Override
-    protected Optional<ConfigMap> getSecondaryResource(TestCustomResource primary,
+    public Optional<ConfigMap> getSecondaryResource(TestCustomResource primary,
         Context<TestCustomResource> context) {
       return Optional.ofNullable(secondary);
     }