wip

Author: csviri

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

@@ -146,7 +146,7 @@ protected Optional<R> selectTargetSecondaryResource(
     return targetResources.isEmpty() ? Optional.empty() : Optional.of(targetResources.get(0));
   }
 
-  public ResourceIDMapper<R, ID> getResourceIDMapper() {
+  public ResourceIDMapper<R, ID> resourceIDMapper() {
     return resourceIDMapper;
   }
 

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

@@ -15,43 +15,19 @@
  */
 package io.javaoperatorsdk.operator.processing.dependent;
 
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
 
+/**
+ * Specialized interface for bulk dependent resources where resource implement {@link
+ * ResourceIDProvider}.
+ */
 public interface ExternalBulkDependentResource<
         R extends ResourceIDProvider<ID>, P extends HasMetadata, ID>
-    extends BulkDependentResource<R, P, ID>, DependentResource<R, P> {
-
-  /**
-   * Since we can list all the related resources and by assuming the resource extends {{@link
-   * ResourceIDProvider}} it is trivial to create the target map. The only issue is if there are
-   * other secondary resources of the target type which are not managed by this bulk dependent
-   * resources, for those it is enough to override secondaryResourceFilter method.
-   */
-  @Override
-  default Map<ID, R> getSecondaryResources(P primary, Context<P> context) {
-    return context
-        .getSecondaryResourcesAsStream(resourceType())
-        .filter(secondaryResourceFilter(primary, context))
-        .collect(
-            Collectors.toMap(
-                cm -> ResourceIDMapper.<R, ID>resourceIdProviderMapper().idFor(cm),
-                Function.identity()));
-  }
+    extends ResourceIDMapperBulkDependentResource<R, P, ID> {
 
-  /**
-   * Override if not all the secondary resources of target type are managed by the bulk dependent
-   * resource.
-   */
-  default Predicate<R> secondaryResourceFilter(P primary, Context<P> context) {
-    return r -> true;
+  default ResourceIDMapper<R, ID> resourceIDMapper() {
+    return ResourceIDMapper.resourceIdProviderMapper();
   }
 }

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

@@ -15,14 +15,7 @@
  */
 package io.javaoperatorsdk.operator.processing.dependent;
 
-import java.util.Map;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
@@ -33,30 +26,10 @@
  * BulkDependentResource}.
  */
 public interface KubernetesBulkDependentResource<R extends HasMetadata, P extends HasMetadata>
-    extends BulkDependentResource<R, P, ResourceID>, DependentResource<R, P> {
+    extends ResourceIDMapperBulkDependentResource<R, P, ResourceID> {
 
-  /**
-   * Since we can list all the related resources and by assuming the ID is type of {@link
-   * ResourceID} it is trivial to create the target map. The only issue is if there are other
-   * secondary resources of the target type which are not managed by this bulk dependent resources,
-   * for those it is enough to override secondaryResourceFilter method.
-   */
   @Override
-  default Map<ResourceID, R> getSecondaryResources(P primary, Context<P> context) {
-    return context
-        .getSecondaryResourcesAsStream(resourceType())
-        .filter(secondaryResourceFilter(primary, context))
-        .collect(
-            Collectors.toMap(
-                cm -> ResourceIDMapper.kubernetesResourceIdMapper().idFor(cm),
-                Function.identity()));
-  }
-
-  /**
-   * Override if not all the secondary resources of target type are managed by the bulk dependent
-   * resource.
-   */
-  default Predicate<R> secondaryResourceFilter(P primary, Context<P> context) {
-    return r -> true;
+  default ResourceIDMapper<R, ResourceID> resourceIDMapper() {
+    return ResourceIDMapper.kubernetesResourceIdMapper();
   }
 }

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

@@ -0,0 +1,44 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.processing.dependent;
+
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
+
+public interface ResourceIDMapperBulkDependentResource<R, P extends HasMetadata, ID>
+    extends BulkDependentResource<R, P, ID>, DependentResource<R, P> {
+
+  ResourceIDMapper<R, ID> resourceIDMapper();
+
+  @Override
+  default Map<ID, R> getSecondaryResources(P primary, Context<P> context) {
+    return context
+        .getSecondaryResourcesAsStream(resourceType())
+        .filter(secondaryResourceFilter(primary, context))
+        .collect(Collectors.toMap(cm -> resourceIDMapper().idFor(cm), Function.identity()));
+  }
+
+  default Predicate<R> secondaryResourceFilter(P primary, Context<P> context) {
+    return r -> true;
+  }
+}

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

@@ -47,7 +47,7 @@ protected ExternalResourceCachingEventSource<R, P, ID> createEventSource(
         resourceType(),
         context,
         new PerResourcePollingConfigurationBuilder<R, P, ID>(this, getPollingPeriod())
-            .withResourceIDMapper(getResourceIDMapper())
+            .withResourceIDMapper(resourceIDMapper())
             .withName(name())
             .build());
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/SampleExternalBulkDependentResource.java

@@ -93,7 +93,7 @@ public Map<String, ExternalResource> desiredResources(
       var resource =
           new ExternalResource(
               toExternalResourceId(primary, key), primary.getSpec().getAdditionalData());
-      res.put(getResourceIDMapper().idFor(resource), resource);
+      res.put(resourceIDMapper().idFor(resource), resource);
     }
     return res;
   }