refactor: rename more appropriately

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -14,7 +14,12 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.KubernetesClientBuilder;
 import io.fabric8.kubernetes.client.Version;
-import io.javaoperatorsdk.operator.api.config.*;
+import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
+import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.processing.Controller;
 import io.javaoperatorsdk.operator.processing.LifecycleAware;
@@ -53,7 +58,7 @@ public Operator(Consumer<ConfigurationServiceOverrider> overrider) {
   }
 
   public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
-    this(client, ConfigurationService.overrideCurrent(new BaseConfigurationService(), overrider));
+    this(client, ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(), overrider));
   }
 
   /**

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

@@ -253,13 +253,13 @@ default ResourceClassResolver getResourceClassResolver() {
     return new DefaultResourceClassResolver();
   }
 
-  static ConfigurationService overrideCurrent(ConfigurationService service,
+  static ConfigurationService newOverriddenConfigurationService(ConfigurationService baseConfiguration,
       Consumer<ConfigurationServiceOverrider> overrider) {
     if (overrider != null) {
-      final var toOverride = new ConfigurationServiceOverrider(service);
+      final var toOverride = new ConfigurationServiceOverrider(baseConfiguration);
       overrider.accept(toOverride);
       return toOverride.build();
     }
-    return service;
+    return baseConfiguration;
   }
 }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/LeaderElectionManagerTest.java

@@ -30,7 +30,7 @@ class LeaderElectionManagerTest {
   void setUp() {
     ControllerManager controllerManager = mock(ControllerManager.class);
     kubernetesClient = mock(KubernetesClient.class);
-    var configurationService = ConfigurationService.overrideCurrent(new BaseConfigurationService(),
+    var configurationService = ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(),
         o -> o.withLeaderElectionConfiguration(new LeaderElectionConfiguration("test")));
     var execServiceManager = new ExecutorServiceManager(configurationService);
     execServiceManager.init();

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/ControllerTest.java

@@ -4,13 +4,20 @@
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.javaoperatorsdk.operator.MockKubernetesClient;
-import io.javaoperatorsdk.operator.api.config.*;
+import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
+import io.javaoperatorsdk.operator.api.config.MockControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.withSettings;
 
 @SuppressWarnings({"unchecked", "rawtypes"})
 class ControllerTest {
@@ -36,7 +43,7 @@ void crdShouldNotBeCheckedForNativeResources() {
   void crdShouldNotBeCheckedForCustomResourcesIfDisabled() {
     final var client = MockKubernetesClient.client(TestCustomResource.class);
     ConfigurationService configurationService =
-        ConfigurationService.overrideCurrent(new BaseConfigurationService(),
+        ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(),
             o -> o.checkingCRDAndValidateLocalModel(false));
 
     final var configuration =

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventProcessorTest.java

@@ -15,7 +15,11 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.config.*;
+import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
+import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
 import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
@@ -432,7 +436,7 @@ void executionOfReconciliationShouldNotStartIfProcessorStopped() throws Interrup
         });
 
     var execManager = new ExecutorServiceManager(
-            ConfigurationService.overrideCurrent(new BaseConfigurationService(),
+            ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(),
                     o -> { o.withConcurrentReconciliationThreads(1);
                 o.withMinConcurrentReconciliationThreads(1);
             }));

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

@@ -21,7 +21,12 @@
 import io.javaoperatorsdk.operator.MockKubernetesClient;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.TestUtils;
-import io.javaoperatorsdk.operator.api.config.*;
+import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
+import io.javaoperatorsdk.operator.api.config.Cloner;
+import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
+import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
+import io.javaoperatorsdk.operator.api.config.MockControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
@@ -76,7 +81,7 @@ static void classSetup() {
      * equals will fail on the two equal but NOT identical TestCustomResources because equals is not
      * implemented on TestCustomResourceSpec or TestCustomResourceStatus
      */
-    configurationService = ConfigurationService.overrideCurrent(new BaseConfigurationService(),
+    configurationService = ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(),
         overrider -> overrider.checkingCRDAndValidateLocalModel(false)
             .withResourceCloner(new Cloner() {
               @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

@@ -25,7 +25,12 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 @SuppressWarnings({"rawtypes", "unchecked"})
 class InformerEventSourceTest {
@@ -246,7 +251,7 @@ void filtersOnDeleteEvents() {
   void informerStoppedHandlerShouldBeCalledWhenInformerStops() {
     final var exception = new RuntimeException("Informer stopped exceptionally!");
     final var informerStoppedHandler = mock(InformerStoppedHandler.class);
-    var configuration = ConfigurationService.overrideCurrent(new BaseConfigurationService(),
+    var configuration = ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(),
         o -> o.withInformerStoppedHandler(informerStoppedHandler));
 
     informerEventSource = new InformerEventSource<>(informerConfiguration,

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/AbstractOperatorExtension.java

@@ -10,7 +10,11 @@
 import java.util.function.Consumer;
 
 import org.awaitility.Awaitility;
-import org.junit.jupiter.api.extension.*;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -256,7 +260,7 @@ public T oneNamespacePerClass(boolean value) {
     }
 
     public T withConfigurationService(Consumer<ConfigurationServiceOverrider> overrider) {
-      configurationService = ConfigurationService.overrideCurrent(configurationService, overrider);
+      configurationService = ConfigurationService.newOverriddenConfigurationService(configurationService, overrider);
       return (T) this;
     }