wip

Author: csviri

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

@@ -21,9 +21,9 @@
  * io.javaoperatorsdk.operator.api.reconciler.Context#getSecondaryResources(Class)}`. But also for
  * {@link ResourceIDMapper} for event sources in external resources.
  *
- * @param <T>
+ * @param <ID>
  */
-public interface ResourceIDProvider<T> {
+public interface ResourceIDProvider<ID> {
 
-  T resourceId();
+  ID resourceId();
 }

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

@@ -0,0 +1,24 @@
+/*
+ * 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 io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
+import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
+
+public interface CRUDExternalBulkDependentResource<
+        R extends ResourceIDProvider<ID>, P extends HasMetadata, ID>
+    extends ExternalBulkDependentResource<R, P, ID>, Creator<R, P>, BulkUpdater<R, P>, Deleter<P> {}

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

@@ -0,0 +1,57 @@
+/*
+ * 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;
+import io.javaoperatorsdk.operator.processing.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()));
+  }
+
+  /**
+   * 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;
+  }
+}

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

@@ -19,7 +19,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 import io.javaoperatorsdk.operator.dependent.bulkdependent.BulkDependentTestCustomResource;
 
-@Workflow(dependents = @Dependent(type = ExternalBulkDependentResource.class))
+@Workflow(dependents = @Dependent(type = SampleExternalBulkDependentResource.class))
 @ControllerConfiguration()
 public class ExternalBulkResourceReconciler implements Reconciler<BulkDependentTestCustomResource> {
 

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

@@ -19,29 +19,24 @@
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
+import java.util.function.Predicate;
 
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
 import io.javaoperatorsdk.operator.dependent.bulkdependent.BulkDependentTestCustomResource;
-import io.javaoperatorsdk.operator.processing.dependent.BulkDependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.BulkUpdater;
-import io.javaoperatorsdk.operator.processing.dependent.Creator;
+import io.javaoperatorsdk.operator.processing.dependent.CRUDExternalBulkDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.external.PollingDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public class ExternalBulkDependentResource
+public class SampleExternalBulkDependentResource
     extends PollingDependentResource<ExternalResource, BulkDependentTestCustomResource, String>
-    implements BulkDependentResource<ExternalResource, BulkDependentTestCustomResource, String>,
-        Creator<ExternalResource, BulkDependentTestCustomResource>,
-        Deleter<BulkDependentTestCustomResource>,
-        BulkUpdater<ExternalResource, BulkDependentTestCustomResource> {
+    implements CRUDExternalBulkDependentResource<
+        ExternalResource, BulkDependentTestCustomResource, String> {
 
   public static final String EXTERNAL_RESOURCE_NAME_DELIMITER = "#";
 
   private final ExternalServiceMock externalServiceMock = ExternalServiceMock.getInstance();
 
-  public ExternalBulkDependentResource() {
+  public SampleExternalBulkDependentResource() {
     super(ExternalResource.class, ExternalResource::getId);
   }
 
@@ -104,19 +99,15 @@ public Map<String, ExternalResource> desiredResources(
   }
 
   @Override
-  public Map<String, ExternalResource> getSecondaryResources(
+  public Predicate<ExternalResource> secondaryResourceFilter(
       BulkDependentTestCustomResource primary, Context<BulkDependentTestCustomResource> context) {
-    return context
-        .getSecondaryResourcesAsStream(resourceType())
-        .filter(
-            r ->
-                r.getId()
-                    .startsWith(
-                        primary.getMetadata().getName()
-                            + EXTERNAL_RESOURCE_NAME_DELIMITER
-                            + primary.getMetadata().getNamespace()
-                            + EXTERNAL_RESOURCE_NAME_DELIMITER))
-        .collect(Collectors.toMap(r -> getResourceIDMapper().idFor(r), r -> r));
+    return r ->
+        r.getId()
+            .startsWith(
+                primary.getMetadata().getName()
+                    + EXTERNAL_RESOURCE_NAME_DELIMITER
+                    + primary.getMetadata().getNamespace()
+                    + EXTERNAL_RESOURCE_NAME_DELIMITER);
   }
 
   @Override