From cf11b91a993218c0b38b4e42ec159fe3192af9ae Mon Sep 17 00:00:00 2001
From: csviri <csviri@gmail.com>
Date: Fri, 11 Aug 2023 11:06:50 +0200
Subject: [PATCH] improve: discriminator improvements

---
 .../api/reconciler/IndexDiscriminator.java    | 45 +++++++++++++++++++
 .../IndexDiscriminator.java                   | 41 -----------------
 .../IndexDiscriminatorTestReconciler.java     |  4 +-
 .../TestIndexDiscriminator.java               | 14 ++++++
 4 files changed, 61 insertions(+), 43 deletions(-)
 create mode 100644 operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/IndexDiscriminator.java
 delete mode 100644 operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminator.java
 create mode 100644 operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/TestIndexDiscriminator.java

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/IndexDiscriminator.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/IndexDiscriminator.java
new file mode 100644
index 0000000000..365e2dd81f
--- /dev/null
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/IndexDiscriminator.java
@@ -0,0 +1,45 @@
+package io.javaoperatorsdk.operator.api.reconciler;
+
+import java.util.Optional;
+import java.util.function.Function;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
+
+public class IndexDiscriminator<R extends HasMetadata, P extends HasMetadata>
+    implements ResourceDiscriminator<R, P> {
+
+  private final String indexName;
+  private final String eventSourceName;
+  private final Function<P, String> keyMapper;
+
+  public IndexDiscriminator(String indexName, Function<P, String> keyMapper) {
+    this(indexName, null, keyMapper);
+  }
+
+  public IndexDiscriminator(String indexName, String eventSourceName,
+      Function<P, String> keyMapper) {
+    this.indexName = indexName;
+    this.eventSourceName = eventSourceName;
+    this.keyMapper = keyMapper;
+  }
+
+  @Override
+  public Optional<R> distinguish(Class<R> resource,
+      P primary,
+      Context<P> context) {
+
+    InformerEventSource<R, P> eventSource =
+        (InformerEventSource<R, P>) context
+            .eventSourceRetriever()
+            .getResourceEventSourceFor(resource, eventSourceName);
+    var resources = eventSource.byIndex(indexName, keyMapper.apply(primary));
+    if (resources.isEmpty()) {
+      return Optional.empty();
+    } else if (resources.size() > 1) {
+      throw new IllegalStateException("More than one resource found");
+    } else {
+      return Optional.of(resources.get(0));
+    }
+  }
+}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminator.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminator.java
deleted file mode 100644
index eb6e193479..0000000000
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package io.javaoperatorsdk.operator.sample.indexdiscriminator;
-
-import java.util.Optional;
-
-import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
-import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
-
-import static io.javaoperatorsdk.operator.sample.indexdiscriminator.IndexDiscriminatorTestReconciler.configMapKeyFromPrimary;
-
-public class IndexDiscriminator
-    implements ResourceDiscriminator<ConfigMap, IndexDiscriminatorTestCustomResource> {
-
-  private final String indexName;
-  private final String nameSuffix;
-
-  public IndexDiscriminator(String indexName, String nameSuffix) {
-    this.indexName = indexName;
-    this.nameSuffix = nameSuffix;
-  }
-
-  @Override
-  public Optional<ConfigMap> distinguish(Class<ConfigMap> resource,
-      IndexDiscriminatorTestCustomResource primary,
-      Context<IndexDiscriminatorTestCustomResource> context) {
-
-    InformerEventSource<ConfigMap, IndexDiscriminatorTestCustomResource> eventSource =
-        (InformerEventSource<ConfigMap, IndexDiscriminatorTestCustomResource>) context
-            .eventSourceRetriever()
-            .getResourceEventSourceFor(ConfigMap.class);
-    var resources = eventSource.byIndex(indexName, configMapKeyFromPrimary(primary, nameSuffix));
-    if (resources.isEmpty()) {
-      return Optional.empty();
-    } else if (resources.size() > 1) {
-      throw new IllegalStateException("more than one resource");
-    } else {
-      return Optional.of(resources.get(0));
-    }
-  }
-}
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestReconciler.java
index 0b0af2a1cc..b988c93491 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminatorTestReconciler.java
@@ -81,10 +81,10 @@ public Map<String, EventSource> prepareEventSources(
 
     firstDependentResourceConfigMap
         .setResourceDiscriminator(
-            new IndexDiscriminator(CONFIG_MAP_INDEX_1, FIRST_CONFIG_MAP_SUFFIX_1));
+            new TestIndexDiscriminator(CONFIG_MAP_INDEX_1, FIRST_CONFIG_MAP_SUFFIX_1));
     secondDependentResourceConfigMap
         .setResourceDiscriminator(
-            new IndexDiscriminator(CONFIG_MAP_INDEX_2, FIRST_CONFIG_MAP_SUFFIX_2));
+            new TestIndexDiscriminator(CONFIG_MAP_INDEX_2, FIRST_CONFIG_MAP_SUFFIX_2));
     return EventSourceInitializer.nameEventSources(eventSource);
   }
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/TestIndexDiscriminator.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/TestIndexDiscriminator.java
new file mode 100644
index 0000000000..a56e44ced8
--- /dev/null
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/TestIndexDiscriminator.java
@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.sample.indexdiscriminator;
+
+import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.javaoperatorsdk.operator.api.reconciler.IndexDiscriminator;
+
+import static io.javaoperatorsdk.operator.sample.indexdiscriminator.IndexDiscriminatorTestReconciler.configMapKeyFromPrimary;
+
+public class TestIndexDiscriminator
+    extends IndexDiscriminator<ConfigMap, IndexDiscriminatorTestCustomResource> {
+
+  public TestIndexDiscriminator(String indexName, String nameSuffix) {
+    super(indexName, p -> configMapKeyFromPrimary(p, nameSuffix));
+  }
+}