Skip to content

Commit dc4b96f

Browse files
committed
refactor: remove getName method from ResourceController
1 parent 1a851ef commit dc4b96f

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.api;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4-
import io.javaoperatorsdk.operator.ControllerUtils;
54
import io.javaoperatorsdk.operator.processing.event.EventSourceManager;
65

76
public interface ResourceController<R extends CustomResource> {
@@ -38,8 +37,4 @@ public interface ResourceController<R extends CustomResource> {
3837
* @param eventSourceManager
3938
*/
4039
default void init(EventSourceManager eventSourceManager) {}
41-
42-
default String getName() {
43-
return ControllerUtils.getNameFor(this);
44-
}
4540
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.operator.api.config;
22

33
import io.fabric8.kubernetes.client.CustomResource;
4+
import io.javaoperatorsdk.operator.ControllerUtils;
45
import io.javaoperatorsdk.operator.api.ResourceController;
56
import java.util.Map;
67
import java.util.concurrent.ConcurrentHashMap;
@@ -27,6 +28,6 @@ protected <R extends CustomResource> void register(ControllerConfiguration<R> co
2728
@Override
2829
public <R extends CustomResource> ControllerConfiguration<R> getConfigurationFor(
2930
ResourceController<R> controller) {
30-
return configurations.get(controller.getName());
31+
return configurations.get(ControllerUtils.getNameFor(controller));
3132
}
3233
}

operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter/OperatorAutoConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
77
import io.fabric8.kubernetes.client.KubernetesClient;
88
import io.fabric8.openshift.client.DefaultOpenShiftClient;
9+
import io.javaoperatorsdk.operator.ControllerUtils;
910
import io.javaoperatorsdk.operator.Operator;
1011
import io.javaoperatorsdk.operator.api.ResourceController;
1112
import io.javaoperatorsdk.operator.api.config.AbstractConfigurationService;
@@ -56,7 +57,7 @@ public Operator operator(
5657

5758
private ResourceController<?> processController(ResourceController<?> controller) {
5859
final var controllerPropertiesMap = configuration.getControllers();
59-
final var name = controller.getName();
60+
final var name = ControllerUtils.getNameFor(controller);
6061
var controllerProps = controllerPropertiesMap.get(name);
6162
register(new ConfigurationWrapper(controller, controllerProps));
6263
return controller;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public AnnotationConfiguration(ResourceController<R> controller) {
2121

2222
@Override
2323
public String getName() {
24-
return controller.getName();
24+
return ControllerUtils.getNameFor(controller);
2525
}
2626

2727
@Override

0 commit comments

Comments
 (0)