File tree Expand file tree Collapse file tree 4 files changed +5
-8
lines changed
operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api
operator-framework-spring-boot-starter/src/main/java/io/javaoperatorsdk/operator/springboot/starter
operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime Expand file tree Collapse file tree 4 files changed +5
-8
lines changed Original file line number Diff line number Diff line change 11package io .javaoperatorsdk .operator .api ;
22
33import io .fabric8 .kubernetes .client .CustomResource ;
4- import io .javaoperatorsdk .operator .ControllerUtils ;
54import io .javaoperatorsdk .operator .processing .event .EventSourceManager ;
65
76public 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}
Original file line number Diff line number Diff line change 11package io .javaoperatorsdk .operator .api .config ;
22
33import io .fabric8 .kubernetes .client .CustomResource ;
4+ import io .javaoperatorsdk .operator .ControllerUtils ;
45import io .javaoperatorsdk .operator .api .ResourceController ;
56import java .util .Map ;
67import 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}
Original file line number Diff line number Diff line change 66import io .fabric8 .kubernetes .client .DefaultKubernetesClient ;
77import io .fabric8 .kubernetes .client .KubernetesClient ;
88import io .fabric8 .openshift .client .DefaultOpenShiftClient ;
9+ import io .javaoperatorsdk .operator .ControllerUtils ;
910import io .javaoperatorsdk .operator .Operator ;
1011import io .javaoperatorsdk .operator .api .ResourceController ;
1112import 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 ;
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments