Skip to content

Commit ffa1529

Browse files
committed
fix: implementation of ResourceConfiguration.getResourceTypeName
Remove useless override in ControllerConfiguration
1 parent fa9bf0a commit ffa1529

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

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

+2-5
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,13 @@
1010
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
1111
import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilters;
1212

13+
@SuppressWarnings("rawtypes")
1314
public interface ControllerConfiguration<R extends HasMetadata> extends ResourceConfiguration<R> {
1415

1516
default String getName() {
1617
return ReconcilerUtils.getDefaultReconcilerName(getAssociatedReconcilerClassName());
1718
}
1819

19-
default String getResourceTypeName() {
20-
return ReconcilerUtils.getResourceTypeName(getResourceClass());
21-
}
22-
2320
default String getFinalizer() {
2421
return ReconcilerUtils.getDefaultFinalizerName(getResourceClass());
2522
}
@@ -51,7 +48,7 @@ default ResourceEventFilter<R> getEventFilter() {
5148
return ResourceEventFilters.passthrough();
5249
}
5350

54-
default List<? extends DependentResource> getDependentResources() {
51+
default List<DependentResource> getDependentResources() {
5552
return Collections.emptyList();
5653
}
5754

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
import java.util.Set;
55

66
import io.fabric8.kubernetes.api.model.HasMetadata;
7-
import io.fabric8.kubernetes.client.CustomResource;
7+
import io.javaoperatorsdk.operator.ReconcilerUtils;
88
import io.javaoperatorsdk.operator.api.reconciler.Constants;
99

1010
public interface ResourceConfiguration<R extends HasMetadata> {
1111

1212
default String getResourceTypeName() {
13-
return CustomResource.getCRDName(getResourceClass());
13+
return ReconcilerUtils.getResourceTypeName(getResourceClass());
1414
}
1515

1616
/**

0 commit comments

Comments
 (0)