cleanup configs

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

Author: csviri

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

@@ -54,7 +54,7 @@ public class InformerConfiguration<R extends HasMetadata> {
   private ItemStore<R> itemStore;
   private Long informerListLimit;
   private FieldSelector fieldSelector;
-  private boolean comparableResourceVersions;
+  private Boolean comparableResourceVersions;
   private Duration obsoleteResourceCacheCheckInterval;
 
   protected InformerConfiguration(
@@ -70,7 +70,7 @@ protected InformerConfiguration(
       ItemStore<R> itemStore,
       Long informerListLimit,
       FieldSelector fieldSelector,
-      boolean comparableResourceVersions,
+      Boolean comparableResourceVersions,
       Duration obsoleteResourceCacheCheckInterval) {
     this(resourceClass);
     this.name = name;
@@ -319,6 +319,13 @@ public InformerConfiguration<R> buildForController() {
       }
       // to avoid potential NPE
       followControllerNamespaceChanges = false;
+      if (comparableResourceVersions == null) {
+        comparableResourceVersions = DEFAULT_COMPARABLE_RESOURCE_VERSION;
+      }
+
+      if (obsoleteResourceCacheCheckInterval == null) {
+        obsoleteResourceCacheCheckInterval = DEFAULT_OBSOLETE_RESOURCE_CHECK_INTERVAL;
+      }
       return InformerConfiguration.this;
     }
 
@@ -330,6 +337,14 @@ public InformerConfiguration<R> build() {
       if (followControllerNamespaceChanges == null) {
         followControllerNamespaceChanges = DEFAULT_FOLLOW_CONTROLLER_NAMESPACE_CHANGES;
       }
+      if (comparableResourceVersions == null) {
+        comparableResourceVersions = DEFAULT_COMPARABLE_RESOURCE_VERSION;
+      }
+
+      if (obsoleteResourceCacheCheckInterval == null) {
+        obsoleteResourceCacheCheckInterval = DEFAULT_OBSOLETE_RESOURCE_CHECK_INTERVAL;
+      }
+
       return InformerConfiguration.this;
     }
 

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

@@ -34,8 +34,6 @@
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
 import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
 
-import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_COMPARABLE_RESOURCE_VERSION;
-import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_OBSOLETE_RESOURCE_CHECK_INTERVAL;
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_ALL_NAMESPACE_SET;
 import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_CURRENT_NAMESPACE_SET;
@@ -92,35 +90,25 @@ default Optional<KubernetesClient> getKubernetesClient() {
     return Optional.empty();
   }
 
-  boolean comparableResourceVersion();
-
-  Duration getObsoleteResourceCacheCheckInterval();
-
   class DefaultInformerEventSourceConfiguration<R extends HasMetadata>
       implements InformerEventSourceConfiguration<R> {
     private final PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
     private final SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
     private final GroupVersionKind groupVersionKind;
     private final InformerConfiguration<R> informerConfig;
     private final KubernetesClient kubernetesClient;
-    private final boolean comparableResourceVersion;
-    private final Duration obsoleteResourceCacheCheckInterval;
 
     protected DefaultInformerEventSourceConfiguration(
         GroupVersionKind groupVersionKind,
         PrimaryToSecondaryMapper<?> primaryToSecondaryMapper,
         SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper,
         InformerConfiguration<R> informerConfig,
-        KubernetesClient kubernetesClient,
-        boolean comparableResourceVersion,
-        Duration obsoleteResourceCacheCheckInterval) {
+        KubernetesClient kubernetesClient) {
       this.informerConfig = Objects.requireNonNull(informerConfig);
       this.groupVersionKind = groupVersionKind;
       this.primaryToSecondaryMapper = primaryToSecondaryMapper;
       this.secondaryToPrimaryMapper = secondaryToPrimaryMapper;
       this.kubernetesClient = kubernetesClient;
-      this.comparableResourceVersion = comparableResourceVersion;
-      this.obsoleteResourceCacheCheckInterval = obsoleteResourceCacheCheckInterval;
     }
 
     @Override
@@ -148,16 +136,6 @@ public Optional<GroupVersionKind> getGroupVersionKind() {
     public Optional<KubernetesClient> getKubernetesClient() {
       return Optional.ofNullable(kubernetesClient);
     }
-
-    @Override
-    public boolean comparableResourceVersion() {
-      return this.comparableResourceVersion;
-    }
-
-    @Override
-    public Duration getObsoleteResourceCacheCheckInterval() {
-      return obsoleteResourceCacheCheckInterval;
-    }
   }
 
   @SuppressWarnings({"unused", "UnusedReturnValue"})
@@ -171,8 +149,6 @@ class Builder<R extends HasMetadata> {
     private PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
     private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
     private KubernetesClient kubernetesClient;
-    private boolean comparableResourceVersion = DEFAULT_COMPARABLE_RESOURCE_VERSION;
-    private Duration obsoleteResourceCacheCheckInterval = DEFAULT_OBSOLETE_RESOURCE_CHECK_INTERVAL;
 
     private Builder(Class<R> resourceClass, Class<? extends HasMetadata> primaryResourceClass) {
       this(resourceClass, primaryResourceClass, null);
@@ -311,13 +287,13 @@ public Builder<R> withFieldSelector(FieldSelector fieldSelector) {
     }
 
     public Builder<R> withComparableResourceVersion(boolean comparableResourceVersion) {
-      this.comparableResourceVersion = comparableResourceVersion;
+      config.withComparableResourceVersions(comparableResourceVersion);
       return this;
     }
 
     public Builder<R> withObsoleteResourceCacheCheckInterval(
         Duration obsoleteResourceCacheCheckInterval) {
-      this.obsoleteResourceCacheCheckInterval = obsoleteResourceCacheCheckInterval;
+      config.withObsoleteResourceCacheCheckInterval(obsoleteResourceCacheCheckInterval);
       return this;
     }
 
@@ -360,9 +336,7 @@ public InformerEventSourceConfiguration<R> build() {
                   HasMetadata.getKind(primaryResourceClass),
                   false)),
           config.build(),
-          kubernetesClient,
-          comparableResourceVersion,
-          obsoleteResourceCacheCheckInterval);
+          kubernetesClient);
     }
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSource.java

@@ -48,11 +48,7 @@ public class ControllerEventSource<T extends HasMetadata>
 
   @SuppressWarnings({"unchecked", "rawtypes"})
   public ControllerEventSource(Controller<T> controller) {
-    super(
-        NAME,
-        controller.getCRClient(),
-        controller.getConfiguration(),
-        controller.getConfiguration().getInformerConfig().isComparableResourceVersions());
+    super(NAME, controller.getCRClient(), controller.getConfiguration());
     this.controller = controller;
 
     final var config = controller.getConfiguration();

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

@@ -35,8 +35,6 @@
 import io.javaoperatorsdk.operator.processing.event.source.ResourceAction;
 import io.javaoperatorsdk.operator.processing.event.source.informer.TemporaryResourceCache.EventHandling;
 
-import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_COMPARABLE_RESOURCE_VERSION;
-
 /**
  * Wraps informer(s) so they are connected to the eventing system of the framework. Note that since
  * this is built on top of Fabric8 client Informers, it also supports caching resources using
@@ -58,29 +56,18 @@ public class InformerEventSource<R extends HasMetadata, P extends HasMetadata>
 
   public InformerEventSource(
       InformerEventSourceConfiguration<R> configuration, EventSourceContext<P> context) {
-    this(
-        configuration,
-        configuration.getKubernetesClient().orElse(context.getClient()),
-        configuration.comparableResourceVersion());
-  }
-
-  InformerEventSource(InformerEventSourceConfiguration<R> configuration, KubernetesClient client) {
-    this(configuration, client, DEFAULT_COMPARABLE_RESOURCE_VERSION);
+    this(configuration, configuration.getKubernetesClient().orElse(context.getClient()));
   }
 
   @SuppressWarnings({"unchecked", "rawtypes"})
-  private InformerEventSource(
-      InformerEventSourceConfiguration<R> configuration,
-      KubernetesClient client,
-      boolean comparableResourceVersions) {
+  InformerEventSource(InformerEventSourceConfiguration<R> configuration, KubernetesClient client) {
     super(
         configuration.name(),
         configuration
             .getGroupVersionKind()
             .map(gvk -> client.genericKubernetesResources(gvk.apiVersion(), gvk.getKind()))
             .orElseGet(() -> (MixedOperation) client.resources(configuration.getResourceClass())),
-        configuration,
-        comparableResourceVersions);
+        configuration);
     // If there is a primary to secondary mapper there is no need for primary to secondary index.
     primaryToSecondaryMapper = configuration.getPrimaryToSecondaryMapper();
     if (useSecondaryToPrimaryIndex()) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

@@ -67,10 +67,10 @@ public abstract class ManagedInformerEventSource<
   protected TemporaryResourceCache<R> temporaryResourceCache;
   protected MixedOperation client;
 
-  protected ManagedInformerEventSource(
-      String name, MixedOperation client, C configuration, boolean comparableResourceVersions) {
+  protected ManagedInformerEventSource(String name, MixedOperation client, C configuration) {
     super(configuration.getResourceClass(), name);
-    this.comparableResourceVersions = comparableResourceVersions;
+    this.comparableResourceVersions =
+        configuration.getInformerConfig().isComparableResourceVersions();
     this.client = client;
     this.configuration = configuration;
   }