wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

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

@@ -27,7 +27,11 @@
 
 public class ConfigLoader {
 
-  public static final ConfigLoader DEFAULT = new ConfigLoader();
+  private static final ConfigLoader DEFAULT = new ConfigLoader();
+
+  public static ConfigLoader getDefault() {
+    return DEFAULT;
+  }
 
   public static final String DEFAULT_OPERATOR_KEY_PREFIX = "josdk.";
   public static final String DEFAULT_CONTROLLER_KEY_PREFIX = "josdk.controller.";
@@ -179,7 +183,6 @@ Consumer<ControllerConfigurationOverrider<R>> applyControllerConfigs(String cont
     if (retryStep != null) {
       consumer = consumer == null ? retryStep : consumer.andThen(retryStep);
     }
-
     return consumer;
   }
 
@@ -235,7 +238,7 @@ private <O> Consumer<O> buildConsumer(List<ConfigBinding<O, ?>> bindings, String
         consumer = consumer == null ? step : consumer.andThen(step);
       }
     }
-    return consumer;
+    return consumer == null ? o -> {} : consumer;
   }
 
   /**

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

@@ -44,9 +44,17 @@ public <T> Optional<T> getValue(String key, Class<T> type) {
   // -- applyConfigs -----------------------------------------------------------
 
   @Test
-  void applyConfigsReturnsNullWhenNothingConfigured() {
+  void applyConfigsReturnsNoOpWhenNothingConfigured() {
     var loader = new ConfigLoader(mapProvider(Map.of()));
-    assertThat(loader.applyConfigs()).isNull();
+    var base = new BaseConfigurationService(null);
+    // consumer must be non-null and must leave all defaults unchanged
+    var consumer = loader.applyConfigs();
+    assertThat(consumer).isNotNull();
+    var result = ConfigurationService.newOverriddenConfigurationService(base, consumer);
+    assertThat(result.concurrentReconciliationThreads())
+        .isEqualTo(base.concurrentReconciliationThreads());
+    assertThat(result.concurrentWorkflowExecutorThreads())
+        .isEqualTo(base.concurrentWorkflowExecutorThreads());
   }
 
   @Test
@@ -129,9 +137,9 @@ void applyConfigsOnlyAppliesPresentKeys() {
   // -- applyControllerConfigs -------------------------------------------------
 
   @Test
-  void applyControllerConfigsReturnsNullWhenNothingConfigured() {
+  void applyControllerConfigsReturnsNoOpWhenNothingConfigured() {
     var loader = new ConfigLoader(mapProvider(Map.of()));
-    assertThat(loader.applyControllerConfigs("my-controller")).isNull();
+    assertThat(loader.applyControllerConfigs("my-controller")).isNotNull();
   }
 
   @Test
@@ -163,8 +171,8 @@ void applyControllerConfigsIsolatesControllersByName() {
     // alpha gets a consumer (key found), beta gets a consumer (key found)
     assertThat(loader.applyControllerConfigs("alpha")).isNotNull();
     assertThat(loader.applyControllerConfigs("beta")).isNotNull();
-    // a controller with no configured keys gets null
-    assertThat(loader.applyControllerConfigs("gamma")).isNull();
+    // a controller with no configured keys still gets a non-null no-op consumer
+    assertThat(loader.applyControllerConfigs("gamma")).isNotNull();
   }
 
   @Test

sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

@@ -28,14 +28,14 @@
 public class TomcatOperator {
 
   public static void main(String[] args) throws IOException {
-
-    Operator operator = new Operator(ConfigLoader.DEFAULT.applyConfigs());
+    var configLoader = ConfigLoader.getDefault();
+    Operator operator = new Operator(configLoader.applyConfigs());
     operator.register(
         new TomcatReconciler(),
-        ConfigLoader.DEFAULT.applyControllerConfigs(TomcatReconciler.TOMCAT_CONTROLLER_NAME));
+        configLoader.applyControllerConfigs(TomcatReconciler.TOMCAT_CONTROLLER_NAME));
     operator.register(
         new WebappReconciler(operator.getKubernetesClient()),
-        ConfigLoader.DEFAULT.applyControllerConfigs(WebappReconciler.WEBAPP_CONTROLLER_NAME));
+        configLoader.applyControllerConfigs(WebappReconciler.WEBAPP_CONTROLLER_NAME));
     operator.start();
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD.")), 8080).start(Exit.NEVER);