Skip to content

Commit 0b20864

Browse files
metacosmmetacosm
committed
refactor: rename InformerConfigHolder to InformerConfiguration
Signed-off-by: Chris Laprun <[email protected]>
1 parent 1c14b24 commit 0b20864

File tree

16 files changed

+70
-69
lines changed

16 files changed

+70
-69
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import io.javaoperatorsdk.operator.api.config.Utils.Configurator;
1818
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationResolver;
1919
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
20-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
20+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
2121
import io.javaoperatorsdk.operator.api.config.workflow.WorkflowSpec;
2222
import io.javaoperatorsdk.operator.api.reconciler.Constants;
2323
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -275,7 +275,7 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
275275
fieldManager.equals(CONTROLLER_NAME_AS_FIELD_MANAGER) ? name
276276
: fieldManager;
277277

278-
InformerConfigHolder<P> informerConfig = InformerConfigHolder.builder(resourceClass)
278+
InformerConfiguration<P> informerConfig = InformerConfiguration.builder(resourceClass)
279279
.initFromAnnotation(annotation != null ? annotation.informer() : null, context)
280280
.buildForController();
281281

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.fabric8.kubernetes.api.model.HasMetadata;
1111
import io.fabric8.kubernetes.client.informers.cache.ItemStore;
1212
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
13-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
13+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
1414
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
1515
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
1616
import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
@@ -30,12 +30,12 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
3030
private String fieldManager;
3131
private Duration reconciliationMaxInterval;
3232
private Map<DependentResourceSpec, Object> configurations;
33-
private final InformerConfigHolder<R>.Builder config;
33+
private final InformerConfiguration<R>.Builder config;
3434

3535
private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
3636
this.finalizer = original.getFinalizerName();
3737
this.generationAware = original.isGenerationAware();
38-
this.config = InformerConfigHolder.builder(original.getResourceClass())
38+
this.config = InformerConfiguration.builder(original.getResourceClass())
3939
.withName(name)
4040
.withNamespaces(original.getNamespaces())
4141
.withLabelSelector(original.getLabelSelector())

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
55
import io.fabric8.kubernetes.api.model.HasMetadata;
66
import io.javaoperatorsdk.operator.ReconcilerUtils;
7-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
7+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
88

99
public class DefaultResourceConfiguration<R extends HasMetadata>
1010
implements ResourceConfiguration<R> {
1111

1212
private final Class<R> resourceClass;
1313
private final String resourceTypeName;
14-
private final InformerConfigHolder<R> informerConfig;
14+
private final InformerConfiguration<R> informerConfig;
1515

1616
protected DefaultResourceConfiguration(Class<R> resourceClass,
17-
InformerConfigHolder<R> informerConfig) {
17+
InformerConfiguration<R> informerConfig) {
1818
this.resourceClass = resourceClass;
1919
this.resourceTypeName = resourceClass.isAssignableFrom(GenericKubernetesResource.class)
2020
// in general this is irrelevant now for secondary resources it is used just by controller
@@ -35,7 +35,7 @@ public Class<R> getResourceClass() {
3535
}
3636

3737
@Override
38-
public InformerConfigHolder<R> getInformerConfig() {
38+
public InformerConfiguration<R> getInformerConfig() {
3939
return informerConfig;
4040
}
4141
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import io.fabric8.kubernetes.api.model.HasMetadata;
1010
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
11-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
11+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
1212
import io.javaoperatorsdk.operator.api.config.workflow.WorkflowSpec;
1313
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1414
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
@@ -49,7 +49,7 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, String name,
4949
Map<DependentResourceSpec, Object> configurations,
5050
String fieldManager,
5151
ConfigurationService configurationService,
52-
InformerConfigHolder<P> informerConfig,
52+
InformerConfiguration<P> informerConfig,
5353
WorkflowSpec workflowSpec) {
5454
this(resourceClass, name, generationAware, associatedReconcilerClassName, retry, rateLimiter,
5555
maxReconciliationInterval, finalizer, configurations, fieldManager,
@@ -62,7 +62,7 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
6262
RateLimiter rateLimiter, Duration maxReconciliationInterval, String finalizer,
6363
Map<DependentResourceSpec, Object> configurations,
6464
String fieldManager,
65-
ConfigurationService configurationService, InformerConfigHolder<P> informerConfig) {
65+
ConfigurationService configurationService, InformerConfiguration<P> informerConfig) {
6666
super(resourceClass, informerConfig);
6767
this.configurationService = configurationService;
6868
this.name = ControllerConfiguration.ensureValidName(name, associatedReconcilerClassName);
@@ -81,7 +81,7 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
8181
Class<? extends Reconciler> reconcilerClas, ConfigurationService configurationService) {
8282
this(resourceClass, name, false, getAssociatedReconcilerClassName(reconcilerClas), null, null,
8383
null, null, null, null, configurationService,
84-
InformerConfigHolder.builder(resourceClass).buildForController());
84+
InformerConfiguration.builder(resourceClass).buildForController());
8585
}
8686

8787
public static Duration getMaxReconciliationInterval(long interval, TimeUnit timeUnit) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import io.fabric8.kubernetes.client.informers.cache.ItemStore;
1111
import io.javaoperatorsdk.operator.OperatorException;
1212
import io.javaoperatorsdk.operator.ReconcilerUtils;
13-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
13+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
1414
import io.javaoperatorsdk.operator.api.reconciler.Constants;
1515
import io.javaoperatorsdk.operator.processing.event.source.cache.BoundedItemStore;
1616
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
@@ -26,7 +26,7 @@ default String getResourceTypeName() {
2626
return ReconcilerUtils.getResourceTypeName(getResourceClass());
2727
}
2828

29-
InformerConfigHolder<R> getInformerConfig();
29+
InformerConfiguration<R> getInformerConfig();
3030

3131
default Optional<OnAddFilter<? super R>> onAddFilter() {
3232
return Optional.ofNullable(getInformerConfig().getOnAddFilter());

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfigHolder.java renamed to ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
@SuppressWarnings("unused")
19-
public class InformerConfigHolder<R extends HasMetadata> {
19+
public class InformerConfiguration<R extends HasMetadata> {
2020
private final Builder builder = new Builder();
2121
private String name;
2222
private Set<String> namespaces;
@@ -29,7 +29,7 @@ public class InformerConfigHolder<R extends HasMetadata> {
2929
private ItemStore<R> itemStore;
3030
private Long informerListLimit;
3131

32-
public InformerConfigHolder(String name, Set<String> namespaces,
32+
public InformerConfiguration(String name, Set<String> namespaces,
3333
boolean followControllerNamespacesOnChange,
3434
String labelSelector, OnAddFilter<? super R> onAddFilter,
3535
OnUpdateFilter<? super R> onUpdateFilter, OnDeleteFilter<? super R> onDeleteFilter,
@@ -46,23 +46,23 @@ public InformerConfigHolder(String name, Set<String> namespaces,
4646
this.informerListLimit = informerListLimit;
4747
}
4848

49-
private InformerConfigHolder() {}
49+
private InformerConfiguration() {}
5050

5151
@SuppressWarnings({"rawtypes", "unchecked"})
52-
public static <R extends HasMetadata> InformerConfigHolder<R>.Builder builder() {
53-
return new InformerConfigHolder().builder;
52+
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder() {
53+
return new InformerConfiguration().builder;
5454
}
5555

5656
@SuppressWarnings({"rawtypes", "unchecked"})
57-
public static <R extends HasMetadata> InformerConfigHolder<R>.Builder builder(
57+
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
5858
Class<R> resourceClass) {
59-
return new InformerConfigHolder().builder;
59+
return new InformerConfiguration().builder;
6060
}
6161

6262
@SuppressWarnings({"rawtypes", "unchecked"})
63-
public static <R extends HasMetadata> InformerConfigHolder<R>.Builder builder(
64-
InformerConfigHolder<R> original) {
65-
return new InformerConfigHolder(original.name, original.namespaces,
63+
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
64+
InformerConfiguration<R> original) {
65+
return new InformerConfiguration(original.name, original.namespaces,
6666
original.followControllerNamespacesOnChange, original.labelSelector, original.onAddFilter,
6767
original.onUpdateFilter, original.onDeleteFilter, original.genericFilter,
6868
original.itemStore, original.informerListLimit).builder;
@@ -112,29 +112,29 @@ public Long getInformerListLimit() {
112112
@SuppressWarnings("UnusedReturnValue")
113113
public class Builder {
114114

115-
public InformerConfigHolder<R> buildForController() {
115+
public InformerConfiguration<R> buildForController() {
116116
// if the informer config uses the default "same as controller" value, reset the namespaces to
117117
// the default set for controllers
118118
if (namespaces == null || namespaces.isEmpty()
119119
|| InformerEventSourceConfiguration.inheritsNamespacesFromController(namespaces)) {
120120
namespaces = Constants.DEFAULT_NAMESPACES_SET;
121121
}
122-
return InformerConfigHolder.this;
122+
return InformerConfiguration.this;
123123
}
124124

125-
public InformerConfigHolder<R> buildForInformerEventSource() {
125+
public InformerConfiguration<R> buildForInformerEventSource() {
126126
if (namespaces == null || namespaces.isEmpty()) {
127127
namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
128128
}
129129
if (followControllerNamespacesOnChange == null) {
130130
followControllerNamespacesOnChange =
131131
InformerEventSourceConfiguration.DEFAULT_FOLLOW_CONTROLLER_NAMESPACES_ON_CHANGE;
132132
}
133-
return InformerConfigHolder.this;
133+
return InformerConfiguration.this;
134134
}
135135

136136
@SuppressWarnings({"unchecked"})
137-
public InformerConfigHolder<R>.Builder initFromAnnotation(Informer informerConfig,
137+
public InformerConfiguration<R>.Builder initFromAnnotation(Informer informerConfig,
138138
String context) {
139139
if (informerConfig != null) {
140140

@@ -178,12 +178,12 @@ public InformerConfigHolder<R>.Builder initFromAnnotation(Informer informerConfi
178178
}
179179

180180
public Builder withName(String name) {
181-
InformerConfigHolder.this.name = name;
181+
InformerConfiguration.this.name = name;
182182
return this;
183183
}
184184

185185
public Builder withNamespaces(Set<String> namespaces) {
186-
InformerConfigHolder.this.namespaces =
186+
InformerConfiguration.this.namespaces =
187187
ResourceConfiguration.ensureValidNamespaces(namespaces);
188188
return this;
189189
}
@@ -232,48 +232,48 @@ public Builder withWatchCurrentNamespace() {
232232
* @return the builder instance so that calls can be chained fluently
233233
*/
234234
public Builder withFollowControllerNamespacesOnChange(boolean followChanges) {
235-
InformerConfigHolder.this.followControllerNamespacesOnChange =
235+
InformerConfiguration.this.followControllerNamespacesOnChange =
236236
followChanges;
237237
return this;
238238
}
239239

240240
public Builder withLabelSelector(String labelSelector) {
241-
InformerConfigHolder.this.labelSelector =
241+
InformerConfiguration.this.labelSelector =
242242
ResourceConfiguration.ensureValidLabelSelector(labelSelector);
243243
return this;
244244
}
245245

246246
public Builder withOnAddFilter(
247247
OnAddFilter<? super R> onAddFilter) {
248-
InformerConfigHolder.this.onAddFilter = onAddFilter;
248+
InformerConfiguration.this.onAddFilter = onAddFilter;
249249
return this;
250250
}
251251

252252
public Builder withOnUpdateFilter(
253253
OnUpdateFilter<? super R> onUpdateFilter) {
254-
InformerConfigHolder.this.onUpdateFilter = onUpdateFilter;
254+
InformerConfiguration.this.onUpdateFilter = onUpdateFilter;
255255
return this;
256256
}
257257

258258
public Builder withOnDeleteFilter(
259259
OnDeleteFilter<? super R> onDeleteFilter) {
260-
InformerConfigHolder.this.onDeleteFilter = onDeleteFilter;
260+
InformerConfiguration.this.onDeleteFilter = onDeleteFilter;
261261
return this;
262262
}
263263

264264
public Builder withGenericFilter(
265265
GenericFilter<? super R> genericFilter) {
266-
InformerConfigHolder.this.genericFilter = genericFilter;
266+
InformerConfiguration.this.genericFilter = genericFilter;
267267
return this;
268268
}
269269

270270
public Builder withItemStore(ItemStore<R> itemStore) {
271-
InformerConfigHolder.this.itemStore = itemStore;
271+
InformerConfiguration.this.itemStore = itemStore;
272272
return this;
273273
}
274274

275275
public Builder withInformerListLimit(Long informerListLimit) {
276-
InformerConfigHolder.this.informerListLimit = informerListLimit;
276+
InformerConfiguration.this.informerListLimit = informerListLimit;
277277
return this;
278278
}
279279
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected DefaultInformerEventSourceConfiguration(
9292
GroupVersionKind groupVersionKind,
9393
PrimaryToSecondaryMapper<?> primaryToSecondaryMapper,
9494
SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper,
95-
InformerConfigHolder<R> informerConfig) {
95+
InformerConfiguration<R> informerConfig) {
9696
super(resourceClass, informerConfig);
9797
this.groupVersionKind = groupVersionKind;
9898
this.primaryToSecondaryMapper = primaryToSecondaryMapper;
@@ -141,7 +141,7 @@ class Builder<R extends HasMetadata> {
141141
private final Class<R> resourceClass;
142142
private final GroupVersionKind groupVersionKind;
143143
private final Class<? extends HasMetadata> primaryResourceClass;
144-
private final InformerConfigHolder<R>.Builder config;
144+
private final InformerConfiguration<R>.Builder config;
145145
private String name;
146146
private PrimaryToSecondaryMapper<?> primaryToSecondaryMapper;
147147
private SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
@@ -162,11 +162,11 @@ private Builder(Class<R> resourceClass,
162162
this.resourceClass = resourceClass;
163163
this.groupVersionKind = groupVersionKind;
164164
this.primaryResourceClass = primaryResourceClass;
165-
this.config = InformerConfigHolder.builder(resourceClass);
165+
this.config = InformerConfiguration.builder(resourceClass);
166166
}
167167

168168
public Builder<R> withInformerConfiguration(
169-
Consumer<InformerConfigHolder<R>.Builder> configurator) {
169+
Consumer<InformerConfiguration<R>.Builder> configurator) {
170170
configurator.accept(config);
171171
return this;
172172
}
@@ -197,7 +197,7 @@ public SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
197197
return secondaryToPrimaryMapper;
198198
}
199199

200-
public void updateFrom(InformerConfigHolder<R> informerConfig) {
200+
public void updateFrom(InformerConfiguration<R> informerConfig) {
201201
if (informerConfig != null) {
202202
final var informerConfigName = informerConfig.getName();
203203
if (informerConfigName != null) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.javaoperatorsdk.operator.api.config.Utils;
66
import io.javaoperatorsdk.operator.api.config.dependent.ConfigurationConverter;
77
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
8-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
8+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
99

1010
import static io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig.DEFAULT_CREATE_RESOURCE_ONLY_IF_NOT_EXISTING_WITH_SSA;
1111

@@ -36,14 +36,14 @@ public KubernetesDependentResourceConfig<R> configFrom(KubernetesDependent confi
3636
}
3737

3838
@SuppressWarnings({"unchecked"})
39-
private InformerConfigHolder<R> createInformerConfig(
39+
private InformerConfiguration<R> createInformerConfig(
4040
KubernetesDependent configAnnotation,
4141
DependentResourceSpec<R, P, KubernetesDependentResourceConfig<R>> spec,
4242
ControllerConfiguration<? extends HasMetadata> controllerConfig) {
4343
Class<? extends KubernetesDependentResource<?, ?>> dependentResourceClass =
4444
(Class<? extends KubernetesDependentResource<?, ?>>) spec.getDependentResourceClass();
4545

46-
InformerConfigHolder<R>.Builder config = InformerConfigHolder.builder();
46+
InformerConfiguration<R>.Builder config = InformerConfiguration.builder();
4747
if (configAnnotation != null) {
4848
final var informerConfig = configAnnotation.informer();
4949
final var context = Utils.contextFor(controllerConfig, dependentResourceClass,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44
import io.fabric8.kubernetes.api.model.HasMetadata;
5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
5+
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
66

77

88
public class KubernetesDependentResourceConfig<R extends HasMetadata> {
@@ -11,12 +11,12 @@ public class KubernetesDependentResourceConfig<R extends HasMetadata> {
1111

1212
private final Boolean useSSA;
1313
private final boolean createResourceOnlyIfNotExistingWithSSA;
14-
private final InformerConfigHolder<R> informerConfig;
14+
private final InformerConfiguration<R> informerConfig;
1515

1616
public KubernetesDependentResourceConfig(
1717
Boolean useSSA,
1818
boolean createResourceOnlyIfNotExistingWithSSA,
19-
InformerConfigHolder<R> informerConfig) {
19+
InformerConfiguration<R> informerConfig) {
2020
this.useSSA = useSSA;
2121
this.createResourceOnlyIfNotExistingWithSSA = createResourceOnlyIfNotExistingWithSSA;
2222
this.informerConfig = informerConfig;
@@ -30,7 +30,7 @@ public Boolean useSSA() {
3030
return useSSA;
3131
}
3232

33-
public InformerConfigHolder<R> informerConfig() {
33+
public InformerConfiguration<R> informerConfig() {
3434
return informerConfig;
3535
}
3636
}

0 commit comments

Comments
 (0)