refactor: simplify by removing discriminator factory

Author: metacosm

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

@@ -28,7 +28,7 @@ public abstract class AbstractDependentResource<R, P extends HasMetadata>
   protected Updater<R, P> updater;
   protected BulkDependentResource<R, P> bulkDependentResource;
 
-  protected List<ResourceDiscriminator<R, P>> resourceDiscriminator = new ArrayList<>(1);
+  private final List<ResourceDiscriminator<R, P>> resourceDiscriminator = new ArrayList<>(1);
 
   @SuppressWarnings("unchecked")
   public AbstractDependentResource() {
@@ -74,8 +74,7 @@ private void adjustDiscriminators(int count) {
     }
     if (resourceDiscriminator.size() < count) {
       for (int i = resourceDiscriminator.size(); i < count; i++) {
-        resourceDiscriminator.add(bulkDependentResource.bulkResourceDiscriminatorFactory()
-            .createResourceDiscriminator(i));
+        resourceDiscriminator.add(bulkDependentResource.getResourceDiscriminator(i));
       }
     }
     if (resourceDiscriminator.size() > count) {

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

@@ -2,6 +2,7 @@
 
 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;
 
 /**
@@ -29,10 +30,6 @@ public interface BulkDependentResource<R, P extends HasMetadata> extends Creator
    */
   void deleteBulkResourceWithIndex(P primary, R resource, int i, Context<P> context);
 
-  /**
-   * @return a discriminator factor that helps to create a discriminator for a certain resource with
-   *         an index
-   */
-  BulkResourceDiscriminatorFactory<R, P> bulkResourceDiscriminatorFactory();
+  ResourceDiscriminator<R, P> getResourceDiscriminator(int index);
 
 }

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

@@ -7,12 +7,11 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 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.processing.dependent.BulkDependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.BulkResourceDiscriminatorFactory;
 import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Updater;
-import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 
 /**
@@ -29,19 +28,6 @@ public class ConfigMapDeleterBulkDependentResource
   public static final String LABEL_KEY = "bulk";
   public static final String LABEL_VALUE = "true";
   public static final String ADDITIONAL_DATA_KEY = "additionalData";
-  private BulkResourceDiscriminatorFactory<ConfigMap, BulkDependentTestCustomResource> factory =
-      index -> (resource, primary, context) -> {
-        var resources = context.getSecondaryResources(resource).stream()
-            .filter(r -> r.getMetadata().getName().endsWith("-" + index))
-            .collect(Collectors.toList());
-        if (resources.isEmpty()) {
-          return Optional.empty();
-        } else if (resources.size() > 1) {
-          throw new IllegalStateException("More than one resource found for index:" + index);
-        } else {
-          return Optional.of(resources.get(0));
-        }
-      };
 
   public ConfigMapDeleterBulkDependentResource() {
     super(ConfigMap.class);
@@ -68,7 +54,19 @@ public int count(BulkDependentTestCustomResource primary,
   }
 
   @Override
-  public BulkResourceDiscriminatorFactory<ConfigMap, BulkDependentTestCustomResource> bulkResourceDiscriminatorFactory() {
-    return factory;
+  public ResourceDiscriminator<ConfigMap, BulkDependentTestCustomResource> getResourceDiscriminator(
+      int index) {
+    return (resource, primary, context) -> {
+      var resources = context.getSecondaryResources(resource).stream()
+          .filter(r -> r.getMetadata().getName().endsWith("-" + index))
+          .collect(Collectors.toList());
+      if (resources.isEmpty()) {
+        return Optional.empty();
+      } else if (resources.size() > 1) {
+        throw new IllegalStateException("More than one resource found for index:" + index);
+      } else {
+        return Optional.of(resources.get(0));
+      }
+    };
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ConfigMapDeleterBulkDependentResource.java

@@ -4,6 +4,7 @@
 import java.util.stream.Collectors;
 
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
 import io.javaoperatorsdk.operator.processing.dependent.*;
 import io.javaoperatorsdk.operator.processing.dependent.external.PollingDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -16,7 +17,7 @@ public class ExternalBulkDependentResource
 
   public static final String EXTERNAL_RESOURCE_NAME_DELIMITER = "#";
 
-  private ExternalServiceMock externalServiceMock = ExternalServiceMock.getInstance();
+  private final ExternalServiceMock externalServiceMock = ExternalServiceMock.getInstance();
 
   public ExternalBulkDependentResource() {
     super(ExternalResource.class, ExternalResource::getId);
@@ -26,7 +27,7 @@ public ExternalBulkDependentResource() {
   public Map<ResourceID, Set<ExternalResource>> fetchResources() {
     Map<ResourceID, Set<ExternalResource>> result = new HashMap<>();
     var resources = externalServiceMock.listResources();
-    resources.stream().forEach(er -> {
+    resources.forEach(er -> {
       var resourceID = toResourceID(er);
       result.putIfAbsent(resourceID, new HashSet<>());
       result.get(resourceID).add(er);
@@ -52,15 +53,6 @@ public void deleteBulkResourceWithIndex(BulkDependentTestCustomResource primary,
     externalServiceMock.delete(resource.getId());
   }
 
-  @Override
-  public BulkResourceDiscriminatorFactory<ExternalResource, BulkDependentTestCustomResource> bulkResourceDiscriminatorFactory() {
-    return index -> (resource, primary, context) -> {
-      return context.getSecondaryResources(resource).stream()
-          .filter(r -> r.getId().endsWith(EXTERNAL_RESOURCE_NAME_DELIMITER + index))
-          .collect(Collectors.toList()).stream().findFirst();
-    };
-  }
-
   @Override
   public ExternalResource desired(BulkDependentTestCustomResource primary, int index,
       Context<BulkDependentTestCustomResource> context) {
@@ -98,4 +90,12 @@ private ResourceID toResourceID(ExternalResource externalResource) {
     var parts = externalResource.getId().split(EXTERNAL_RESOURCE_NAME_DELIMITER);
     return new ResourceID(parts[0], parts[1]);
   }
+
+  @Override
+  public ResourceDiscriminator<ExternalResource, BulkDependentTestCustomResource> getResourceDiscriminator(
+      int index) {
+    return (resource, primary, context) -> context.getSecondaryResources(resource).stream()
+        .filter(r -> r.getId().endsWith(EXTERNAL_RESOURCE_NAME_DELIMITER + index))
+        .collect(Collectors.toList()).stream().findFirst();
+  }
 }