refactor: move naming generation methods back to ControllerUtils

Author: metacosm

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

@@ -1,6 +1,9 @@
 package io.javaoperatorsdk.operator;
 
 import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.api.Controller;
+import io.javaoperatorsdk.operator.api.ResourceController;
+import java.util.Locale;
 
 public class ControllerUtils {
 
@@ -14,4 +17,39 @@ public static boolean hasGivenFinalizer(CustomResource resource, String finalize
     return resource.getMetadata().getFinalizers() != null
         && resource.getMetadata().getFinalizers().contains(finalizer);
   }
+
+  public static String getNameFor(Class<? extends ResourceController> controllerClass) {
+    // if the controller annotation has a name attribute, use it
+    final var annotation = controllerClass.getAnnotation(Controller.class);
+    if (annotation != null) {
+      final var name = annotation.name();
+      if (!Controller.NULL.equals(name)) {
+        return name;
+      }
+    }
+
+    // otherwise, use the lower-cased full class name
+    return getDefaultNameFor(controllerClass);
+  }
+
+  public static String getNameFor(ResourceController controller) {
+    return getNameFor(controller.getClass());
+  }
+
+  public static String getDefaultNameFor(ResourceController controller) {
+    return getDefaultNameFor(controller.getClass());
+  }
+
+  public static String getDefaultNameFor(Class<? extends ResourceController> controllerClass) {
+    return getDefaultResourceControllerName(controllerClass.getSimpleName());
+  }
+
+  public static String getDefaultResourceControllerName(String rcControllerClassName) {
+    // if the name is fully qualified, extract the simple class name
+    final var lastDot = rcControllerClassName.lastIndexOf('.');
+    if (lastDot > 0) {
+      rcControllerClassName = rcControllerClassName.substring(lastDot);
+    }
+    return rcControllerClassName.toLowerCase(Locale.ROOT);
+  }
 }

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

@@ -1,8 +1,8 @@
 package io.javaoperatorsdk.operator.api;
 
 import io.fabric8.kubernetes.client.CustomResource;
+import io.javaoperatorsdk.operator.ControllerUtils;
 import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
-import java.util.Locale;
 
 public interface ResourceController<R extends CustomResource> {
 
@@ -40,41 +40,6 @@ public interface ResourceController<R extends CustomResource> {
   default void init(EventSourceManager eventSourceManager) {}
 
   default String getName() {
-    return getNameFor(this);
-  }
-
-  static String getNameFor(Class<? extends ResourceController> controllerClass) {
-    // if the controller annotation has a name attribute, use it
-    final var annotation = controllerClass.getAnnotation(Controller.class);
-    if (annotation != null) {
-      final var name = annotation.name();
-      if (!Controller.NULL.equals(name)) {
-        return name;
-      }
-    }
-
-    // otherwise, use the lower-cased full class name
-    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.getSimpleName());
-  }
-
-  static String getDefaultResourceControllerName(String rcControllerClassName) {
-    // if the name is fully qualified, extract the simple class name
-    final var lastDot = rcControllerClassName.lastIndexOf('.');
-    if (lastDot > 0) {
-      rcControllerClassName = rcControllerClassName.substring(lastDot);
-    }
-    return rcControllerClassName.toLowerCase(Locale.ROOT);
+    return ControllerUtils.getNameFor(this);
   }
 }

operator-framework-quarkus-extension/deployment/src/main/java/io/javaoperatorsdk/quarkus/extension/deployment/QuarkusExtensionProcessor.java

@@ -144,8 +144,7 @@ private ControllerConfiguration createControllerConfiguration(
                 "name",
                 AnnotationValue::asString,
                 () ->
-                    ResourceController.getDefaultResourceControllerName(
-                        resourceControllerClassName)),
+                    ControllerUtils.getDefaultResourceControllerName(resourceControllerClassName)),
             crdName,
             valueOrDefault(
                 controllerAnnotation,

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

@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.operator.ControllerUtils;
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import java.util.List;
@@ -38,7 +39,7 @@ public void loadsKubernetesClientPropertiesProperly() {
   @Test
   public void loadsRetryPropertiesProperly() {
     final var retryProperties =
-        config.getControllers().get(ResourceController.getNameFor(TestController.class)).getRetry();
+        config.getControllers().get(ControllerUtils.getNameFor(TestController.class)).getRetry();
     assertEquals(3, retryProperties.getMaxAttempts());
     assertEquals(1000, retryProperties.getInitialInterval());
     assertEquals(1.5, retryProperties.getIntervalMultiplier());