Skip to content

Commit 5daa54d

Browse files
committed
improve: follow namespace changes method naming:
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 3e584f6 commit 5daa54d

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class InformerConfiguration<R extends HasMetadata> {
2929
private final String resourceTypeName;
3030
private String name;
3131
private Set<String> namespaces;
32-
private Boolean followControllerNamespacesOnChange;
32+
private Boolean followControllerNamespacesChanges;
3333
private String labelSelector;
3434
private OnAddFilter<? super R> onAddFilter;
3535
private OnUpdateFilter<? super R> onUpdateFilter;
@@ -46,7 +46,7 @@ protected InformerConfiguration(Class<R> resourceClass, String name, Set<String>
4646
this(resourceClass);
4747
this.name = name;
4848
this.namespaces = namespaces;
49-
this.followControllerNamespacesOnChange = followControllerNamespacesOnChange;
49+
this.followControllerNamespacesChanges = followControllerNamespacesOnChange;
5050
this.labelSelector = labelSelector;
5151
this.onAddFilter = onAddFilter;
5252
this.onUpdateFilter = onUpdateFilter;
@@ -75,7 +75,7 @@ public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
7575
public static <R extends HasMetadata> InformerConfiguration<R>.Builder builder(
7676
InformerConfiguration<R> original) {
7777
return new InformerConfiguration(original.resourceClass, original.name, original.namespaces,
78-
original.followControllerNamespacesOnChange, original.labelSelector, original.onAddFilter,
78+
original.followControllerNamespacesChanges, original.labelSelector, original.onAddFilter,
7979
original.onUpdateFilter, original.onDeleteFilter, original.genericFilter,
8080
original.itemStore, original.informerListLimit).builder;
8181
}
@@ -184,8 +184,8 @@ public Set<String> getEffectiveNamespaces(ControllerConfiguration<?> controllerC
184184
*
185185
* @return if namespace changes should be followed
186186
*/
187-
public boolean isFollowControllerNamespacesOnChange() {
188-
return followControllerNamespacesOnChange;
187+
public boolean getFollowControllerNamespacesChanges() {
188+
return followControllerNamespacesChanges;
189189
}
190190

191191
/**
@@ -257,16 +257,16 @@ public InformerConfiguration<R> buildForController() {
257257
namespaces = Constants.DEFAULT_NAMESPACES_SET;
258258
}
259259
// to avoid potential NPE
260-
followControllerNamespacesOnChange = false;
260+
followControllerNamespacesChanges = false;
261261
return InformerConfiguration.this;
262262
}
263263

264264
public InformerConfiguration<R> buildForInformerEventSource() {
265265
if (namespaces == null || namespaces.isEmpty()) {
266266
namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET;
267267
}
268-
if (followControllerNamespacesOnChange == null) {
269-
followControllerNamespacesOnChange =
268+
if (followControllerNamespacesChanges == null) {
269+
followControllerNamespacesChanges =
270270
DEFAULT_FOLLOW_CONTROLLER_NAMESPACES_ON_CHANGE;
271271
}
272272
return InformerConfiguration.this;
@@ -302,7 +302,7 @@ public InformerConfiguration<R>.Builder initFromAnnotation(Informer informerConf
302302
GenericFilter.class,
303303
context));
304304

305-
withFollowControllerNamespacesOnChange(
305+
withFollowControllerNamespacesChanges(
306306
informerConfig.followControllerNamespacesOnChange());
307307

308308
withItemStore(Utils.instantiate(informerConfig.itemStore(),
@@ -342,7 +342,7 @@ public Set<String> namespaces() {
342342
* @return the builder instance so that calls can be chained fluently
343343
*/
344344
public Builder withNamespaces(Set<String> namespaces, boolean followChanges) {
345-
withNamespaces(namespaces).withFollowControllerNamespacesOnChange(followChanges);
345+
withNamespaces(namespaces).withFollowControllerNamespacesChanges(followChanges);
346346
return this;
347347
}
348348

@@ -370,8 +370,8 @@ public Builder withWatchCurrentNamespace() {
370370
* controller's namespaces are reconfigured, {@code false} otherwise
371371
* @return the builder instance so that calls can be chained fluently
372372
*/
373-
public Builder withFollowControllerNamespacesOnChange(boolean followChanges) {
374-
InformerConfiguration.this.followControllerNamespacesOnChange =
373+
public Builder withFollowControllerNamespacesChanges(boolean followChanges) {
374+
InformerConfiguration.this.followControllerNamespacesChanges =
375375
followChanges;
376376
return this;
377377
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ static Builder<GenericKubernetesResource> from(
3535
* @return if namespace changes should be followed
3636
*/
3737
default boolean followControllerNamespaceChanges() {
38-
return getInformerConfig().isFollowControllerNamespacesOnChange();
38+
return getInformerConfig().getFollowControllerNamespacesChanges();
3939
}
4040

4141
/**
@@ -194,8 +194,8 @@ public void updateFrom(InformerConfiguration<R> informerConfig) {
194194
this.name = informerConfigName;
195195
}
196196
config.withNamespaces(informerConfig.getNamespaces())
197-
.withFollowControllerNamespacesOnChange(
198-
informerConfig.isFollowControllerNamespacesOnChange())
197+
.withFollowControllerNamespacesChanges(
198+
informerConfig.getFollowControllerNamespacesChanges())
199199
.withLabelSelector(informerConfig.getLabelSelector())
200200
.withItemStore(informerConfig.getItemStore())
201201
.withOnAddFilter(informerConfig.getOnAddFilter())

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void shouldWatchAllNamespacesByDefaultForControllers() {
6262
void shouldFollowControllerNamespacesByDefaultForInformerEventSource() {
6363
final var informerConfig =
6464
InformerConfiguration.builder(ConfigMap.class).buildForInformerEventSource();
65-
assertTrue(informerConfig.isFollowControllerNamespacesOnChange());
65+
assertTrue(informerConfig.getFollowControllerNamespacesChanges());
6666
}
6767

6868
@Test

0 commit comments

Comments
 (0)