feat: add resource type to DependentResourceSpec

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AnnotationControllerConfiguration.java

@@ -2,6 +2,7 @@
 
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -26,7 +27,7 @@ public class AnnotationControllerConfiguration<R extends HasMetadata>
 
   protected final Reconciler<R> reconciler;
   private final ControllerConfiguration annotation;
-  private List<DependentResourceSpec<?, ?>> specs;
+  private List<DependentResourceSpec<?, ?, ?>> specs;
 
   public AnnotationControllerConfiguration(Reconciler<R> reconciler) {
     this.reconciler = reconciler;
@@ -135,7 +136,7 @@ public static <T> T valueOrDefault(
 
   @SuppressWarnings({"rawtypes", "unchecked"})
   @Override
-  public List<DependentResourceSpec<?, ?>> getDependentResources() {
+  public List<DependentResourceSpec<?, ?, ?>> getDependentResources() {
     if (specs == null) {
       final var dependents =
           valueOrDefault(annotation, ControllerConfiguration::dependents, new Dependent[] {});
@@ -147,6 +148,11 @@ public static <T> T valueOrDefault(
       specs = new ArrayList<>(dependents.length);
       for (Dependent dependent : dependents) {
         final Class<? extends DependentResource> dependentType = dependent.type();
+        final Class<?> resourceType =
+            Arrays.asList(dependentType.getInterfaces()).contains(DependentResource.class)
+                ? Utils.getFirstTypeArgumentFromInterface(dependentType)
+                : Utils.getFirstTypeArgumentFromExtendedClass(dependentType);
+
         if (KubernetesDependentResource.class.isAssignableFrom(dependentType)) {
           final var kubeDependent = dependentType.getAnnotation(KubernetesDependent.class);
           final var namespaces =
@@ -164,7 +170,7 @@ public static <T> T valueOrDefault(
           config =
               new KubernetesDependentResourceConfig(addOwnerReference, namespaces, labelSelector);
         }
-        specs.add(new DependentResourceSpec(dependentType, config));
+        specs.add(new DependentResourceSpec(dependentType, resourceType, config));
       }
     }
     return specs;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

@@ -131,7 +131,7 @@ default ObjectMapper getObjectMapper() {
     return OBJECT_MAPPER;
   }
 
-  default <T extends DependentResource<?, ?>> T createFrom(DependentResourceSpec<T, ?> spec) {
+  default <T extends DependentResource<?, ?>> T createFrom(DependentResourceSpec<T, ?, ?> spec) {
     try {
       return spec.getDependentResourceClass().getConstructor().newInstance();
     } catch (InstantiationException | NoSuchMethodException | IllegalAccessException

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

@@ -51,7 +51,7 @@ default ResourceEventFilter<R> getEventFilter() {
     return ResourceEventFilters.passthrough();
   }
 
-  default List<DependentResourceSpec<?, ?>> getDependentResources() {
+  default List<DependentResourceSpec<?, ?, ?>> getDependentResources() {
     return Collections.emptyList();
   }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java

@@ -22,7 +22,7 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
   private ResourceEventFilter<R> customResourcePredicate;
   private final ControllerConfiguration<R> original;
   private Duration reconciliationMaxInterval;
-  private final List<DependentResourceSpec<?, ?>> dependentResourceSpecs;
+  private final List<DependentResourceSpec<?, ?, ?>> dependentResourceSpecs;
 
   private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
     finalizer = original.getFinalizer();
@@ -91,6 +91,7 @@ public ControllerConfigurationOverrider<R> withReconciliationMaxInterval(
 
   public void replaceDependentResourceConfig(
       Class<? extends DependentResource<?, R>> dependentResourceClass,
+      Class<?> resourceType,
       Object dependentResourceConfig) {
 
     var currentConfig =
@@ -101,7 +102,8 @@ public void replaceDependentResourceConfig(
     }
     dependentResourceSpecs.remove(currentConfig.get());
     dependentResourceSpecs
-        .add(new DependentResourceSpec(dependentResourceClass, dependentResourceConfig));
+        .add(new DependentResourceSpec(dependentResourceClass, resourceType,
+            dependentResourceConfig));
   }
 
   public void addNewDependentResourceConfig(DependentResourceSpec dependentResourceSpec) {
@@ -115,7 +117,7 @@ public void addNewDependentResourceConfig(DependentResourceSpec dependentResourc
     dependentResourceSpecs.add(dependentResourceSpec);
   }
 
-  private Optional<DependentResourceSpec<?, ?>> findConfigForDependentResourceClass(
+  private Optional<DependentResourceSpec<?, ?, ?>> findConfigForDependentResourceClass(
       Class<? extends DependentResource> dependentResourceClass) {
     return dependentResourceSpecs.stream()
         .filter(dc -> dc.getDependentResourceClass().equals(dependentResourceClass))

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultControllerConfiguration.java

@@ -10,7 +10,6 @@
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
 
-@SuppressWarnings("rawtypes")
 public class DefaultControllerConfiguration<R extends HasMetadata>
     extends DefaultResourceConfiguration<R>
     implements ControllerConfiguration<R> {
@@ -22,7 +21,7 @@ public class DefaultControllerConfiguration<R extends HasMetadata>
   private final boolean generationAware;
   private final RetryConfiguration retryConfiguration;
   private final ResourceEventFilter<R> resourceEventFilter;
-  private final List<DependentResourceSpec<?, ?>> dependents;
+  private final List<DependentResourceSpec<?, ?, ?>> dependents;
   private final Duration reconciliationMaxInterval;
 
   // NOSONAR constructor is meant to provide all information
@@ -38,7 +37,7 @@ public DefaultControllerConfiguration(
       ResourceEventFilter<R> resourceEventFilter,
       Class<R> resourceClass,
       Duration reconciliationMaxInterval,
-      List<DependentResourceSpec<?, ?>> dependents) {
+      List<DependentResourceSpec<?, ?, ?>> dependents) {
     super(labelSelector, resourceClass, namespaces);
     this.associatedControllerClassName = associatedControllerClassName;
     this.name = name;
@@ -91,7 +90,7 @@ public ResourceEventFilter<R> getEventFilter() {
   }
 
   @Override
-  public List<DependentResourceSpec<?, ?>> getDependentResources() {
+  public List<DependentResourceSpec<?, ?, ?>> getDependentResources() {
     return dependents;
   }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceSpec.java

@@ -4,15 +4,19 @@
 
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 
-public class DependentResourceSpec<T extends DependentResource<?, ?>, C> {
+public class DependentResourceSpec<T extends DependentResource<?, ?>, R, C> {
 
   private final Class<T> dependentResourceClass;
 
   private final C dependentResourceConfig;
 
-  public DependentResourceSpec(Class<T> dependentResourceClass, C dependentResourceConfig) {
+  private final Class<R> resourceType;
+
+  public DependentResourceSpec(Class<T> dependentResourceClass, Class<R> resourceType,
+      C dependentResourceConfig) {
     this.dependentResourceClass = dependentResourceClass;
     this.dependentResourceConfig = dependentResourceConfig;
+    this.resourceType = resourceType;
   }
 
   public Class<T> getDependentResourceClass() {
@@ -22,4 +26,8 @@ public Class<T> getDependentResourceClass() {
   public Optional<C> getDependentResourceConfiguration() {
     return Optional.ofNullable(dependentResourceConfig);
   }
+
+  public Class<R> getResourceType() {
+    return resourceType;
+  }
 }