fix: make it easier to support new field when overriding configuration

Author: metacosm

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

@@ -15,28 +15,19 @@ public class ConfigurationServiceOverrider {
   private final ConfigurationService original;
   private Metrics metrics;
   private Config clientConfig;
-  private boolean checkCR;
-  private int threadNumber;
+  private Boolean checkCR;
+  private Integer threadNumber;
   private Cloner cloner;
-  private int timeoutSeconds;
-  private boolean closeClientOnStop;
+  private Integer timeoutSeconds;
+  private Boolean closeClientOnStop;
   private ObjectMapper objectMapper;
-  private ExecutorService executorService = null;
+  private ExecutorService executorService;
   private LeaderElectionConfiguration leaderElectionConfiguration;
 
   ConfigurationServiceOverrider(ConfigurationService original) {
     this.original = original;
-    this.clientConfig = original.getClientConfiguration();
-    this.checkCR = original.checkCRDAndValidateLocalModel();
-    this.threadNumber = original.concurrentReconciliationThreads();
-    this.cloner = original.getResourceCloner();
-    this.timeoutSeconds = original.getTerminationTimeoutSeconds();
-    this.metrics = original.getMetrics();
-    this.closeClientOnStop = original.closeClientOnStop();
-    this.objectMapper = original.getObjectMapper();
   }
 
-
   public ConfigurationServiceOverrider withClientConfiguration(Config configuration) {
     this.clientConfig = configuration;
     return this;
@@ -97,51 +88,48 @@ public Set<String> getKnownReconcilerNames() {
 
       @Override
       public Config getClientConfiguration() {
-        return clientConfig;
+        return clientConfig != null ? clientConfig : original.getClientConfiguration();
       }
 
       @Override
       public boolean checkCRDAndValidateLocalModel() {
-        return checkCR;
+        return checkCR != null ? checkCR : original.checkCRDAndValidateLocalModel();
       }
 
       @Override
       public int concurrentReconciliationThreads() {
-        return threadNumber;
+        return threadNumber != null ? threadNumber : original.concurrentReconciliationThreads();
       }
 
       @Override
       public int getTerminationTimeoutSeconds() {
-        return timeoutSeconds;
+        return timeoutSeconds != null ? timeoutSeconds : original.getTerminationTimeoutSeconds();
       }
 
       @Override
       public Metrics getMetrics() {
-        return metrics;
+        return metrics != null ? metrics : original.getMetrics();
       }
 
       @Override
       public boolean closeClientOnStop() {
-        return closeClientOnStop;
+        return closeClientOnStop != null ? closeClientOnStop : original.closeClientOnStop();
       }
 
       @Override
       public ExecutorService getExecutorService() {
-        if (executorService != null) {
-          return executorService;
-        } else {
-          return super.getExecutorService();
-        }
+        return executorService != null ? executorService : original.getExecutorService();
       }
 
       @Override
       public ObjectMapper getObjectMapper() {
-        return objectMapper;
+        return objectMapper != null ? objectMapper : original.getObjectMapper();
       }
 
       @Override
       public Optional<LeaderElectionConfiguration> getLeaderElectionConfiguration() {
-        return Optional.ofNullable(leaderElectionConfiguration);
+        return leaderElectionConfiguration != null ? Optional.of(leaderElectionConfiguration)
+            : original.getLeaderElectionConfiguration();
       }
     };
   }

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

@@ -45,12 +45,14 @@ private static void set(ConfigurationService instance, boolean overriding) {
     ConfigurationServiceProvider.instance = instance;
   }
 
-  public synchronized static void overrideCurrent(
+  public synchronized static ConfigurationService overrideCurrent(
       Consumer<ConfigurationServiceOverrider> overrider) {
-    final var toOverride =
-        new ConfigurationServiceOverrider(ConfigurationServiceProvider.instance());
-    overrider.accept(toOverride);
-    ConfigurationServiceProvider.set(toOverride.build(), true);
+    if (overrider != null) {
+      final var toOverride = new ConfigurationServiceOverrider(instance());
+      overrider.accept(toOverride);
+      set(toOverride.build(), true);
+    }
+    return instance();
   }
 
   public synchronized static void setDefault(ConfigurationService defaultConfigurationService) {

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

@@ -34,17 +34,23 @@ void shouldProvideTheSetInstanceIfProvided() {
 
   @Test
   void shouldBePossibleToOverrideConfigOnce() {
-    final var config = new AbstractConfigurationService(null);
+    final var config = new ConfigurationServiceOverrider(new AbstractConfigurationService(null))
+        .withLeaderElectionConfiguration(new LeaderElectionConfiguration("bar", "barNS"))
+        .build();
     assertFalse(config.checkCRDAndValidateLocalModel());
+    assertEquals("bar", config.getLeaderElectionConfiguration().orElseThrow().getLeaseName());
 
     ConfigurationServiceProvider.set(config);
     var instance = ConfigurationServiceProvider.instance();
     assertEquals(config, instance);
 
-    ConfigurationServiceProvider.overrideCurrent(o -> o.checkingCRDAndValidateLocalModel(true));
+    final ConfigurationService overridden = ConfigurationServiceProvider.overrideCurrent(
+        o -> o.checkingCRDAndValidateLocalModel(true));
     instance = ConfigurationServiceProvider.instance();
+    assertEquals(overridden, instance);
     assertNotEquals(config, instance);
     assertTrue(instance.checkCRDAndValidateLocalModel());
+    assertEquals("bar", instance.getLeaderElectionConfiguration().orElseThrow().getLeaseName());
 
     assertThrows(IllegalStateException.class,
         () -> ConfigurationServiceProvider.overrideCurrent(o -> o.withCloseClientOnStop(false)));