refactor: extract more generic instantiateIfNotDefault method

Author: metacosm

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

@@ -245,9 +245,9 @@ public List<DependentResourceSpec> getDependentResources() {
         final var context = "DependentResource of type '" + dependentType.getName() + "'";
         spec = new DependentResourceSpec(dependentType, config, name,
             Set.of(dependent.dependsOn()),
-            instantiateConditionIfNotDefault(dependent.readyPostcondition(), context),
-            instantiateConditionIfNotDefault(dependent.reconcilePrecondition(), context),
-            instantiateConditionIfNotDefault(dependent.deletePostcondition(), context));
+            instantiateIfNotDefault(dependent.readyPostcondition(), Condition.class, context),
+            instantiateIfNotDefault(dependent.reconcilePrecondition(), Condition.class, context),
+            instantiateIfNotDefault(dependent.deletePostcondition(), Condition.class, context));
         specsMap.put(name, spec);
       }
 
@@ -256,10 +256,10 @@ public List<DependentResourceSpec> getDependentResources() {
     return specs;
   }
 
-  protected Condition<?, ?> instantiateConditionIfNotDefault(Class<? extends Condition> condition,
+  protected <T> T instantiateIfNotDefault(Class<? extends T> toInstantiate, Class<T> defaultClass,
       String context) {
-    if (condition != Condition.class) {
-      return instantiateAndConfigureIfNeeded(condition, Condition.class, context);
+    if (!defaultClass.equals(toInstantiate)) {
+      return instantiateAndConfigureIfNeeded(toInstantiate, defaultClass, context);
     }
     return null;
   }
@@ -311,7 +311,7 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
               .orElse(null);
 
       resourceDiscriminator =
-          instantiateDiscriminatorIfNotVoid(kubeDependent.resourceDiscriminator());
+          instantiateIfNotDefault(kubeDependent.resourceDiscriminator(), ResourceDiscriminator.class, context);
     }
 
     config =
@@ -321,17 +321,7 @@ private Object createKubernetesResourceConfig(Class<? extends DependentResource>
 
     return config;
   }
-
-  @SuppressWarnings({"unchecked"})
-  private ResourceDiscriminator<?, ? extends HasMetadata> instantiateDiscriminatorIfNotVoid(
-      Class<? extends ResourceDiscriminator> discriminator) {
-    if (discriminator != ResourceDiscriminator.class) {
-      return instantiateAndConfigureIfNeeded(discriminator, ResourceDiscriminator.class,
-          CONTROLLER_CONFIG_ANNOTATION);
-    }
-    return null;
-  }
-
+  
   public static <T> T valueOrDefault(
       ControllerConfiguration controllerConfiguration,
       Function<ControllerConfiguration, T> mapper,