fixes from rebase from next

Author: csviri

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

@@ -24,6 +24,7 @@
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
+import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilter;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEventFilters;
@@ -311,8 +312,8 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
           createFilter(kubeDependent.genericFilter(), GenericFilter.class, context)
               .orElse(null);
 
-      resourceDiscriminator = instantiateIfNotVoid(kubeDependent.resourceDiscriminator(),
-          VoidResourceDiscriminator.class);
+      resourceDiscriminator =
+          instantiateDiscriminatorIfNotVoid(kubeDependent.resourceDiscriminator());
     }
 
     config =
@@ -323,6 +324,15 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
     return config;
   }
 
+  @SuppressWarnings({"unchecked"})
+  private ResourceDiscriminator<?, ? extends HasMetadata> instantiateDiscriminatorIfNotVoid(
+      Class<? extends ResourceDiscriminator> discriminator) {
+    if (discriminator != VoidResourceDiscriminator.class) {
+      return instantiateAndConfigureIfNeeded(discriminator, ResourceDiscriminator.class);
+    }
+    return null;
+  }
+
   public static <T> T valueOrDefault(
       ControllerConfiguration controllerConfiguration,
       Function<ControllerConfiguration, T> mapper,