use full class name of the controller as name instead of simple name

Author: s-soroosh

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

@@ -51,7 +51,7 @@ default String getName() {
       }
     }
 
-    // otherwise, use the lower-cased class name
-    return clazz.getSimpleName().toLowerCase(Locale.ROOT);
+    // otherwise, use the lower-cased full class name
+    return clazz.getCanonicalName().toLowerCase(Locale.ROOT);
   }
 }

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

@@ -9,12 +9,9 @@
 
 public class DefaultConfigurationService implements ConfigurationService {
 
-  private static final ConfigurationService instance = new DefaultConfigurationService();
   private final Map<String, ControllerConfiguration> configurations = new ConcurrentHashMap<>();
 
-  public static ConfigurationService instance() {
-    return instance;
-  }
+  public static final ConfigurationService INSTANCE = new DefaultConfigurationService();
 
   @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,8 +22,7 @@ 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()),
@@ -36,8 +35,7 @@ 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());
   }
 
@@ -46,7 +44,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

@@ -9,7 +9,7 @@ public class PureJavaApplicationRunner {
 
   public static void main(String[] args) {
     KubernetesClient client = new DefaultKubernetesClient();
-    Operator operator = new Operator(client, DefaultConfigurationService.instance());
+    Operator operator = new Operator(client, DefaultConfigurationService.INSTANCE);
     operator.registerController(new CustomServiceController(client));
   }
 }

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);