refactor: adapt after rebase

Author: metacosm

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

@@ -42,7 +42,7 @@ public ReconcileResult<R> reconcile(P primary, Context<P> context) {
     return dependentResourceReconciler.reconcile(primary, context);
   }
 
-  protected ReconcileResult<R> reconcile(P primary, R resource, Context<P> context) {
+  protected ReconcileResult<R> reconcile(P primary, R actualResource, Context<P> context) {
     if (creatable || updatable) {
       if (actualResource == null) {
         if (creatable) {
@@ -55,7 +55,7 @@ protected ReconcileResult<R> reconcile(P primary, R resource, Context<P> context
       } else {
         if (updatable) {
           final Matcher.Result<R> match;
-          match = match(resource, primary, context);
+          match = match(actualResource, primary, context);
           if (!match.matched()) {
             final var desired =
                 match.computedDesired().orElse(desired(primary, context));

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

@@ -46,14 +46,15 @@ public interface BulkDependentResource<R, P extends HasMetadata>
    * {@link Context}.
    *
    * @param actualResource the resource we want to determine whether it's matching the desired state
+   * @param desired the resource's desired state
    * @param primary the primary resource from which the desired state is inferred
-   * @param key key of the resource
    * @param context the context in which the resource is being matched
    * @return a {@link Result} encapsulating whether the resource matched its desired state and this
    *         associated state if it was computed as part of the matching process. Use the static
    *         convenience methods ({@link Result#nonComputed(boolean)} and
    *         {@link Result#computed(boolean, Object)})
    */
-  Result<R> match(R actualResource, R desired, P primary, String key, Context<P> context);
-
+  default Result<R> match(R actualResource, R desired, P primary, Context<P> context) {
+    return Matcher.Result.computed(desired.equals(actualResource), desired);
+  }
 }

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

@@ -23,15 +23,15 @@ class BulkDependentResourceReconciler<R, P extends HasMetadata>
 
   @Override
   public ReconcileResult<R> reconcile(P primary, Context<P> context) {
-    final var targetKeys = bulkDependentResource.desiredResourceKeys(primary, context);
+    final var desiredResources = bulkDependentResource.desiredResources(primary, context);
     Map<String, R> actualResources =
         bulkDependentResource.getSecondaryResources(primary, context);
 
-    deleteBulkResourcesIfRequired(targetKeys, actualResources, primary, context);
+    deleteBulkResourcesIfRequired(desiredResources.keySet(), actualResources, primary, context);
 
-    final List<ReconcileResult<R>> results = new ArrayList<>(targetKeys.size());
+    final List<ReconcileResult<R>> results = new ArrayList<>(desiredResources.size());
     actualResources.forEach((key, value) -> {
-      final var instance = new BulkDependentResourceInstance<>(key, bulkDependentResource);
+      final var instance = new BulkDependentResourceInstance<>(bulkDependentResource, value);
       results.add(instance.reconcile(primary, value, context));
     });
 
@@ -55,13 +55,13 @@ protected void deleteBulkResourcesIfRequired(Set<String> expectedKeys,
 
   private static class BulkDependentResourceInstance<R, P extends HasMetadata>
       extends AbstractDependentResource<R, P> {
-    private final String key;
     private final BulkDependentResource<R, P> bulkDependentResource;
+    private final R desired;
 
-    private BulkDependentResourceInstance(String key,
-        BulkDependentResource<R, P> bulkDependentResource) {
-      this.key = key;
+    private BulkDependentResourceInstance(BulkDependentResource<R, P> bulkDependentResource,
+        R desired) {
       this.bulkDependentResource = bulkDependentResource;
+      this.desired = desired;
     }
 
     @SuppressWarnings("unchecked")
@@ -71,12 +71,12 @@ private AbstractDependentResource<R, P> asAbstractDependentResource() {
 
     @Override
     protected R desired(P primary, Context<P> context) {
-      return bulkDependentResource.desired(primary, key, context);
+      return desired;
     }
 
     @Override
     public Result<R> match(R resource, P primary, Context<P> context) {
-      return bulkDependentResource.match(resource, primary, key, context);
+      return bulkDependentResource.match(resource, desired, primary, context);
     }
 
     @Override

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

@@ -139,7 +139,8 @@ public Result<R> match(R actualResource, P primary, Context<P> context) {
     return matcher.match(actualResource, primary, context);
   }
 
-  public Result<R> match(R actualResource, R desired, P primary, String key, Context<P> context) {
+  @SuppressWarnings("unused")
+  public Result<R> match(R actualResource, R desired, P primary, Context<P> context) {
     return GenericKubernetesResourceMatcher.match(desired, actualResource, false);
   }
 

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

@@ -6,7 +6,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.processing.dependent.BulkDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.BulkUpdater;
-import io.javaoperatorsdk.operator.processing.dependent.Matcher;
 import io.javaoperatorsdk.operator.processing.dependent.external.PollingDependentResource;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.sample.bulkdependent.BulkDependentTestCustomResource;
@@ -92,12 +91,4 @@ public void deleteBulkResource(BulkDependentTestCustomResource primary, External
       Context<BulkDependentTestCustomResource> context) {
     externalServiceMock.delete(resource.getId());
   }
-
-  @Override
-  public Matcher.Result<ExternalResource> match(ExternalResource actualResource,
-      ExternalResource desired,
-      BulkDependentTestCustomResource primary, String index,
-      Context<BulkDependentTestCustomResource> context) {
-    return Matcher.Result.computed(desired.equals(actualResource), desired);
-  }
 }