Skip to content

Commit 9d686b8

Browse files
committed
fixes
1 parent c1e515b commit 9d686b8

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Set;
44

5+
import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES;
6+
57
public interface NamespaceChangeable {
68

79
/**
@@ -16,7 +18,7 @@ public interface NamespaceChangeable {
1618

1719
default void changeNamespaces(String... namespaces) {
1820
changeNamespaces(
19-
namespaces != null ? Set.of(namespaces) : ResourceConfiguration.DEFAULT_NAMESPACES);
21+
namespaces != null ? Set.of(namespaces) : DEFAULT_NAMESPACES);
2022
}
2123

2224
default boolean allowsNamespaceChanges() {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
1111
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
1212

13+
import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES;
14+
1315
public interface InformerConfiguration<R extends HasMetadata>
1416
extends ResourceConfiguration<R> {
1517

@@ -71,7 +73,7 @@ public InformerConfigurationBuilder<R> withSecondaryToPrimaryMapper(
7173

7274
public InformerConfigurationBuilder<R> withNamespaces(String... namespaces) {
7375
return withNamespaces(
74-
namespaces != null ? Set.of(namespaces) : ResourceConfiguration.DEFAULT_NAMESPACES);
76+
namespaces != null ? Set.of(namespaces) : DEFAULT_NAMESPACES);
7577
}
7678

7779
public InformerConfigurationBuilder<R> withNamespaces(Set<String> namespaces) {
@@ -90,7 +92,7 @@ public InformerConfigurationBuilder<R> withNamespaces(Set<String> namespaces) {
9092
*/
9193
public InformerConfigurationBuilder<R> withNamespaces(Set<String> namespaces,
9294
boolean followChanges) {
93-
this.namespaces = namespaces != null ? namespaces : ResourceConfiguration.DEFAULT_NAMESPACES;
95+
this.namespaces = namespaces != null ? namespaces : DEFAULT_NAMESPACES;
9496
this.inheritControllerNamespacesOnChange = true;
9597
return this;
9698
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Constants.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package io.javaoperatorsdk.operator.api.reconciler;
22

3+
import java.util.Collections;
34
import java.util.Set;
45

56
public final class Constants {
67

7-
public static final Set<String> DEFAULT_NAMESPACES = Set.of(Constants.WATCH_ALL_NAMESPACES);
8+
public static final Set<String> DEFAULT_NAMESPACES =
9+
Collections.singleton(Constants.WATCH_ALL_NAMESPACES);
810
public static final Set<String> WATCH_CURRENT_NAMESPACE_SET =
9-
Set.of(Constants.WATCH_CURRENT_NAMESPACE);
11+
Collections.singleton(Constants.WATCH_CURRENT_NAMESPACE);
1012

1113
public static final String NO_VALUE_SET = "";
1214
public static final String WATCH_CURRENT_NAMESPACE = "JOSDK_WATCH_CURRENT";

0 commit comments

Comments
 (0)