Skip to content

Commit

Permalink
refactor: rename InformerConfigHolder to InformerConfiguration
Browse files Browse the repository at this point in the history 
Signed-off-by: Chris Laprun <claprun@redhat.com>
  • Loading branch information
@metacosm
metacosm committed Jul 12, 2024
1 parent 4ea54c2 commit 5773463
Show file tree
Hide file tree
Showing 16 changed files with 70 additions and 69 deletions.
4 changes: 2 additions & 2 deletions ...k-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -275,7 +275,7 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
fieldManager.equals(CONTROLLER_NAME_AS_FIELD_MANAGER) ? name
: fieldManager;

InformerConfigHolder<P> informerConfig = InformerConfigHolder.builder(resourceClass)
InformerConfiguration<P> informerConfig = InformerConfiguration.builder(resourceClass)
.initFromAnnotation(annotation != null ? annotation.informer() : null, context)
.buildForController();

Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -30,12 +30,12 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
private String fieldManager;
private Duration reconciliationMaxInterval;
private Map<DependentResourceSpec, Object> configurations;
private final InformerConfigHolder<R>.Builder config;
private final InformerConfiguration<R>.Builder config;

private ControllerConfigurationOverrider(ControllerConfiguration<R> 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())
Expand Down
8 changes: 4 additions & 4 deletions ...re/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<R extends HasMetadata>
implements ResourceConfiguration<R> {

private final Class<R> resourceClass;
private final String resourceTypeName;
private final InformerConfigHolder<R> informerConfig;
private final InformerConfiguration<R> informerConfig;

protected DefaultResourceConfiguration(Class<R> resourceClass,
InformerConfigHolder<R> informerConfig) {
InformerConfiguration<R> 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
Expand All @@ -35,7 +35,7 @@ public Class<R> getResourceClass() {
}

@Override
public InformerConfigHolder<R> getInformerConfig() {
public InformerConfiguration<R> getInformerConfig() {
return informerConfig;
}
}
8 changes: 4 additions & 4 deletions ...src/main/java/io/javaoperatorsdk/operator/api/config/ResolvedControllerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -49,7 +49,7 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, String name,
Map<DependentResourceSpec, Object> configurations,
String fieldManager,
ConfigurationService configurationService,
InformerConfigHolder<P> informerConfig,
InformerConfiguration<P> informerConfig,
WorkflowSpec workflowSpec) {
this(resourceClass, name, generationAware, associatedReconcilerClassName, retry, rateLimiter,
maxReconciliationInterval, finalizer, configurations, fieldManager,
Expand All @@ -62,7 +62,7 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
RateLimiter rateLimiter, Duration maxReconciliationInterval, String finalizer,
Map<DependentResourceSpec, Object> configurations,
String fieldManager,
ConfigurationService configurationService, InformerConfigHolder<P> informerConfig) {
ConfigurationService configurationService, InformerConfiguration<P> informerConfig) {
super(resourceClass, informerConfig);
this.configurationService = configurationService;
this.name = ControllerConfiguration.ensureValidName(name, associatedReconcilerClassName);
Expand All @@ -81,7 +81,7 @@ protected ResolvedControllerConfiguration(Class<P> 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) {
Expand Down
4 changes: 2 additions & 2 deletions ...work-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -26,7 +26,7 @@ default String getResourceTypeName() {
return ReconcilerUtils.getResourceTypeName(getResourceClass());
}

InformerConfigHolder<R> getInformerConfig();
InformerConfiguration<R> getInformerConfig();

default Optional<OnAddFilter<? super R>> onAddFilter() {
return Optional.ofNullable(getInformerConfig().getOnAddFilter());
Expand Down
50 changes: 25 additions & 25 deletions ...config/informer/InformerConfigHolder.java → ...onfig/informer/InformerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


@SuppressWarnings("unused")
public class InformerConfigHolder<R extends HasMetadata> {
public class InformerConfiguration<R extends HasMetadata> {
private final Builder builder = new Builder();
private String name;
private Set<String> namespaces;
Expand All @@ -29,7 +29,7 @@ public class InformerConfigHolder<R extends HasMetadata> {
private ItemStore<R> itemStore;
private Long informerListLimit;

public InformerConfigHolder(String name, Set<String> namespaces,
public InformerConfiguration(String name, Set<String> namespaces,
boolean followControllerNamespacesOnChange,
String labelSelector, OnAddFilter<? super R> onAddFilter,
OnUpdateFilter<? super R> onUpdateFilter, OnDeleteFilter<? super R> onDeleteFilter,
Expand All @@ -46,23 +46,23 @@ public InformerConfigHolder(String name, Set<String> namespaces,
this.informerListLimit = informerListLimit;
}

private InformerConfigHolder() {}
private InformerConfiguration() {}

@SuppressWarnings({"rawtypes", "unchecked"})
public static <R extends HasMetadata> InformerConfigHolder<R>.Builder builder() {
return new InformerConfigHolder().builder;
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder() {
return new InformerConfiguration().builder;
}

@SuppressWarnings({"rawtypes", "unchecked"})
public static <R extends HasMetadata> InformerConfigHolder<R>.Builder builder(
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
Class<R> resourceClass) {
return new InformerConfigHolder().builder;
return new InformerConfiguration().builder;
}

@SuppressWarnings({"rawtypes", "unchecked"})
public static <R extends HasMetadata> InformerConfigHolder<R>.Builder builder(
InformerConfigHolder<R> original) {
return new InformerConfigHolder(original.name, original.namespaces,
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
InformerConfiguration<R> 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;
Expand Down Expand Up @@ -112,29 +112,29 @@ public Long getInformerListLimit() {
@SuppressWarnings("UnusedReturnValue")
public class Builder {

public InformerConfigHolder<R> buildForController() {
public InformerConfiguration<R> 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<R> buildForInformerEventSource() {
public InformerConfiguration<R> buildForInformerEventSource() {
if (namespaces == null || namespaces.isEmpty()) {
namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
}
if (followControllerNamespacesOnChange == null) {
followControllerNamespacesOnChange =
InformerEventSourceConfiguration.DEFAULT_FOLLOW_CONTROLLER_NAMESPACES_ON_CHANGE;
}
return InformerConfigHolder.this;
return InformerConfiguration.this;
}

@SuppressWarnings({"unchecked"})
public InformerConfigHolder<R>.Builder initFromAnnotation(Informer informerConfig,
public InformerConfiguration<R>.Builder initFromAnnotation(Informer informerConfig,
String context) {
if (informerConfig != null) {

Expand Down Expand Up @@ -178,12 +178,12 @@ public InformerConfigHolder<R>.Builder initFromAnnotation(Informer informerConfi
}

public Builder withName(String name) {
InformerConfigHolder.this.name = name;
InformerConfiguration.this.name = name;
return this;
}

public Builder withNamespaces(Set<String> namespaces) {
InformerConfigHolder.this.namespaces =
InformerConfiguration.this.namespaces =
ResourceConfiguration.ensureValidNamespaces(namespaces);
return this;
}
Expand Down Expand Up @@ -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<R> 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;
}
}
Expand Down
10 changes: 5 additions & 5 deletions ...ava/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ protected DefaultInformerEventSourceConfiguration(
GroupVersionKind groupVersionKind,
PrimaryToSecondaryMapper<?> primaryToSecondaryMapper,
SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper,
InformerConfigHolder<R> informerConfig) {
InformerConfiguration<R> informerConfig) {
super(resourceClass, informerConfig);
this.groupVersionKind = groupVersionKind;
this.primaryToSecondaryMapper = primaryToSecondaryMapper;
Expand Down Expand Up @@ -141,7 +141,7 @@ class Builder<R extends HasMetadata> {
private final Class<R> resourceClass;
private final GroupVersionKind groupVersionKind;
private final Class<? extends HasMetadata> primaryResourceClass;
private final InformerConfigHolder<R>.Builder config;
private final InformerConfiguration<R>.Builder config;
private String name;
private PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
Expand All @@ -162,11 +162,11 @@ private Builder(Class<R> resourceClass,
this.resourceClass = resourceClass;
this.groupVersionKind = groupVersionKind;
this.primaryResourceClass = primaryResourceClass;
this.config = InformerConfigHolder.builder(resourceClass);
this.config = InformerConfiguration.builder(resourceClass);
}

public Builder<R> withInformerConfiguration(
Consumer<InformerConfigHolder<R>.Builder> configurator) {
Consumer<InformerConfiguration<R>.Builder> configurator) {
configurator.accept(config);
return this;
}
Expand Down Expand Up @@ -197,7 +197,7 @@ public SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
return secondaryToPrimaryMapper;
}

public void updateFrom(InformerConfigHolder<R> informerConfig) {
public void updateFrom(InformerConfiguration<R> informerConfig) {
if (informerConfig != null) {
final var informerConfigName = informerConfig.getName();
if (informerConfigName != null) {
Expand Down
6 changes: 3 additions & 3 deletions ...avaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -36,14 +36,14 @@ public KubernetesDependentResourceConfig<R> configFrom(KubernetesDependent confi
}

@SuppressWarnings({"unchecked"})
private InformerConfigHolder<R> createInformerConfig(
private InformerConfiguration<R> createInformerConfig(
KubernetesDependent configAnnotation,
DependentResourceSpec<R, P, KubernetesDependentResourceConfig<R>> spec,
ControllerConfiguration<? extends HasMetadata> controllerConfig) {
Class<? extends KubernetesDependentResource<?, ?>> dependentResourceClass =
(Class<? extends KubernetesDependentResource<?, ?>>) spec.getDependentResourceClass();

InformerConfigHolder<R>.Builder config = InformerConfigHolder.builder();
InformerConfiguration<R>.Builder config = InformerConfiguration.builder();
if (configAnnotation != null) {
final var informerConfig = configAnnotation.informer();
final var context = Utils.contextFor(controllerConfig, dependentResourceClass,
Expand Down
8 changes: 4 additions & 4 deletions ...eratorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResourceConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<R extends HasMetadata> {
Expand All @@ -11,12 +11,12 @@ public class KubernetesDependentResourceConfig<R extends HasMetadata> {

private final Boolean useSSA;
private final boolean createResourceOnlyIfNotExistingWithSSA;
private final InformerConfigHolder<R> informerConfig;
private final InformerConfiguration<R> informerConfig;

public KubernetesDependentResourceConfig(
Boolean useSSA,
boolean createResourceOnlyIfNotExistingWithSSA,
InformerConfigHolder<R> informerConfig) {
InformerConfiguration<R> informerConfig) {
this.useSSA = useSSA;
this.createResourceOnlyIfNotExistingWithSSA = createResourceOnlyIfNotExistingWithSSA;
this.informerConfig = informerConfig;
Expand All @@ -30,7 +30,7 @@ public Boolean useSSA() {
return useSSA;
}

public InformerConfigHolder<R> informerConfig() {
public InformerConfiguration<R> informerConfig() {
return informerConfig;
}
}
Loading

0 comments on commit 5773463

Please sign in to comment.