diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java
index 60ad55976f..20beef7f90 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java
@@ -17,7 +17,7 @@
import io.javaoperatorsdk.operator.api.config.Utils.Configurator;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationResolver;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.config.workflow.WorkflowSpec;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -275,7 +275,7 @@ private
ResolvedControllerConfiguration
controllerCon
fieldManager.equals(CONTROLLER_NAME_AS_FIELD_MANAGER) ? name
: fieldManager;
- InformerConfigHolder
informerConfig = InformerConfigHolder.builder(resourceClass)
+ InformerConfiguration
informerConfig = InformerConfiguration.builder(resourceClass)
.initFromAnnotation(annotation != null ? annotation.informer() : null, context)
.buildForController();
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
index 86b3800773..423867107a 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
@@ -10,7 +10,7 @@
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.client.informers.cache.ItemStore;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
@@ -30,12 +30,12 @@ public class ControllerConfigurationOverrider {
private String fieldManager;
private Duration reconciliationMaxInterval;
private Map configurations;
- private final InformerConfigHolder.Builder config;
+ private final InformerConfiguration.Builder config;
private ControllerConfigurationOverrider(ControllerConfiguration original) {
this.finalizer = original.getFinalizerName();
this.generationAware = original.isGenerationAware();
- this.config = InformerConfigHolder.builder(original.getResourceClass())
+ this.config = InformerConfiguration.builder(original.getResourceClass())
.withName(name)
.withNamespaces(original.getNamespaces())
.withLabelSelector(original.getLabelSelector())
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
index 2f0a81a6b6..c0d725f746 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
@@ -4,17 +4,17 @@
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.javaoperatorsdk.operator.ReconcilerUtils;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
public class DefaultResourceConfiguration
implements ResourceConfiguration {
private final Class resourceClass;
private final String resourceTypeName;
- private final InformerConfigHolder informerConfig;
+ private final InformerConfiguration informerConfig;
protected DefaultResourceConfiguration(Class resourceClass,
- InformerConfigHolder informerConfig) {
+ InformerConfiguration informerConfig) {
this.resourceClass = resourceClass;
this.resourceTypeName = resourceClass.isAssignableFrom(GenericKubernetesResource.class)
// in general this is irrelevant now for secondary resources it is used just by controller
@@ -35,7 +35,7 @@ public Class getResourceClass() {
}
@Override
- public InformerConfigHolder getInformerConfig() {
+ public InformerConfiguration getInformerConfig() {
return informerConfig;
}
}
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
index 00bd39a4db..9bb7efb5cf 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
@@ -8,7 +8,7 @@
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.config.workflow.WorkflowSpec;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
@@ -49,7 +49,7 @@ public ResolvedControllerConfiguration(Class resourceClass, String name,
Map configurations,
String fieldManager,
ConfigurationService configurationService,
- InformerConfigHolder informerConfig,
+ InformerConfiguration
informerConfig,
WorkflowSpec workflowSpec) {
this(resourceClass, name, generationAware, associatedReconcilerClassName, retry, rateLimiter,
maxReconciliationInterval, finalizer, configurations, fieldManager,
@@ -62,7 +62,7 @@ protected ResolvedControllerConfiguration(Class
resourceClass, String name,
RateLimiter rateLimiter, Duration maxReconciliationInterval, String finalizer,
Map configurations,
String fieldManager,
- ConfigurationService configurationService, InformerConfigHolder informerConfig) {
+ ConfigurationService configurationService, InformerConfiguration
informerConfig) {
super(resourceClass, informerConfig);
this.configurationService = configurationService;
this.name = ControllerConfiguration.ensureValidName(name, associatedReconcilerClassName);
@@ -81,7 +81,7 @@ protected ResolvedControllerConfiguration(Class
resourceClass, String name,
Class extends Reconciler> reconcilerClas, ConfigurationService configurationService) {
this(resourceClass, name, false, getAssociatedReconcilerClassName(reconcilerClas), null, null,
null, null, null, null, configurationService,
- InformerConfigHolder.builder(resourceClass).buildForController());
+ InformerConfiguration.builder(resourceClass).buildForController());
}
public static Duration getMaxReconciliationInterval(long interval, TimeUnit timeUnit) {
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
index ba02eabdf8..cac44c93db 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
@@ -10,7 +10,7 @@
import io.fabric8.kubernetes.client.informers.cache.ItemStore;
import io.javaoperatorsdk.operator.OperatorException;
import io.javaoperatorsdk.operator.ReconcilerUtils;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.processing.event.source.cache.BoundedItemStore;
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
@@ -26,7 +26,7 @@ default String getResourceTypeName() {
return ReconcilerUtils.getResourceTypeName(getResourceClass());
}
- InformerConfigHolder getInformerConfig();
+ InformerConfiguration getInformerConfig();
default Optional> onAddFilter() {
return Optional.ofNullable(getInformerConfig().getOnAddFilter());
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfigHolder.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java
similarity index 84%
rename from operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfigHolder.java
rename to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java
index 2af30f453d..0cb6892ebe 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfigHolder.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java
@@ -16,7 +16,7 @@
@SuppressWarnings("unused")
-public class InformerConfigHolder {
+public class InformerConfiguration {
private final Builder builder = new Builder();
private String name;
private Set namespaces;
@@ -29,7 +29,7 @@ public class InformerConfigHolder {
private ItemStore itemStore;
private Long informerListLimit;
- public InformerConfigHolder(String name, Set namespaces,
+ public InformerConfiguration(String name, Set namespaces,
boolean followControllerNamespacesOnChange,
String labelSelector, OnAddFilter super R> onAddFilter,
OnUpdateFilter super R> onUpdateFilter, OnDeleteFilter super R> onDeleteFilter,
@@ -46,23 +46,23 @@ public InformerConfigHolder(String name, Set namespaces,
this.informerListLimit = informerListLimit;
}
- private InformerConfigHolder() {}
+ private InformerConfiguration() {}
@SuppressWarnings({"rawtypes", "unchecked"})
- public static InformerConfigHolder.Builder builder() {
- return new InformerConfigHolder().builder;
+ public static InformerConfiguration.Builder builder() {
+ return new InformerConfiguration().builder;
}
@SuppressWarnings({"rawtypes", "unchecked"})
- public static InformerConfigHolder.Builder builder(
+ public static InformerConfiguration.Builder builder(
Class resourceClass) {
- return new InformerConfigHolder().builder;
+ return new InformerConfiguration().builder;
}
@SuppressWarnings({"rawtypes", "unchecked"})
- public static InformerConfigHolder.Builder builder(
- InformerConfigHolder original) {
- return new InformerConfigHolder(original.name, original.namespaces,
+ public static InformerConfiguration.Builder builder(
+ InformerConfiguration original) {
+ return new InformerConfiguration(original.name, original.namespaces,
original.followControllerNamespacesOnChange, original.labelSelector, original.onAddFilter,
original.onUpdateFilter, original.onDeleteFilter, original.genericFilter,
original.itemStore, original.informerListLimit).builder;
@@ -112,17 +112,17 @@ public Long getInformerListLimit() {
@SuppressWarnings("UnusedReturnValue")
public class Builder {
- public InformerConfigHolder buildForController() {
+ public InformerConfiguration buildForController() {
// if the informer config uses the default "same as controller" value, reset the namespaces to
// the default set for controllers
if (namespaces == null || namespaces.isEmpty()
|| InformerEventSourceConfiguration.inheritsNamespacesFromController(namespaces)) {
namespaces = Constants.DEFAULT_NAMESPACES_SET;
}
- return InformerConfigHolder.this;
+ return InformerConfiguration.this;
}
- public InformerConfigHolder buildForInformerEventSource() {
+ public InformerConfiguration buildForInformerEventSource() {
if (namespaces == null || namespaces.isEmpty()) {
namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
}
@@ -130,11 +130,11 @@ public InformerConfigHolder buildForInformerEventSource() {
followControllerNamespacesOnChange =
InformerEventSourceConfiguration.DEFAULT_FOLLOW_CONTROLLER_NAMESPACES_ON_CHANGE;
}
- return InformerConfigHolder.this;
+ return InformerConfiguration.this;
}
@SuppressWarnings({"unchecked"})
- public InformerConfigHolder.Builder initFromAnnotation(Informer informerConfig,
+ public InformerConfiguration.Builder initFromAnnotation(Informer informerConfig,
String context) {
if (informerConfig != null) {
@@ -178,12 +178,12 @@ public InformerConfigHolder.Builder initFromAnnotation(Informer informerConfi
}
public Builder withName(String name) {
- InformerConfigHolder.this.name = name;
+ InformerConfiguration.this.name = name;
return this;
}
public Builder withNamespaces(Set namespaces) {
- InformerConfigHolder.this.namespaces =
+ InformerConfiguration.this.namespaces =
ResourceConfiguration.ensureValidNamespaces(namespaces);
return this;
}
@@ -232,48 +232,48 @@ public Builder withWatchCurrentNamespace() {
* @return the builder instance so that calls can be chained fluently
*/
public Builder withFollowControllerNamespacesOnChange(boolean followChanges) {
- InformerConfigHolder.this.followControllerNamespacesOnChange =
+ InformerConfiguration.this.followControllerNamespacesOnChange =
followChanges;
return this;
}
public Builder withLabelSelector(String labelSelector) {
- InformerConfigHolder.this.labelSelector =
+ InformerConfiguration.this.labelSelector =
ResourceConfiguration.ensureValidLabelSelector(labelSelector);
return this;
}
public Builder withOnAddFilter(
OnAddFilter super R> onAddFilter) {
- InformerConfigHolder.this.onAddFilter = onAddFilter;
+ InformerConfiguration.this.onAddFilter = onAddFilter;
return this;
}
public Builder withOnUpdateFilter(
OnUpdateFilter super R> onUpdateFilter) {
- InformerConfigHolder.this.onUpdateFilter = onUpdateFilter;
+ InformerConfiguration.this.onUpdateFilter = onUpdateFilter;
return this;
}
public Builder withOnDeleteFilter(
OnDeleteFilter super R> onDeleteFilter) {
- InformerConfigHolder.this.onDeleteFilter = onDeleteFilter;
+ InformerConfiguration.this.onDeleteFilter = onDeleteFilter;
return this;
}
public Builder withGenericFilter(
GenericFilter super R> genericFilter) {
- InformerConfigHolder.this.genericFilter = genericFilter;
+ InformerConfiguration.this.genericFilter = genericFilter;
return this;
}
public Builder withItemStore(ItemStore itemStore) {
- InformerConfigHolder.this.itemStore = itemStore;
+ InformerConfiguration.this.itemStore = itemStore;
return this;
}
public Builder withInformerListLimit(Long informerListLimit) {
- InformerConfigHolder.this.informerListLimit = informerListLimit;
+ InformerConfiguration.this.informerListLimit = informerListLimit;
return this;
}
}
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
index 181c3aa46b..1e5e1ce666 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
@@ -92,7 +92,7 @@ protected DefaultInformerEventSourceConfiguration(
GroupVersionKind groupVersionKind,
PrimaryToSecondaryMapper> primaryToSecondaryMapper,
SecondaryToPrimaryMapper secondaryToPrimaryMapper,
- InformerConfigHolder informerConfig) {
+ InformerConfiguration informerConfig) {
super(resourceClass, informerConfig);
this.groupVersionKind = groupVersionKind;
this.primaryToSecondaryMapper = primaryToSecondaryMapper;
@@ -141,7 +141,7 @@ class Builder {
private final Class resourceClass;
private final GroupVersionKind groupVersionKind;
private final Class extends HasMetadata> primaryResourceClass;
- private final InformerConfigHolder.Builder config;
+ private final InformerConfiguration.Builder config;
private String name;
private PrimaryToSecondaryMapper> primaryToSecondaryMapper;
private SecondaryToPrimaryMapper secondaryToPrimaryMapper;
@@ -162,11 +162,11 @@ private Builder(Class resourceClass,
this.resourceClass = resourceClass;
this.groupVersionKind = groupVersionKind;
this.primaryResourceClass = primaryResourceClass;
- this.config = InformerConfigHolder.builder(resourceClass);
+ this.config = InformerConfiguration.builder(resourceClass);
}
public Builder withInformerConfiguration(
- Consumer.Builder> configurator) {
+ Consumer.Builder> configurator) {
configurator.accept(config);
return this;
}
@@ -197,7 +197,7 @@ public SecondaryToPrimaryMapper getSecondaryToPrimaryMapper() {
return secondaryToPrimaryMapper;
}
- public void updateFrom(InformerConfigHolder informerConfig) {
+ public void updateFrom(InformerConfiguration informerConfig) {
if (informerConfig != null) {
final var informerConfigName = informerConfig.getName();
if (informerConfigName != null) {
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java
index a5e8083df4..36625b0689 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java
@@ -5,7 +5,7 @@
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.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig.DEFAULT_CREATE_RESOURCE_ONLY_IF_NOT_EXISTING_WITH_SSA;
@@ -36,14 +36,14 @@ public KubernetesDependentResourceConfig configFrom(KubernetesDependent confi
}
@SuppressWarnings({"unchecked"})
- private InformerConfigHolder createInformerConfig(
+ private InformerConfiguration createInformerConfig(
KubernetesDependent configAnnotation,
DependentResourceSpec> spec,
ControllerConfiguration extends HasMetadata> controllerConfig) {
Class extends KubernetesDependentResource, ?>> dependentResourceClass =
(Class extends KubernetesDependentResource, ?>>) spec.getDependentResourceClass();
- InformerConfigHolder.Builder config = InformerConfigHolder.builder();
+ InformerConfiguration.Builder config = InformerConfiguration.builder();
if (configAnnotation != null) {
final var informerConfig = configAnnotation.informer();
final var context = Utils.contextFor(controllerConfig, dependentResourceClass,
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
index d6a7ede5e9..2b419c2d0d 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
@@ -2,7 +2,7 @@
import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
public class KubernetesDependentResourceConfig {
@@ -11,12 +11,12 @@ public class KubernetesDependentResourceConfig {
private final Boolean useSSA;
private final boolean createResourceOnlyIfNotExistingWithSSA;
- private final InformerConfigHolder informerConfig;
+ private final InformerConfiguration informerConfig;
public KubernetesDependentResourceConfig(
Boolean useSSA,
boolean createResourceOnlyIfNotExistingWithSSA,
- InformerConfigHolder informerConfig) {
+ InformerConfiguration informerConfig) {
this.useSSA = useSSA;
this.createResourceOnlyIfNotExistingWithSSA = createResourceOnlyIfNotExistingWithSSA;
this.informerConfig = informerConfig;
@@ -30,7 +30,7 @@ public Boolean useSSA() {
return useSSA;
}
- public InformerConfigHolder informerConfig() {
+ public InformerConfiguration informerConfig() {
return informerConfig;
}
}
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfigBuilder.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfigBuilder.java
index b7c742ebd7..3610cb074b 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfigBuilder.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfigBuilder.java
@@ -2,13 +2,13 @@
import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
public final class KubernetesDependentResourceConfigBuilder {
private boolean createResourceOnlyIfNotExistingWithSSA;
private Boolean useSSA = null;
- private InformerConfigHolder informerConfigHolder;
+ private InformerConfiguration informerConfiguration;
public KubernetesDependentResourceConfigBuilder() {}
@@ -25,14 +25,14 @@ public KubernetesDependentResourceConfigBuilder withUseSSA(boolean useSSA) {
}
public KubernetesDependentResourceConfigBuilder withKubernetesDependentInformerConfig(
- InformerConfigHolder informerConfigHolder) {
- this.informerConfigHolder = informerConfigHolder;
+ InformerConfiguration informerConfiguration) {
+ this.informerConfiguration = informerConfiguration;
return this;
}
public KubernetesDependentResourceConfig build() {
return new KubernetesDependentResourceConfig<>(
useSSA, createResourceOnlyIfNotExistingWithSSA,
- informerConfigHolder);
+ informerConfiguration);
}
}
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
index 6de04de6c1..00733b496b 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
@@ -12,7 +12,7 @@
import io.fabric8.kubernetes.client.informers.cache.Cache;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationResolver;
import io.javaoperatorsdk.operator.api.config.informer.Informer;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -271,7 +271,7 @@ void replaceNamedDependentResourceConfigShouldWork() {
// override the namespaces for the dependent resource
final var overriddenNS = "newNS";
final var labelSelector = "foo=bar";
- final var overridingInformerConfig = InformerConfigHolder.builder(ConfigMap.class)
+ final var overridingInformerConfig = InformerConfiguration.builder(ConfigMap.class)
.withNamespaces(Set.of(overriddenNS))
.withLabelSelector(labelSelector)
.buildForInformerEventSource();
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ResourceConfigurationTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ResourceConfigurationTest.java
index 01e584c5c7..5cf8376ea2 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ResourceConfigurationTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ResourceConfigurationTest.java
@@ -7,7 +7,7 @@
import org.junit.jupiter.api.Test;
import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import static org.junit.jupiter.api.Assertions.*;
@@ -15,7 +15,7 @@
class ResourceConfigurationTest {
public static final ResourceConfiguration DEFAULT =
- () -> InformerConfigHolder.builder().buildForInformerEventSource();
+ () -> InformerConfiguration.builder().buildForInformerEventSource();
@Test
void allNamespacesWatched() {
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSourceTest.java
index 08816d07d4..5282fd2138 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSourceTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerEventSourceTest.java
@@ -12,7 +12,7 @@
import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.config.ResolvedControllerConfiguration;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.processing.Controller;
@@ -202,7 +202,7 @@ public TestConfiguration(boolean generationAware, OnAddFilter> prepareEventSources(EventSourceContext con
cluster.getMetadata().getNamespace()))
.stream().map(ResourceID::fromResource).collect(Collectors.toSet()))
.withInformerConfiguration(
- InformerConfigHolder.Builder::withNamespacesInheritedFromController);
+ InformerConfiguration.Builder::withNamespacesInheritedFromController);
if (addPrimaryToSecondaryMapper) {
informerConfiguration = informerConfiguration.withPrimaryToSecondaryMapper(
@@ -102,6 +102,7 @@ public boolean isErrorOccurred() {
return errorOccurred;
}
+ @SuppressWarnings("UnusedReturnValue")
public JobReconciler setGetResourceDirectlyFromCache(boolean getResourceDirectlyFromCache) {
this.getResourceDirectlyFromCache = getResourceDirectlyFromCache;
return this;
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java
index 41f64a34ff..b38f48b912 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java
@@ -9,7 +9,7 @@
import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.javaoperatorsdk.operator.api.config.informer.Informer;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.*;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfigBuilder;
@@ -85,7 +85,7 @@ private void initDependentResources(KubernetesClient client) {
Arrays.asList(configMapDR, deploymentDR, serviceDR, ingressDR)
.forEach(dr -> dr.configureWith(new KubernetesDependentResourceConfigBuilder()
- .withKubernetesDependentInformerConfig(InformerConfigHolder.builder()
+ .withKubernetesDependentInformerConfig(InformerConfiguration.builder()
.withLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR)
.buildForInformerEventSource())
.build()));
diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java
index 20e0bf378f..e7930a3658 100644
--- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java
+++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java
@@ -4,7 +4,7 @@
import java.util.List;
import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
+import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusUpdateControl;
@@ -96,7 +96,7 @@ private Workflow createDependentResourcesAndWorkflow() {
// configure them with our label selector
Arrays.asList(configMapDR, deploymentDR, serviceDR, ingressDR)
.forEach(dr -> dr.configureWith(new KubernetesDependentResourceConfigBuilder()
- .withKubernetesDependentInformerConfig(InformerConfigHolder.builder()
+ .withKubernetesDependentInformerConfig(InformerConfiguration.builder()
.withLabelSelector(SELECTOR + "=true")
.buildForInformerEventSource())
.build()));