revert instance reference

Author: s-soroosh

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationService.java

@@ -9,9 +9,12 @@
 
 public class DefaultConfigurationService implements ConfigurationService {
 
+  private static final ConfigurationService instance = new DefaultConfigurationService();
   private final Map<String, ControllerConfiguration> configurations = new ConcurrentHashMap<>();
 
-  public static final ConfigurationService INSTANCE = new DefaultConfigurationService();
+  public static ConfigurationService instance() {
+    return instance;
+  }
 
   @Override
   public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(

operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java

@@ -54,7 +54,7 @@ public void initialize(
     CustomResourceDefinitionContext crdContext = CustomResourceDefinitionContext.fromCrd(crd);
     this.controller = controller;
 
-    final var configurationService = DefaultConfigurationService.INSTANCE;
+    final var configurationService = DefaultConfigurationService.instance();
 
     final var config = configurationService.getConfigurationFor(controller);
     Class doneableClass = config.getDoneableClass();

operator-framework/src/test/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationServiceTest.java

@@ -22,7 +22,8 @@ public class DefaultConfigurationServiceTest {
   @Test
   public void returnsValuesFromControllerAnnotationFinalizer() {
     final var controller = new TestCustomResourceController();
-    final var configuration = DefaultConfigurationService.INSTANCE.getConfigurationFor(controller);
+    final var configuration =
+        DefaultConfigurationService.instance().getConfigurationFor(controller);
     assertEquals(TestCustomResourceController.CRD_NAME, configuration.getCRDName());
     assertEquals(
         ControllerUtils.getDefaultFinalizerName(configuration.getCRDName()),
@@ -35,7 +36,8 @@ public void returnsValuesFromControllerAnnotationFinalizer() {
   @Test
   public void returnCustomerFinalizerNameIfSet() {
     final var controller = new TestCustomFinalizerController();
-    final var configuration = DefaultConfigurationService.INSTANCE.getConfigurationFor(controller);
+    final var configuration =
+        DefaultConfigurationService.instance().getConfigurationFor(controller);
     assertEquals(CUSTOM_FINALIZER_NAME, configuration.getFinalizer());
   }
 
@@ -44,7 +46,7 @@ public void supportsInnerClassCustomResources() {
     final var controller = new TestCustomFinalizerController();
     assertDoesNotThrow(
         () -> {
-          DefaultConfigurationService.INSTANCE.getConfigurationFor(controller).getDoneableClass();
+          DefaultConfigurationService.instance().getConfigurationFor(controller).getDoneableClass();
         });
   }
 

samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/MySQLSchemaOperator.java

@@ -23,7 +23,7 @@ public static void main(String[] args) throws IOException {
 
     Config config = new ConfigBuilder().withNamespace(null).build();
     KubernetesClient client = new DefaultKubernetesClient(config);
-    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
+    Operator operator = new Operator(client, DefaultConfigurationService.instance());
     operator.registerControllerForAllNamespaces(new SchemaController(client));
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);

samples/pure-java/src/main/java/io/javaoperatorsdk/operator/sample/PureJavaApplicationRunner.java

@@ -1,15 +1,19 @@
 package io.javaoperatorsdk.operator.sample;
 
-import io.fabric8.kubernetes.client.DefaultKubernetesClient;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.Operator;
-import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
+import java.util.concurrent.atomic.LongAccumulator;
 
 public class PureJavaApplicationRunner {
 
   public static void main(String[] args) {
-    KubernetesClient client = new DefaultKubernetesClient();
-    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
-    operator.registerController(new CustomServiceController(client));
+    //    KubernetesClient client = new DefaultKubernetesClient();
+    //    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
+    //    operator.registerController(new CustomServiceController(client));
+
+    final var acc = new LongAccumulator(Long::min, Integer.MAX_VALUE);
+    acc.accumulate(10);
+    acc.accumulate(20);
+    acc.accumulate(90);
+
+    System.out.println(acc.get());
   }
 }

samples/spring-boot-plain/src/main/java/io/javaoperatorsdk/operator/sample/Config.java

@@ -25,7 +25,7 @@ public CustomServiceController customServiceController(KubernetesClient client)
   //  Register all controller beans
   @Bean
   public Operator operator(KubernetesClient client, List<ResourceController> controllers) {
-    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
+    Operator operator = new Operator(client, DefaultConfigurationService.instance());
     controllers.forEach(c -> operator.registerControllerForAllNamespaces(c));
     return operator;
   }

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatOperator.java

@@ -22,7 +22,7 @@ public static void main(String[] args) throws IOException {
 
     Config config = new ConfigBuilder().withNamespace(null).build();
     KubernetesClient client = new DefaultKubernetesClient(config);
-    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
+    Operator operator = new Operator(client, DefaultConfigurationService.instance());
 
     TomcatController tomcatController = new TomcatController(client);
     operator.registerControllerForAllNamespaces(tomcatController);

samples/webserver/src/main/java/io/javaoperatorsdk/operator/sample/WebServerOperator.java

@@ -23,7 +23,7 @@ public static void main(String[] args) throws IOException {
 
     Config config = new ConfigBuilder().withNamespace(null).build();
     KubernetesClient client = new DefaultKubernetesClient(config);
-    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
+    Operator operator = new Operator(client, DefaultConfigurationService.instance());
     operator.registerControllerForAllNamespaces(new WebServerController(client));
 
     new FtBasic(new TkFork(new FkRegex("/health", "ALL GOOD!")), 8080).start(Exit.NEVER);