refactor: more unneeded client recording removal

Signed-off-by: Chris Laprun <[email protected]>

Author: metacosm

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

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.operator.processing.dependent;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationCacheFiller;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
@@ -13,12 +12,11 @@ public abstract class AbstractExternalDependentResource<R, P extends HasMetadata
     extends AbstractEventSourceHolderDependentResource<R, P, T> {
 
   private final boolean isDependentResourceWithExplicitState =
-      this instanceof DependentResourceWithExplicitState;
+          this instanceof DependentResourceWithExplicitState;
   private final boolean isBulkDependentResource = this instanceof BulkDependentResource;
   @SuppressWarnings("rawtypes")
   private DependentResourceWithExplicitState dependentResourceWithExplicitState;
   private InformerEventSource<?, P> externalStateEventSource;
-  private KubernetesClient kubernetesClient;
 
   @SuppressWarnings("unchecked")
   protected AbstractExternalDependentResource(Class<R> resourceType) {
@@ -34,10 +32,10 @@ public void resolveEventSource(EventSourceRetriever<P> eventSourceRetriever) {
     super.resolveEventSource(eventSourceRetriever);
     if (isDependentResourceWithExplicitState) {
       final var eventSourceName = (String) dependentResourceWithExplicitState
-          .eventSourceName().orElse(null);
+              .eventSourceName().orElse(null);
       externalStateEventSource = (InformerEventSource<?, P>) eventSourceRetriever
-          .getResourceEventSourceFor(dependentResourceWithExplicitState.stateResourceClass(),
-              eventSourceName);
+              .getResourceEventSourceFor(dependentResourceWithExplicitState.stateResourceClass(),
+                      eventSourceName);
     }
 
   }
@@ -74,43 +72,29 @@ protected void handleExplicitStateCreation(P primary, R created, Context<P> cont
     var stateResource = context.getClient().resource(resource).create();
     if (externalStateEventSource != null) {
       ((RecentOperationCacheFiller) externalStateEventSource)
-          .handleRecentResourceCreate(ResourceID.fromResource(primary), stateResource);
+              .handleRecentResourceCreate(ResourceID.fromResource(primary), stateResource);
     }
   }
 
 
   @SuppressWarnings("unchecked")
   public void deleteTargetResource(P primary, R resource, String key,
-      Context<P> context) {
+                                   Context<P> context) {
     if (isDependentResourceWithExplicitState) {
-      getKubernetesClient()
-          .resource(dependentResourceWithExplicitState.stateResource(primary, resource))
-          .delete();
+      context.getClient()
+              .resource(dependentResourceWithExplicitState.stateResource(primary, resource))
+              .delete();
     }
     handleDeleteTargetResource(primary, resource, key, context);
   }
 
   public void handleDeleteTargetResource(P primary, R resource, String key,
-      Context<P> context) {
+                                         Context<P> context) {
     throw new IllegalStateException("Override this method in case you manage an bulk resource");
   }
 
   @SuppressWarnings("rawtypes")
   protected InformerEventSource getExternalStateEventSource() {
     return externalStateEventSource;
   }
-
-  /**
-   * It's here just to manage the explicit state resource in case the dependent resource implements
-   * {@link RecentOperationCacheFiller}.
-   *
-   * @return kubernetes client.
-   */
-  public KubernetesClient getKubernetesClient() {
-    return kubernetesClient;
-  }
-
-  public void setKubernetesClient(KubernetesClient kubernetesClient) {
-    this.kubernetesClient = kubernetesClient;
-  }
 }

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

@@ -55,7 +55,7 @@ public ConfigMap desired(BulkDependentTestCustomResource primary, String key,
         .withLabels(Map.of(LABEL_KEY, LABEL_VALUE))
         .build());
     configMap.setData(
-        Map.of("number", "" + key, ADDITIONAL_DATA_KEY, primary.getSpec().getAdditionalData()));
+        Map.of("number", key, ADDITIONAL_DATA_KEY, primary.getSpec().getAdditionalData()));
     return configMap;
   }