refactor: remove InformerConfigSpec

Signed-off-by: Chris Laprun <claprun@redhat.com>

Author: metacosm

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

@@ -225,17 +225,24 @@ private static List<DependentResourceSpec> dependentResources(
           Utils.instantiate(dependent.reconcilePrecondition(), Condition.class, context),
           Utils.instantiate(dependent.deletePostcondition(), Condition.class, context),
           Utils.instantiate(dependent.activationCondition(), Condition.class, context),
-          eventSourceName);
+          eventSourceName, resourceTypeFor(dependentType));
 
       // extract potential configuration
-      DependentResourceConfigurationResolver.configureSpecFromConfigured(spec, controllerConfiguration,
+      DependentResourceConfigurationResolver.configureSpecFromConfigured(spec,
+          controllerConfiguration,
           dependentType);
 
       specsMap.put(dependentName, spec);
     }
     return specsMap.values().stream().toList();
   }
 
+  @SuppressWarnings({"unchecked", "rawtypes"})
+  private static <R> Class<R> resourceTypeFor(
+      Class<? extends DependentResource> dependentResourceClass) {
+    return Utils.instantiate(dependentResourceClass, DependentResource.class, null).resourceType();
+  }
+
   protected boolean createIfNeeded() {
     return true;
   }

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

@@ -11,26 +11,21 @@
 public class DependentResourceSpec<R, P extends HasMetadata, C> {
 
   private final Class<? extends DependentResource<R, P>> dependentResourceClass;
-
   private final String name;
-
   private final Set<String> dependsOn;
-
   private final Condition<?, ?> readyCondition;
-
   private final Condition<?, ?> reconcileCondition;
-
   private final Condition<?, ?> deletePostCondition;
-
   private final Condition<?, ?> activationCondition;
-
   private final String useEventSourceWithName;
+  private final Class<R> resourceClass;
   private C nullableConfiguration;
 
   public DependentResourceSpec(Class<? extends DependentResource<R, P>> dependentResourceClass,
       String name, Set<String> dependsOn, Condition<?, ?> readyCondition,
       Condition<?, ?> reconcileCondition, Condition<?, ?> deletePostCondition,
-      Condition<?, ?> activationCondition, String useEventSourceWithName) {
+      Condition<?, ?> activationCondition, String useEventSourceWithName,
+      Class<R> resourceClass) {
     this.dependentResourceClass = dependentResourceClass;
     this.name = name;
     this.dependsOn = dependsOn;
@@ -39,6 +34,7 @@ public DependentResourceSpec(Class<? extends DependentResource<R, P>> dependentR
     this.deletePostCondition = deletePostCondition;
     this.activationCondition = activationCondition;
     this.useEventSourceWithName = useEventSourceWithName;
+    this.resourceClass = resourceClass;
   }
 
   public Class<? extends DependentResource<R, P>> getDependentResourceClass() {
@@ -107,4 +103,8 @@ public Optional<C> getConfiguration() {
   protected void setNullableConfiguration(C configuration) {
     this.nullableConfiguration = configuration;
   }
+
+  public Class<R> getResourceClass() {
+    return resourceClass;
+  }
 }

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

@@ -12,8 +12,6 @@
 import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
 import io.javaoperatorsdk.operator.api.config.Utils;
 import io.javaoperatorsdk.operator.processing.GroupVersionKind;
-import io.javaoperatorsdk.operator.processing.dependent.kubernetes.GenericKubernetesDependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.kubernetes.InformerConfigSpec;
 import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
 import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
@@ -193,27 +191,6 @@ public InformerConfigurationBuilder<R> withName(String name) {
       return this;
     }
 
-    @SuppressWarnings("unchecked")
-    public InformerConfigurationBuilder<R> withConfig(InformerConfigSpec<R> spec) {
-      groupVersionKind = spec.groupVersionKind();
-      if (groupVersionKind != null
-          && !GenericKubernetesResource.class.isAssignableFrom(resourceClass)) {
-        throw new IllegalStateException("If GroupVersionKind is set, the resource type must be "
-            + GenericKubernetesDependentResource.class.getSimpleName());
-      }
-
-      return withName(spec.name())
-          .withGenericFilter(spec.genericFilter())
-          .withSecondaryToPrimaryMapper(spec.secondaryToPrimaryMapper())
-          .withPrimaryToSecondaryMapper(spec.primaryToSecondaryMapper())
-          .withLabelSelector(spec.labelSelector())
-          .withNamespaces(spec.namespaces())
-          .withOnAddFilter(spec.onAddFilter())
-          .withOnUpdateFilter(spec.onUpdateFilter())
-          .withOnDeleteFilter(spec.onDeleteFilter())
-          .followControllerNamespacesOnChange(spec.followControllerNamespacesOnChange());
-    }
-
     public <P extends HasMetadata> InformerConfigurationBuilder<R> withPrimaryToSecondaryMapper(
         PrimaryToSecondaryMapper<P> primaryToSecondaryMapper) {
       this.primaryToSecondaryMapper = primaryToSecondaryMapper;

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

@@ -5,11 +5,13 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.Utils;
 import io.javaoperatorsdk.operator.api.config.dependent.ConfigurationConverter;
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.GroupVersionKind;
@@ -43,7 +45,7 @@ public KubernetesDependentResourceConfig<R> configFrom(KubernetesDependent confi
       useSSA = configAnnotation.useSSA().asBoolean();
     }
 
-    var informerConfiguration = createInformerConfiguration(configAnnotation,
+    var informerConfiguration = createInformerConfig(configAnnotation,
         (DependentResourceSpec<R, P, KubernetesDependentResourceConfig<R>>) spec,
         controllerConfig);
 
@@ -52,76 +54,98 @@ public KubernetesDependentResourceConfig<R> configFrom(KubernetesDependent confi
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private InformerConfigSpec<R> createInformerConfiguration(KubernetesDependent configAnnotation,
+  private InformerConfiguration<R> createInformerConfig(KubernetesDependent configAnnotation,
       DependentResourceSpec<R, P, KubernetesDependentResourceConfig<R>> spec,
-      ControllerConfiguration<?> controllerConfig) {
-    final var dependentResourceClass = (Class<? extends KubernetesDependentResource<R, P>>) spec.getDependentResourceClass();
+      ControllerConfiguration<? extends HasMetadata> controllerConfig) {
+    Class<? extends KubernetesDependentResource<?, ?>> dependentResourceClass =
+        (Class<? extends KubernetesDependentResource<?, ?>>) spec.getDependentResourceClass();
+    final var resourceType = spec.getResourceClass();
+
+    InformerConfiguration.InformerConfigurationBuilder informerConfig;
+    if (configAnnotation != null && configAnnotation.informerConfig() != null &&
+        !Constants.NO_VALUE_SET.equals(configAnnotation.informerConfig().groupVersionKind())) {
+
+      if (!GenericKubernetesResource.class.isAssignableFrom(resourceType)) {
+        throw new IllegalStateException(
+            "If GroupVersionKind is set the resource type must be GenericKubernetesDependentResource for: "
+                + dependentResourceClass.getName());
+      }
+
+      informerConfig = InformerConfiguration.from(
+          GroupVersionKind.fromString(configAnnotation.informerConfig().groupVersionKind()),
+          controllerConfig.getResourceClass());
+    } else {
+      informerConfig =
+          InformerConfiguration.from(resourceType, controllerConfig.getResourceClass());
+    }
+
     // default name should be set even if there's no explicit informer configuration
-    var name = DependentResource.defaultNameFor(dependentResourceClass);
+    informerConfig.withName(DependentResource.defaultNameFor(dependentResourceClass));
+
     if (configAnnotation != null && configAnnotation.informerConfig() != null) {
       // override default name if more specific one is provided
-      final var nameFromAnnotation = configAnnotation.informerConfig().name();
-      if (!Constants.NO_VALUE_SET.equals(nameFromAnnotation)) {
-        name = nameFromAnnotation;
-      } else {
-        final var nameFromDependentAnnotation = spec.getName();
-        if (nameFromDependentAnnotation != null
-            && !Constants.NO_VALUE_SET.equals(nameFromDependentAnnotation)) {
-          name = nameFromDependentAnnotation;
-        }
+      if (!Constants.NO_VALUE_SET.equals(configAnnotation.informerConfig().name())) {
+        informerConfig.withName(configAnnotation.informerConfig().name());
+      } else if (spec.getName() != null && !Constants.NO_VALUE_SET.equals(spec.getName())) {
+        informerConfig.withName(spec.getName());
       }
 
       var namespaces = Set.of(configAnnotation.informerConfig().namespaces());
+      informerConfig.withNamespaces(namespaces);
 
-      final var labelFromAnnotation = configAnnotation.informerConfig().labelSelector();
-      var labelSelector =
-          Constants.NO_VALUE_SET.equals(labelFromAnnotation) ? null : labelFromAnnotation;
+      final var fromAnnotation = configAnnotation.informerConfig().labelSelector();
+      var labelSelector = Constants.NO_VALUE_SET.equals(fromAnnotation) ? null : fromAnnotation;
+      informerConfig.withLabelSelector(labelSelector);
 
       final var context = Utils.contextFor(controllerConfig, dependentResourceClass,
           configAnnotation.annotationType());
+
       var onAddFilter = Utils.instantiate(configAnnotation.informerConfig().onAddFilter(),
           OnAddFilter.class, context);
+      informerConfig.withOnAddFilter((OnAddFilter<? super R>) onAddFilter);
+
       var onUpdateFilter =
           Utils.instantiate(configAnnotation.informerConfig().onUpdateFilter(),
               OnUpdateFilter.class, context);
+      informerConfig.withOnUpdateFilter((OnUpdateFilter<? super R>) onUpdateFilter);
+
       var onDeleteFilter =
           Utils.instantiate(configAnnotation.informerConfig().onDeleteFilter(),
               OnDeleteFilter.class, context);
+      informerConfig.withOnDeleteFilter((OnDeleteFilter<? super R>) onDeleteFilter);
+
       var genericFilter =
           Utils.instantiate(configAnnotation.informerConfig().genericFilter(),
               GenericFilter.class,
               context);
 
-      final var gvkFromAnnotation = configAnnotation.informerConfig().groupVersionKind();
-      var gvk = !Constants.NO_VALUE_SET.equals(gvkFromAnnotation)
-          ? GroupVersionKind.fromString(gvkFromAnnotation)
-          : null;
+      informerConfig.withGenericFilter((GenericFilter<? super R>) genericFilter);
+
+      informerConfig.followControllerNamespacesOnChange(
+          configAnnotation.informerConfig().followControllerNamespacesOnChange());
 
       var primaryToSecondaryMapper =
           Utils.instantiate(configAnnotation.informerConfig().primaryToSecondaryMapper(),
               PrimaryToSecondaryMapper.class, context);
+      informerConfig.withPrimaryToSecondaryMapper(primaryToSecondaryMapper);
 
       var secondaryToPrimaryMapper =
           Utils.instantiate(configAnnotation.informerConfig().secondaryToPrimaryMapper(),
               SecondaryToPrimaryMapper.class, context);
-
-      return new InformerConfigSpec<>(name, namespaces, labelSelector,
-          configAnnotation.informerConfig().followControllerNamespacesOnChange(),
-          onAddFilter, onUpdateFilter, onDeleteFilter, genericFilter,
-          gvk, secondaryToPrimaryMapper, primaryToSecondaryMapper);
-    } else {
-      var secondaryToPrimaryMapper =
-          (SecondaryToPrimaryMapper<R>) getSecondaryToPrimaryMapper(dependentResourceClass,
-              controllerConfig.getResourceClass())
-              .orElse(null);
-      if (secondaryToPrimaryMapper == null) {
-        if (spec.getUseEventSourceWithName().isEmpty()) {
-          log.warn("No SecondaryToPrimaryMapper set for dependent resource "
-              + dependentResourceClass.getSimpleName() +
-              ". This might be an issue with the setup of the dependent resource");
-        }
+      if (secondaryToPrimaryMapper != null) {
+        informerConfig.withSecondaryToPrimaryMapper(secondaryToPrimaryMapper);
       }
-      return new InformerConfigSpec<>(name, secondaryToPrimaryMapper);
+    } else {
+      getSecondaryToPrimaryMapper(dependentResourceClass,
+          controllerConfig.getResourceClass())
+          .ifPresentOrElse(informerConfig::withSecondaryToPrimaryMapper, () -> {
+            if (spec.getUseEventSourceWithName().isEmpty()) {
+              log.warn("No SecondaryToPrimaryMapper set for dependent resource "
+                  + dependentResourceClass.getSimpleName() +
+                  ". This might be an issue with the setup of the dependent resource");
+            }
+          });
     }
+    return informerConfig.build();
   }
 }

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

@@ -209,10 +209,8 @@ protected void addReferenceHandlingMetadata(R desired, P primary) {
   protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
     InformerConfiguration<R> config;
     if (kubernetesDependentResourceConfig != null
-        && kubernetesDependentResourceConfig.informerConfigSpec() != null) {
-      config = informerConfigurationBuilder()
-          .withConfig(kubernetesDependentResourceConfig.informerConfigSpec())
-          .build();
+        && kubernetesDependentResourceConfig.informerConfiguration() != null) {
+      config = kubernetesDependentResourceConfig.informerConfiguration();
     } else {
       config = informerConfigurationBuilder()
           .withName(name())