refactor: clean up

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java

@@ -2,7 +2,6 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
-@SuppressWarnings("rawtypes")
 public class UpdateControl<T extends HasMetadata> extends BaseControl<UpdateControl<T>> {
 
   private final T resource;
@@ -32,8 +31,7 @@ public static <T extends HasMetadata> UpdateControl<T> updateResource(T customRe
     return new UpdateControl<>(customResource, false, true);
   }
 
-  public static <T extends HasMetadata> UpdateControl<T> updateStatus(
-      T customResource) {
+  public static <T extends HasMetadata> UpdateControl<T> updateStatus(T customResource) {
     return new UpdateControl<>(customResource, true, false);
   }
 

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java

@@ -5,9 +5,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.fabric8.kubernetes.api.model.Service;
-import io.fabric8.kubernetes.api.model.apps.Deployment;
+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.ControllerConfiguration;
@@ -37,56 +35,50 @@ public class WebPageStandaloneDependentsReconciler
   private static final Logger log =
       LoggerFactory.getLogger(WebPageStandaloneDependentsReconciler.class);
 
-  private KubernetesDependentResource<ConfigMap, WebPage> configMapDR;
-  private KubernetesDependentResource<Deployment, WebPage> deploymentDR;
-  private KubernetesDependentResource<Service, WebPage> serviceDR;
+  private final Map<String, KubernetesDependentResource<?, WebPage>> dependentResources;
 
   public WebPageStandaloneDependentsReconciler(KubernetesClient kubernetesClient) {
-    createDependentResources(kubernetesClient);
+    dependentResources = Map.of(
+        "configmap", new ConfigMapDependentResource(),
+        "deployment", new DeploymentDependentResource(),
+        "service", new ServiceDependentResource());
+    final var config = new KubernetesDependentResourceConfig()
+        .setLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR);
+    dependentResources.values().forEach(dr -> {
+      dr.setKubernetesClient(kubernetesClient);
+      dr.configureWith(config);
+    });
   }
 
   @Override
-  public Map<String, EventSource> prepareEventSources(EventSourceContext<WebPage> context) {
-    return Map.of(
-        "configmap", configMapDR.initEventSource(context),
-        "deployment", deploymentDR.initEventSource(context),
-        "service", serviceDR.initEventSource(context));
+  public Map<String, ? extends EventSource> prepareEventSources(
+      EventSourceContext<WebPage> context) {
+    dependentResources.values().forEach(dr -> dr.initEventSource(context));
+    return dependentResources;
   }
 
   @Override
   public UpdateControl<WebPage> reconcile(WebPage webPage, Context<WebPage> context)
       throws Exception {
     simulateErrorIfRequested(webPage);
 
-    configMapDR.reconcile(webPage, context);
-    deploymentDR.reconcile(webPage, context);
-    serviceDR.reconcile(webPage, context);
+    dependentResources.values().forEach(dr -> dr.reconcile(webPage, context));
 
-    webPage.setStatus(
-        createStatus(configMapDR.getResource(webPage).orElseThrow().getMetadata().getName()));
+    webPage.setStatus(createStatus(getConfigMapName(webPage)));
     return UpdateControl.updateStatus(webPage);
   }
 
+  private String getConfigMapName(WebPage webPage) {
+    return dependent("configmap").getResource(webPage).orElseThrow().getMetadata().getName();
+  }
+
   @Override
   public ErrorStatusUpdateControl<WebPage> updateErrorStatus(
       WebPage resource, Context<WebPage> retryInfo, Exception e) {
     return handleError(resource, e);
   }
 
-  private void createDependentResources(KubernetesClient client) {
-    this.configMapDR = new ConfigMapDependentResource();
-    this.configMapDR.setKubernetesClient(client);
-    configMapDR.configureWith(new KubernetesDependentResourceConfig()
-        .setLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR));
-
-    this.deploymentDR = new DeploymentDependentResource();
-    deploymentDR.setKubernetesClient(client);
-    deploymentDR.configureWith(new KubernetesDependentResourceConfig()
-        .setLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR));
-
-    this.serviceDR = new ServiceDependentResource();
-    serviceDR.setKubernetesClient(client);
-    serviceDR.configureWith(new KubernetesDependentResourceConfig()
-        .setLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR));
+  private KubernetesDependentResource<? extends HasMetadata, WebPage> dependent(String name) {
+    return dependentResources.get(name);
   }
 }