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 1
1
package io .javaoperatorsdk .operator .api ;
2
2
3
3
import io .fabric8 .kubernetes .client .CustomResource ;
4
- import io .javaoperatorsdk .operator .ControllerUtils ;
5
4
import io .javaoperatorsdk .operator .processing .event .EventSourceManager ;
6
5
7
6
public interface ResourceController <R extends CustomResource > {
@@ -38,8 +37,4 @@ public interface ResourceController<R extends CustomResource> {
38
37
* @param eventSourceManager
39
38
*/
40
39
default void init (EventSourceManager eventSourceManager ) {}
41
-
42
- default String getName () {
43
- return ControllerUtils .getNameFor (this );
44
- }
45
40
}
Original file line number Diff line number Diff line change 1
1
package io .javaoperatorsdk .operator .api .config ;
2
2
3
3
import io .fabric8 .kubernetes .client .CustomResource ;
4
+ import io .javaoperatorsdk .operator .ControllerUtils ;
4
5
import io .javaoperatorsdk .operator .api .ResourceController ;
5
6
import java .util .Map ;
6
7
import java .util .concurrent .ConcurrentHashMap ;
@@ -27,6 +28,6 @@ protected <R extends CustomResource> void register(ControllerConfiguration<R> co
27
28
@ Override
28
29
public <R extends CustomResource > ControllerConfiguration <R > getConfigurationFor (
29
30
ResourceController <R > controller ) {
30
- return configurations .get (controller . getName ( ));
31
+ return configurations .get (ControllerUtils . getNameFor ( controller ));
31
32
}
32
33
}
Original file line number Diff line number Diff line change 6
6
import io .fabric8 .kubernetes .client .DefaultKubernetesClient ;
7
7
import io .fabric8 .kubernetes .client .KubernetesClient ;
8
8
import io .fabric8 .openshift .client .DefaultOpenShiftClient ;
9
+ import io .javaoperatorsdk .operator .ControllerUtils ;
9
10
import io .javaoperatorsdk .operator .Operator ;
10
11
import io .javaoperatorsdk .operator .api .ResourceController ;
11
12
import io .javaoperatorsdk .operator .api .config .AbstractConfigurationService ;
@@ -56,7 +57,7 @@ public Operator operator(
56
57
57
58
private ResourceController <?> processController (ResourceController <?> controller ) {
58
59
final var controllerPropertiesMap = configuration .getControllers ();
59
- final var name = controller . getName ( );
60
+ final var name = ControllerUtils . getNameFor ( controller );
60
61
var controllerProps = controllerPropertiesMap .get (name );
61
62
register (new ConfigurationWrapper (controller , controllerProps ));
62
63
return controller ;
Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ public AnnotationConfiguration(ResourceController<R> controller) {
21
21
22
22
@ Override
23
23
public String getName () {
24
- return controller . getName ( );
24
+ return ControllerUtils . getNameFor ( controller );
25
25
}
26
26
27
27
@ Override
You can’t perform that action at this time.
0 commit comments