From f627a47f9d84bec9fb441a7129fbc2a4a0148495 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= <a_meszaros@apple.com>
Date: Fri, 23 May 2025 15:04:23 +0200
Subject: [PATCH 1/2] improve: add InformerEventSourceConfiguration
 withNamespaces overloaded version
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
---
 .../config/informer/InformerEventSourceConfiguration.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
index 9fb5ad4c82..118f60accb 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
@@ -194,6 +194,11 @@ public Builder<R> withNamespaces(Set<String> namespaces) {
       return this;
     }
 
+    public Builder<R> withNamespaces(String... namespaces) {
+      config.withNamespaces(Set.of(namespaces));
+      return this;
+    }
+
     public Builder<R> withNamespacesInheritedFromController() {
       withNamespaces(SAME_AS_CONTROLLER_NAMESPACES_SET);
       return this;

From 71df44e1527d93c9db590576195dbf728e4f02ab Mon Sep 17 00:00:00 2001
From: Chris Laprun <claprun@redhat.com>
Date: Mon, 26 May 2025 09:13:49 +0200
Subject: [PATCH 2/2] test: check that empty vararg doesn't throw NPE

Signed-off-by: Chris Laprun <claprun@redhat.com>
---
 .../InformerEventSourceConfiguration.java        |  3 +++
 .../ControllerConfigurationOverriderTest.java    | 16 ++++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
index 118f60accb..2369d5f523 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java
@@ -194,6 +194,9 @@ public Builder<R> withNamespaces(Set<String> namespaces) {
       return this;
     }
 
+    /**
+     * @since 5.1.1
+     */
     public Builder<R> withNamespaces(String... namespaces) {
       config.withNamespaces(Set.of(namespaces));
       return this;
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
index 49d0b76017..837ad7463a 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
@@ -89,6 +89,22 @@ private io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> create
     return configurationService.configFor(reconciler);
   }
 
+  @Test
+  void overridingNamespacesShouldNotThrowNPE() {
+    var configuration = createConfiguration(new NullReconciler());
+    configuration =
+        ControllerConfigurationOverrider.override(configuration).settingNamespaces().build();
+    assertTrue(configuration.getInformerConfig().watchAllNamespaces());
+  }
+
+  private static class NullReconciler implements Reconciler<HasMetadata> {
+    @Override
+    public UpdateControl<HasMetadata> reconcile(HasMetadata resource, Context<HasMetadata> context)
+        throws Exception {
+      return null;
+    }
+  }
+
   @Test
   void overridingNamespacesShouldWork() {
     var configuration = createConfiguration(new WatchCurrentReconciler());