wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -134,16 +134,8 @@ public Optional<R> getSecondaryResource(P primary, Context<P> context) {
    * @throws IllegalStateException if more than one candidate is found, in which case some other
    *     mechanism might be necessary to distinguish between candidate secondary resources
    */
-  protected Optional<R> selectTargetSecondaryResource(
-      Set<R> secondaryResources, P primary, Context<P> context) {
-    R desired = desired(primary, context);
-    var targetResources = secondaryResources.stream().filter(r -> r.equals(desired)).toList();
-    if (targetResources.size() > 1) {
-      throw new IllegalStateException(
-          "More than one secondary resource related to primary: " + targetResources);
-    }
-    return targetResources.isEmpty() ? Optional.empty() : Optional.of(targetResources.get(0));
-  }
+  protected abstract Optional<R> selectTargetSecondaryResource(
+      Set<R> secondaryResources, P primary, Context<P> context);
 
   private void throwIfNull(R desired, P primary, String descriptor) {
     if (desired == null) {

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

@@ -4,6 +4,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -105,6 +106,13 @@ public Result<R> match(R resource, P primary, Context<P> context) {
       return bulkDependentResource.match(resource, desired, primary, context);
     }
 
+    @Override
+    protected Optional<R> selectTargetSecondaryResource(
+        Set<R> secondaryResources, P primary, Context<P> context) {
+      throw new IllegalStateException(
+          "BulkDependentResource should not call selectTargetSecondaryResource.");
+    }
+
     @Override
     protected void onCreated(P primary, R created, Context<P> context) {
       asAbstractDependentResource().onCreated(primary, created, context);

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

@@ -1,6 +1,7 @@
 package io.javaoperatorsdk.operator.processing.dependent;
 
 import java.util.Optional;
+import java.util.Set;
 
 import org.junit.jupiter.api.Test;
 
@@ -84,6 +85,20 @@ public Optional<ConfigMap> getSecondaryResource(
       return Optional.ofNullable(secondary);
     }
 
+    @Override
+    protected Optional<ConfigMap> selectTargetSecondaryResource(
+        Set<ConfigMap> secondaryResources,
+        TestCustomResource primary,
+        Context<TestCustomResource> context) {
+      if (secondaryResources.size() == 1) {
+        return Optional.of(secondaryResources.iterator().next());
+      } else if (secondaryResources.isEmpty()) {
+        return Optional.empty();
+      } else {
+        throw new IllegalStateException();
+      }
+    }
+
     @Override
     protected void onCreated(
         TestCustomResource primary, ConfigMap created, Context<TestCustomResource> context) {}