test fix

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Author: csviri

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

@@ -195,7 +195,7 @@ public boolean handleExceptionsInReconciler() {
   @SuppressWarnings({"unchecked", "rawtypes"})
   private static List<DependentResourceSpec> dependentResources(
       Workflow annotation,
-      ControllerConfiguration<?> parent) {
+      ControllerConfiguration<?> controllerConfiguration) {
     final var dependents = annotation.dependents();
 
 
@@ -214,7 +214,7 @@ private static List<DependentResourceSpec> dependentResources(
             "A DependentResource named '" + dependentName + "' already exists: " + spec);
       }
 
-      final var name = parent.getName();
+      final var name = controllerConfiguration.getName();
 
       var eventSourceName = dependent.useEventSourceWithName();
       eventSourceName = Constants.NO_VALUE_SET.equals(eventSourceName) ? null : eventSourceName;
@@ -229,7 +229,7 @@ private static List<DependentResourceSpec> dependentResources(
 
       // extract potential configuration
       final var configuration = DependentResourceConfigurationResolver
-          .extractConfigurationFromConfigured(spec, parent, dependentType);
+          .extractConfigurationFromConfigured(spec, controllerConfiguration, dependentType);
       spec.setConfiguration(configuration);
 
       specsMap.put(dependentName, spec);

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

@@ -25,7 +25,7 @@ public class DependentResourceSpec<R, P extends HasMetadata, C> {
   private final Condition<?, ?> activationCondition;
 
   private final String useEventSourceWithName;
-  private C nullableConfiguation;
+  private C nullableConfiguration;
 
   public DependentResourceSpec(Class<? extends DependentResource<R, P>> dependentResourceClass,
       String name, Set<String> dependsOn, Condition<?, ?> readyCondition,
@@ -101,10 +101,10 @@ public Optional<String> getUseEventSourceWithName() {
   }
 
   public Optional<C> getConfiguration() {
-    return Optional.ofNullable(nullableConfiguation);
+    return Optional.ofNullable(nullableConfiguration);
   }
 
   public void setConfiguration(C configuration) {
-    this.nullableConfiguation = configuration;
+    this.nullableConfiguration = configuration;
   }
 }

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

@@ -38,15 +38,16 @@ public KubernetesDependentResourceConfigBuilder<R> withInformerConfiguration(
   public KubernetesDependentResourceConfig<R> build() {
     return new KubernetesDependentResourceConfig<>(
         useSSA, createResourceOnlyIfNotExistingWithSSA,
-        new InformerConfigSpec<R>(informerConfiguration.name(),
-            informerConfiguration.getNamespaces(), informerConfiguration.getLabelSelector(),
-            informerConfiguration.followControllerNamespaceChanges(),
-            (OnAddFilter<R>) informerConfiguration.onAddFilter().orElse(null),
-            (OnUpdateFilter<R>) informerConfiguration.onUpdateFilter().orElse(null),
-            (OnDeleteFilter<R>) informerConfiguration.onDeleteFilter().orElse(null),
-            (GenericFilter<R>) informerConfiguration.genericFilter().orElse(null),
-            informerConfiguration.getGroupVersionKind().orElse(null),
-            informerConfiguration.getSecondaryToPrimaryMapper(),
-            informerConfiguration.getPrimaryToSecondaryMapper()));
+        informerConfiguration == null ? null
+            : new InformerConfigSpec<>(informerConfiguration.name(),
+                informerConfiguration.getNamespaces(), informerConfiguration.getLabelSelector(),
+                informerConfiguration.followControllerNamespaceChanges(),
+                (OnAddFilter<R>) informerConfiguration.onAddFilter().orElse(null),
+                (OnUpdateFilter<R>) informerConfiguration.onUpdateFilter().orElse(null),
+                (OnDeleteFilter<R>) informerConfiguration.onDeleteFilter().orElse(null),
+                (GenericFilter<R>) informerConfiguration.genericFilter().orElse(null),
+                informerConfiguration.getGroupVersionKind().orElse(null),
+                informerConfiguration.getSecondaryToPrimaryMapper(),
+                informerConfiguration.getPrimaryToSecondaryMapper()));
   }
 }