fixes from rebase from next

Author: csviri

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

@@ -25,6 +25,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;
@@ -262,9 +263,9 @@ public List<DependentResourceSpec> getDependentResources() {
         }
         spec = new DependentResourceSpec(dependentType, config, name,
             Set.of(dependent.dependsOn()),
-            instantiateIfNotVoid(dependent.readyPostcondition(), VoidCondition.class),
-            instantiateIfNotVoid(dependent.reconcilePrecondition(), VoidCondition.class),
-            instantiateIfNotVoid(dependent.deletePostcondition(), VoidCondition.class));
+            instantiateConditionIfNotVoid(dependent.readyPostcondition()),
+            instantiateConditionIfNotVoid(dependent.reconcilePrecondition()),
+            instantiateConditionIfNotVoid(dependent.deletePostcondition()));
         specsMap.put(name, spec);
       }
 
@@ -325,8 +326,8 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
           createFilter(kubeDependent.genericFilter(), FilterType.generic, kubeDependentName)
               .orElse(null);
 
-      resourceDiscriminator = instantiateIfNotVoid(kubeDependent.resourceDiscriminator(),
-          VoidResourceDiscriminator.class);
+      resourceDiscriminator =
+          instantiateDiscriminatorIfNotVoid(kubeDependent.resourceDiscriminator());
     }
 
     config =
@@ -337,6 +338,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,