Skip to content

Commit b25a399

Browse files
csvirimetacosm
andauthored
improve: naming InformerConfiguration build (#2671)
* improve: naming informer event source Signed-off-by: Attila Mészáros <[email protected]> * fix: add link to method Signed-off-by: Chris Laprun <[email protected]> --------- Signed-off-by: Attila Mészáros <[email protected]> Signed-off-by: Chris Laprun <[email protected]> Co-authored-by: Chris Laprun <[email protected]>
1 parent 3e584f6 commit b25a399

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ public Long getInformerListLimit() {
249249
@SuppressWarnings("UnusedReturnValue")
250250
public class Builder {
251251

252+
/** For internal usage only. Use {@link #build()} method for building for InformerEventSource */
252253
public InformerConfiguration<R> buildForController() {
253254
// if the informer config uses the default "same as controller" value, reset the namespaces to
254255
// the default set for controllers
@@ -261,7 +262,8 @@ public InformerConfiguration<R> buildForController() {
261262
return InformerConfiguration.this;
262263
}
263264

264-
public InformerConfiguration<R> buildForInformerEventSource() {
265+
/** Build for InformerEventSource */
266+
public InformerConfiguration<R> build() {
265267
if (namespaces == null || namespaces.isEmpty()) {
266268
namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
267269
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public InformerEventSourceConfiguration<R> build() {
219219
Objects.requireNonNullElse(secondaryToPrimaryMapper,
220220
Mappers.fromOwnerReferences(HasMetadata.getApiVersion(primaryResourceClass),
221221
HasMetadata.getKind(primaryResourceClass), false)),
222-
config.buildForInformerEventSource(), kubernetesClient);
222+
config.build(), kubernetesClient);
223223
}
224224
}
225225
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@ private InformerConfiguration<R> createInformerConfig(
5353
configAnnotation.annotationType());
5454
config = config.initFromAnnotation(informerConfig, context);
5555
}
56-
return config.buildForInformerEventSource();
56+
return config.build();
5757
}
5858
}

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void replaceNamedDependentResourceConfigShouldWork() {
279279
final var overridingInformerConfig = InformerConfiguration.builder(ConfigMap.class)
280280
.withNamespaces(Set.of(overriddenNS))
281281
.withLabelSelector(labelSelector)
282-
.buildForInformerEventSource();
282+
.build();
283283
final var overridden = ControllerConfigurationOverrider.override(configuration)
284284
.replacingNamedDependentResourceConfig(
285285
dependentResourceName,

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/InformerConfigurationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void currentNamespaceWatched() {
4848
@Test
4949
void nullLabelSelectorByDefault() {
5050
final var informerConfig =
51-
InformerConfiguration.builder(ConfigMap.class).buildForInformerEventSource();
51+
InformerConfiguration.builder(ConfigMap.class).build();
5252
assertNull(informerConfig.getLabelSelector());
5353
}
5454

@@ -61,7 +61,7 @@ void shouldWatchAllNamespacesByDefaultForControllers() {
6161
@Test
6262
void shouldFollowControllerNamespacesByDefaultForInformerEventSource() {
6363
final var informerConfig =
64-
InformerConfiguration.builder(ConfigMap.class).buildForInformerEventSource();
64+
InformerConfiguration.builder(ConfigMap.class).build();
6565
assertTrue(informerConfig.isFollowControllerNamespacesOnChange());
6666
}
6767

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ private void initDependentResources(KubernetesClient client) {
8888
.forEach(dr -> dr.configureWith(new KubernetesDependentResourceConfigBuilder()
8989
.withKubernetesDependentInformerConfig(InformerConfiguration.builder(dr.resourceType())
9090
.withLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR)
91-
.buildForInformerEventSource())
91+
.build())
9292
.build()));
9393
}
9494

sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private Workflow<WebPage> createDependentResourcesAndWorkflow() {
9898
.forEach(dr -> dr.configureWith(new KubernetesDependentResourceConfigBuilder()
9999
.withKubernetesDependentInformerConfig(InformerConfiguration.builder(dr.resourceType())
100100
.withLabelSelector(SELECTOR + "=true")
101-
.buildForInformerEventSource())
101+
.build())
102102
.build()));
103103

104104
// connect the dependent resources into a workflow, configuring them as we go

0 commit comments

Comments
 (0)