Skip to content

Commit ac83246

Browse files
committed
remove void discriminator
1 parent e27eb9a commit ac83246

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
328328
@SuppressWarnings({"unchecked"})
329329
private ResourceDiscriminator<?, ? extends HasMetadata> instantiateDiscriminatorIfNotVoid(
330330
Class<? extends ResourceDiscriminator> discriminator) {
331-
if (discriminator != VoidResourceDiscriminator.class) {
331+
if (discriminator != ResourceDiscriminator.class) {
332332
return instantiateAndConfigureIfNeeded(discriminator, ResourceDiscriminator.class,
333333
CONTROLLER_CONFIG_ANNOTATION);
334334
}

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

-14
This file was deleted.

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import io.javaoperatorsdk.operator.api.reconciler.Constants;
99
import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
10-
import io.javaoperatorsdk.operator.api.reconciler.VoidResourceDiscriminator;
1110
import io.javaoperatorsdk.operator.processing.event.source.filter.*;
1211
import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
1312
import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
@@ -72,5 +71,5 @@
7271
*/
7372
Class<? extends GenericFilter> genericFilter() default GenericFilter.class;
7473

75-
Class<? extends ResourceDiscriminator> resourceDiscriminator() default VoidResourceDiscriminator.class;
74+
Class<? extends ResourceDiscriminator> resourceDiscriminator() default ResourceDiscriminator.class;
7675
}

0 commit comments

Comments
 (0)