fix: tests

The new naming algorithm makes it impossible to use the default name for
to identify a controller in application.yaml files because FQNs are
interpreted as composite paths instead of single names. This makes
things more cumbersome, imo.

Author: metacosm

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

@@ -6,23 +6,6 @@
 
 public interface ResourceController<R extends CustomResource> {
 
-  static String getDefaultNameFor(ResourceController controller) {
-    return getDefaultNameFor(controller.getClass());
-  }
-
-  static String getDefaultNameFor(Class<? extends ResourceController> controllerClass) {
-    return getDefaultResourceControllerName(controllerClass.getCanonicalName());
-  }
-
-  static String getDefaultResourceControllerName(String rcControllerClassName) {
-    if (rcControllerClassName.indexOf('.') < 0) {
-      throw new IllegalArgumentException(
-          "Must provide a fully-qualified resource controller class name, was: "
-              + rcControllerClassName);
-    }
-    return rcControllerClassName.toLowerCase(Locale.ROOT);
-  }
-
   /**
    * The implementation should delete the associated component(s). Note that this is method is
    * called when an object is marked for deletion. After its executed the custom resource finalizer
@@ -57,10 +40,12 @@ static String getDefaultResourceControllerName(String rcControllerClassName) {
   default void init(EventSourceManager eventSourceManager) {}
 
   default String getName() {
-    final var clazz = getClass();
+    return getNameFor(this);
+  }
 
+  static String getNameFor(Class<? extends ResourceController> controllerClass) {
     // if the controller annotation has a name attribute, use it
-    final var annotation = clazz.getAnnotation(Controller.class);
+    final var annotation = controllerClass.getAnnotation(Controller.class);
     if (annotation != null) {
       final var name = annotation.name();
       if (!Controller.NULL.equals(name)) {
@@ -69,6 +54,27 @@ default String getName() {
     }
 
     // otherwise, use the lower-cased full class name
-    return getDefaultNameFor(this);
+    return getDefaultNameFor(controllerClass);
+  }
+
+  static String getNameFor(ResourceController controller) {
+    return getNameFor(controller.getClass());
+  }
+
+  static String getDefaultNameFor(ResourceController controller) {
+    return getDefaultNameFor(controller.getClass());
+  }
+
+  static String getDefaultNameFor(Class<? extends ResourceController> controllerClass) {
+    return getDefaultResourceControllerName(controllerClass.getCanonicalName());
+  }
+
+  static String getDefaultResourceControllerName(String rcControllerClassName) {
+    if (rcControllerClassName.indexOf('.') < 0) {
+      throw new IllegalArgumentException(
+          "Must provide a fully-qualified resource controller class name, was: "
+              + rcControllerClassName);
+    }
+    return rcControllerClassName.toLowerCase(Locale.ROOT);
   }
 }

operator-framework-spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/AutoConfigurationTest.java

@@ -38,10 +38,7 @@ public void loadsKubernetesClientPropertiesProperly() {
   @Test
   public void loadsRetryPropertiesProperly() {
     final var retryProperties =
-        config
-            .getControllers()
-            .get(ResourceController.getDefaultNameFor(TestController.class))
-            .getRetry();
+        config.getControllers().get(ResourceController.getNameFor(TestController.class)).getRetry();
     assertEquals(3, retryProperties.getMaxAttempts());
     assertEquals(1000, retryProperties.getInitialInterval());
     assertEquals(1.5, retryProperties.getIntervalMultiplier());

operator-framework-spring-boot-starter/src/test/java/io/javaoperatorsdk/operator/springboot/starter/TestController.java

@@ -9,7 +9,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-@Controller(crdName = "name")
+@Controller(crdName = "name", name = "name_must_be_changed")
 public class TestController implements ResourceController {
 
   @Override

operator-framework-spring-boot-starter/src/test/resources/application.yaml

@@ -5,7 +5,7 @@ javaoperatorsdk:
     masterUrl: http://master.url
 
   controllers:
-    testcontroller:
+    name_must_be_changed:
       retry:
         maxAttempts: 3
         initialInterval: 1000