refactor to builder

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Author: csviri

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

@@ -225,7 +225,7 @@ 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, resourceTypeFor(dependentType));
+          eventSourceName);
 
       // extract potential configuration
       DependentResourceConfigurationResolver.configureSpecFromConfigured(spec,

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

@@ -18,14 +18,12 @@ public class DependentResourceSpec<R, P extends HasMetadata, C> {
   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,
-      Class<R> resourceClass) {
+      Condition<?, ?> activationCondition, String useEventSourceWithName) {
     this.dependentResourceClass = dependentResourceClass;
     this.name = name;
     this.dependsOn = dependsOn;
@@ -34,7 +32,6 @@ 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() {
@@ -104,7 +101,4 @@ 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

@@ -151,9 +151,9 @@ static boolean inheritsNamespacesFromController(Set<String> namespaces) {
   @SuppressWarnings("unused")
   class InformerConfigurationBuilder<R extends HasMetadata> {
 
-    private final Class<R> resourceClass;
-    private final GroupVersionKind groupVersionKind;
-    private final Class<? extends HasMetadata> primaryResourceClass;
+    private Class<R> resourceClass;
+    protected GroupVersionKind groupVersionKind;
+    protected Class<? extends HasMetadata> primaryResourceClass;
     private String name;
     private PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
     private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
@@ -179,6 +179,8 @@ private InformerConfigurationBuilder(GroupVersionKind groupVersionKind,
       this((Class<R>) GenericKubernetesResource.class, primaryResourceClass, groupVersionKind);
     }
 
+    protected InformerConfigurationBuilder() {}
+
     private InformerConfigurationBuilder(Class<R> resourceClass,
         Class<? extends HasMetadata> primaryResourceClass, GroupVersionKind groupVersionKind) {
       this.resourceClass = resourceClass;
@@ -295,6 +297,11 @@ public InformerConfigurationBuilder<R> withItemStore(ItemStore<R> itemStore) {
       return this;
     }
 
+    public InformerConfigurationBuilder<R> withResourceClass(Class<R> resourceClass) {
+      this.resourceClass = resourceClass;
+      return this;
+    }
+
     /**
      * Sets a max page size limit when starting the informer. This will result in pagination while
      * populating the cache. This means that longer lists will take multiple requests to fetch. See
@@ -307,7 +314,21 @@ public InformerConfigurationBuilder<R> withInformerListLimit(Long informerListLi
       return this;
     }
 
+    public String getName() {
+      return name;
+    }
+
+    public SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
+      return secondaryToPrimaryMapper;
+    }
+
     public InformerConfiguration<R> build() {
+      if (groupVersionKind != null
+          && !GenericKubernetesResource.class.isAssignableFrom(resourceClass)) {
+        throw new IllegalStateException(
+            "If GroupVersionKind is set the resource type must be GenericKubernetesDependentResource");
+      }
+
       return new DefaultInformerConfiguration<>(name, labelSelector, resourceClass,
           groupVersionKind,
           primaryToSecondaryMapper,

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

@@ -6,8 +6,6 @@
 import java.lang.annotation.Target;
 
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
-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;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
@@ -79,21 +77,6 @@
    */
   Class<? extends GenericFilter> genericFilter() default GenericFilter.class;
 
-  /**
-   * Optional {@link SecondaryToPrimaryMapper} class, to override the default.
-   *
-   * @return class of a {@link SecondaryToPrimaryMapper}
-   *
-   */
-  Class<? extends SecondaryToPrimaryMapper> secondaryToPrimaryMapper() default SecondaryToPrimaryMapper.class;
-
-  /**
-   * Optionally set a {@link PrimaryToSecondaryMapper}.
-   *
-   * @return PrimaryToSecondaryMapper to set
-   */
-  Class<? extends PrimaryToSecondaryMapper> primaryToSecondaryMapper() default PrimaryToSecondaryMapper.class;
-
   /**
    * Set that in case of a runtime controller namespace changes, the informer should also follow the
    * new namespace set.

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

@@ -5,24 +5,19 @@
 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;
-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;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
 
-import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource.getSecondaryToPrimaryMapper;
 import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig.DEFAULT_CREATE_RESOURCE_ONLY_IF_NOT_EXISTING_WITH_SSA;
 
 public class KubernetesDependentConverter<R extends HasMetadata, P extends HasMetadata> implements
@@ -54,98 +49,75 @@ public KubernetesDependentResourceConfig<R> configFrom(KubernetesDependent confi
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private InformerConfiguration<R> createInformerConfig(KubernetesDependent configAnnotation,
+  private InformerConfiguration.InformerConfigurationBuilder<R> createInformerConfig(
+      KubernetesDependent configAnnotation,
       DependentResourceSpec<R, P, KubernetesDependentResourceConfig<R>> spec,
       ControllerConfiguration<? extends HasMetadata> controllerConfig) {
     Class<? extends KubernetesDependentResource<?, ?>> dependentResourceClass =
         (Class<? extends KubernetesDependentResource<?, ?>>) spec.getDependentResourceClass();
-    final var resourceType = spec.getResourceClass();
 
-    InformerConfiguration.InformerConfigurationBuilder informerConfig;
+    InformerConfiguration.InformerConfigurationBuilder informerBuilder;
     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(
+      informerBuilder = InformerConfiguration.from(
           GroupVersionKind.fromString(configAnnotation.informerConfig().groupVersionKind()),
           controllerConfig.getResourceClass());
     } else {
-      informerConfig =
-          InformerConfiguration.from(resourceType, controllerConfig.getResourceClass());
+      informerBuilder = new InternalInformerConfigBuilder(controllerConfig.getResourceClass());
     }
 
-    // default name should be set even if there's no explicit informer configuration
-    informerConfig.withName(DependentResource.defaultNameFor(dependentResourceClass));
-
     if (configAnnotation != null && configAnnotation.informerConfig() != null) {
       // override default name if more specific one is provided
       if (!Constants.NO_VALUE_SET.equals(configAnnotation.informerConfig().name())) {
-        informerConfig.withName(configAnnotation.informerConfig().name());
+        informerBuilder.withName(configAnnotation.informerConfig().name());
       } else if (spec.getName() != null && !Constants.NO_VALUE_SET.equals(spec.getName())) {
-        informerConfig.withName(spec.getName());
+        informerBuilder.withName(spec.getName());
       }
 
       var namespaces = Set.of(configAnnotation.informerConfig().namespaces());
-      informerConfig.withNamespaces(namespaces);
+      informerBuilder.withNamespaces(namespaces);
 
       final var fromAnnotation = configAnnotation.informerConfig().labelSelector();
       var labelSelector = Constants.NO_VALUE_SET.equals(fromAnnotation) ? null : fromAnnotation;
-      informerConfig.withLabelSelector(labelSelector);
+      informerBuilder.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);
+      informerBuilder.withOnAddFilter((OnAddFilter<? super R>) onAddFilter);
 
       var onUpdateFilter =
           Utils.instantiate(configAnnotation.informerConfig().onUpdateFilter(),
               OnUpdateFilter.class, context);
-      informerConfig.withOnUpdateFilter((OnUpdateFilter<? super R>) onUpdateFilter);
+      informerBuilder.withOnUpdateFilter((OnUpdateFilter<? super R>) onUpdateFilter);
 
       var onDeleteFilter =
           Utils.instantiate(configAnnotation.informerConfig().onDeleteFilter(),
               OnDeleteFilter.class, context);
-      informerConfig.withOnDeleteFilter((OnDeleteFilter<? super R>) onDeleteFilter);
+      informerBuilder.withOnDeleteFilter((OnDeleteFilter<? super R>) onDeleteFilter);
 
       var genericFilter =
           Utils.instantiate(configAnnotation.informerConfig().genericFilter(),
               GenericFilter.class,
               context);
 
-      informerConfig.withGenericFilter((GenericFilter<? super R>) genericFilter);
+      informerBuilder.withGenericFilter((GenericFilter<? super R>) genericFilter);
 
-      informerConfig.followControllerNamespacesOnChange(
+      informerBuilder.followControllerNamespacesOnChange(
           configAnnotation.informerConfig().followControllerNamespacesOnChange());
 
-      var primaryToSecondaryMapper =
-          Utils.instantiate(configAnnotation.informerConfig().primaryToSecondaryMapper(),
-              PrimaryToSecondaryMapper.class, context);
-      informerConfig.withPrimaryToSecondaryMapper(primaryToSecondaryMapper);
+    }
+    return informerBuilder;
+  }
 
-      var secondaryToPrimaryMapper =
-          Utils.instantiate(configAnnotation.informerConfig().secondaryToPrimaryMapper(),
-              SecondaryToPrimaryMapper.class, context);
-      if (secondaryToPrimaryMapper != null) {
-        informerConfig.withSecondaryToPrimaryMapper(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");
-            }
-          });
+  private class InternalInformerConfigBuilder
+      extends InformerConfiguration.InformerConfigurationBuilder<R> {
+    public InternalInformerConfigBuilder(Class<? extends HasMetadata> primaryResourceClass) {
+      this.primaryResourceClass = primaryResourceClass;
     }
-    return informerConfig.build();
   }
+
 }

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

@@ -21,7 +21,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ConfiguredDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.AbstractEventSourceHolderDependentResource;
-import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Matcher.Result;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.updatermatcher.GenericResourceUpdaterMatcher;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
@@ -209,14 +208,21 @@ protected void addReferenceHandlingMetadata(R desired, P primary) {
   protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
     InformerConfiguration<R> config;
     if (kubernetesDependentResourceConfig != null
-        && kubernetesDependentResourceConfig.informerConfiguration() != null) {
-      config = kubernetesDependentResourceConfig.informerConfiguration();
+        && kubernetesDependentResourceConfig.informerConfigurationBuilder() != null) {
+      var configBuilder = kubernetesDependentResourceConfig.informerConfigurationBuilder();
+      configBuilder.withResourceClass(resourceType());
+      if (configBuilder.getName() == null) {
+        configBuilder.withName(name());
+      }
+      if (configBuilder.getSecondaryToPrimaryMapper() == null) {
+        configBuilder.withSecondaryToPrimaryMapper(getSecondaryToPrimaryMapper().orElseThrow());
+      }
+      config = configBuilder.build();
     } else {
       config = informerConfigurationBuilder()
           .withName(name())
           .withSecondaryToPrimaryMapper(
-              (SecondaryToPrimaryMapper<R>) getSecondaryToPrimaryMapper(this.getClass(),
-                  getPrimaryResourceType()).orElseThrow())
+              getSecondaryToPrimaryMapper().orElseThrow())
           .build();
     }
     var es = new InformerEventSource<>(config, context);
@@ -292,19 +298,18 @@ public boolean isDeletable() {
     return super.isDeletable() && !garbageCollected;
   }
 
-  @SuppressWarnings("rawtypes")
-  public static Optional<SecondaryToPrimaryMapper<?>> getSecondaryToPrimaryMapper(
-      Class<? extends KubernetesDependentResource> drClass,
-      Class<? extends HasMetadata> primaryResourceClass) {
-
-    if (GarbageCollected.class.isAssignableFrom(drClass)) {
-      var clustered = !Namespaced.class.isAssignableFrom(primaryResourceClass);
-      return Optional.of(Mappers.fromOwnerReferences(primaryResourceClass, clustered));
-    } else if (!GarbageCollected.class.isAssignableFrom(drClass)
-        && Creator.class.isAssignableFrom(drClass)) {
-      return Optional.of(Mappers.fromDefaultAnnotations());
+  @SuppressWarnings("unchecked")
+  protected Optional<SecondaryToPrimaryMapper<R>> getSecondaryToPrimaryMapper() {
+    if (this instanceof SecondaryToPrimaryMapper<?>) {
+      return Optional.of((SecondaryToPrimaryMapper<R>) this);
     } else {
-      return Optional.empty();
+      var clustered = !Namespaced.class.isAssignableFrom(getPrimaryResourceType());
+      if (garbageCollected) {
+        return Optional.of(Mappers.fromOwnerReferences(getPrimaryResourceType(), clustered));
+      } else if (isCreatable()) {
+        return Optional.of(Mappers.fromDefaultAnnotations());
+      }
     }
+    return Optional.empty();
   }
 }

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

@@ -11,15 +11,17 @@ public class KubernetesDependentResourceConfig<R extends HasMetadata> {
 
   private final Boolean useSSA;
   private final boolean createResourceOnlyIfNotExistingWithSSA;
-  private final InformerConfiguration<R> spec;
+  // here is informer builder instead of a config this has mostly technical related to Quarkus
+  // extension
+  private final InformerConfiguration.InformerConfigurationBuilder<R> informerConfigBuilder;
 
   public KubernetesDependentResourceConfig(
       Boolean useSSA,
       boolean createResourceOnlyIfNotExistingWithSSA,
-      InformerConfiguration<R> spec) {
+      InformerConfiguration.InformerConfigurationBuilder<R> informerConfigBuilder) {
     this.useSSA = useSSA;
     this.createResourceOnlyIfNotExistingWithSSA = createResourceOnlyIfNotExistingWithSSA;
-    this.spec = spec;
+    this.informerConfigBuilder = informerConfigBuilder;
   }
 
   public boolean createResourceOnlyIfNotExistingWithSSA() {
@@ -30,7 +32,7 @@ public Boolean useSSA() {
     return useSSA;
   }
 
-  public InformerConfiguration<R> informerConfiguration() {
-    return spec;
+  public InformerConfiguration.InformerConfigurationBuilder<R> informerConfigurationBuilder() {
+    return informerConfigBuilder;
   }
 }

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

@@ -8,7 +8,7 @@ public final class KubernetesDependentResourceConfigBuilder<R extends HasMetadat
 
   private boolean createResourceOnlyIfNotExistingWithSSA;
   private Boolean useSSA = null;
-  private InformerConfiguration<R> informerConfiguration;
+  private InformerConfiguration.InformerConfigurationBuilder<R> informerConfigurationBuilder;
 
   public KubernetesDependentResourceConfigBuilder() {}
 
@@ -24,15 +24,15 @@ public KubernetesDependentResourceConfigBuilder<R> withUseSSA(boolean useSSA) {
     return this;
   }
 
-  public KubernetesDependentResourceConfigBuilder<R> withInformerConfiguration(
-      InformerConfiguration<R> informerConfiguration) {
-    this.informerConfiguration = informerConfiguration;
+  public KubernetesDependentResourceConfigBuilder<R> withInformerConfigurationBuilder(
+      InformerConfiguration.InformerConfigurationBuilder<R> informerConfigurationBuilder) {
+    this.informerConfigurationBuilder = informerConfigurationBuilder;
     return this;
   }
 
   public KubernetesDependentResourceConfig<R> build() {
     return new KubernetesDependentResourceConfig<>(
         useSSA, createResourceOnlyIfNotExistingWithSSA,
-        informerConfiguration);
+        informerConfigurationBuilder);
   }
 }