wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -40,6 +40,7 @@
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.informer.ManagedInformerEventSource;
 
+import static io.javaoperatorsdk.operator.ReconcilerUtilsInternal.compareResourceVersions;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
 import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
 
@@ -604,56 +605,55 @@ public static <P extends HasMetadata> P addFinalizerWithSSA(
     }
   }
 
-    /**
-     * Returns a collector that deduplicates Kubernetes objects by keeping only the one with the
-     * latest metadata.resourceVersion for each unique name and namespace combination. The intended
-     * use case is for the rather rare setup when there are overlapping {@link
-     * io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource}s for a
-     * resource type.
-     *
-     * @param <T> the type of HasMetadata objects
-     * @return a collector that produces a collection of deduplicated Kubernetes objects
-     */
-    public static <T extends HasMetadata> Collector<T, ?, Collection<T>> latestDistinct() {
-        return Collectors.collectingAndThen(latestDistinctToMap(), Map::values);
-    }
-
-    /**
-     * Returns a collector that deduplicates Kubernetes objects by keeping only the one with the
-     * latest metadata.resourceVersion for each unique name and namespace combination. The intended
-     * use case is for the rather rare setup when there are overlapping {@link
-     * io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource}s for a
-     * resource type.
-     *
-     * @param <T> the type of HasMetadata objects
-     * @return a collector that produces a List of deduplicated Kubernetes objects
-     */
-    public static <T extends HasMetadata> Collector<T, ?, List<T>> latestDistinctList() {
-        return Collectors.collectingAndThen(
-                latestDistinctToMap(), map -> new ArrayList<>(map.values()));
-    }
+  /**
+   * Returns a collector that deduplicates Kubernetes objects by keeping only the one with the
+   * latest metadata.resourceVersion for each unique name and namespace combination. The intended
+   * use case is for the rather rare setup when there are overlapping {@link
+   * io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource}s for a
+   * resource type.
+   *
+   * @param <T> the type of HasMetadata objects
+   * @return a collector that produces a collection of deduplicated Kubernetes objects
+   */
+  public static <T extends HasMetadata> Collector<T, ?, Collection<T>> latestDistinct() {
+    return Collectors.collectingAndThen(latestDistinctToMap(), Map::values);
+  }
 
-    /**
-     * Returns a collector that deduplicates Kubernetes objects by keeping only the one with the
-     * latest metadata.resourceVersion for each unique name and namespace combination. The intended
-     * use case is for the rather rare setup when there are overlapping {@link
-     * io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource}s for a
-     * resource type.
-     *
-     * @param <T> the type of HasMetadata objects
-     * @return a collector that produces a Set of deduplicated Kubernetes objects
-     */
-    public static <T extends HasMetadata> Collector<T, ?, Set<T>> latestDistinctSet() {
-        return Collectors.collectingAndThen(latestDistinctToMap(), map -> new HashSet<>(map.values()));
-    }
+  /**
+   * Returns a collector that deduplicates Kubernetes objects by keeping only the one with the
+   * latest metadata.resourceVersion for each unique name and namespace combination. The intended
+   * use case is for the rather rare setup when there are overlapping {@link
+   * io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource}s for a
+   * resource type.
+   *
+   * @param <T> the type of HasMetadata objects
+   * @return a collector that produces a List of deduplicated Kubernetes objects
+   */
+  public static <T extends HasMetadata> Collector<T, ?, List<T>> latestDistinctList() {
+    return Collectors.collectingAndThen(
+        latestDistinctToMap(), map -> new ArrayList<>(map.values()));
+  }
 
-    private static <T extends HasMetadata> Collector<T, ?, Map<ResourceID, T>> latestDistinctToMap() {
-        return Collectors.toMap(
-                resource ->
-                        new ResourceID(resource.getMetadata().getName(), resource.getMetadata().getNamespace()),
-                resource -> resource,
-                (existing, replacement) ->
-                        compareResourceVersions(existing, replacement) >= 0 ? existing : replacement);
-    }
+  /**
+   * Returns a collector that deduplicates Kubernetes objects by keeping only the one with the
+   * latest metadata.resourceVersion for each unique name and namespace combination. The intended
+   * use case is for the rather rare setup when there are overlapping {@link
+   * io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource}s for a
+   * resource type.
+   *
+   * @param <T> the type of HasMetadata objects
+   * @return a collector that produces a Set of deduplicated Kubernetes objects
+   */
+  public static <T extends HasMetadata> Collector<T, ?, Set<T>> latestDistinctSet() {
+    return Collectors.collectingAndThen(latestDistinctToMap(), map -> new HashSet<>(map.values()));
+  }
 
+  private static <T extends HasMetadata> Collector<T, ?, Map<ResourceID, T>> latestDistinctToMap() {
+    return Collectors.toMap(
+        resource ->
+            new ResourceID(resource.getMetadata().getName(), resource.getMetadata().getNamespace()),
+        resource -> resource,
+        (existing, replacement) ->
+            compareResourceVersions(existing, replacement) >= 0 ? existing : replacement);
+  }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/ReconcileUtilsTest.java

@@ -25,6 +25,10 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -588,5 +592,4 @@ void latestDistinctSetHandlesEmptyStream() {
 
     assertThat(result).isEmpty();
   }
-
 }