test fix:

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

Author: csviri

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

@@ -510,16 +510,15 @@ default boolean useSSAToPatchPrimaryResource() {
    * either use simple patches or SSA. Setting this to {@code true}, controllers will use SSA for
    * adding finalizers, patching resources and status.
    *
-   * @return {@code true} if Server-Side Apply (SSA) should be used when managing finalizers,
-   *     {@code false} otherwise
+   * @return {@code true} if Server-Side Apply (SSA) should be used when managing finalizers, {@code
+   *     false} otherwise
    * @see ConfigurationServiceOverrider#withUseSSAToManageFinalizer(boolean)
    * @since 5.1.2
    */
   default boolean useSSAToManageFinalizer() {
     return true;
   }
 
-
   /**
    * Determines whether resources retrieved from caches such as via calls to {@link
    * Context#getSecondaryResource(Class)} should be defensively cloned first.

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

@@ -345,7 +345,7 @@ public boolean useSSAToPatchPrimaryResource() {
       @Override
       public boolean useSSAToManageFinalizer() {
         return overriddenValueOrDefault(
-                useSSAToManageFinalizer, ConfigurationService::useSSAToPatchPrimaryResource);
+            useSSAToManageFinalizer, ConfigurationService::useSSAToPatchPrimaryResource);
       }
 
       @Override

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java

@@ -62,18 +62,18 @@ class ReconciliationDispatcherTest {
 
   @BeforeEach
   void setup() {
-    initConfigService(true);
+    initConfigService(true, true);
     testCustomResource = TestUtils.testCustomResource();
     reconciler = spy(new TestReconciler());
     reconciliationDispatcher =
         init(testCustomResource, reconciler, null, customResourceFacade, true);
   }
 
-  static void initConfigService(boolean useSSA) {
-    initConfigService(useSSA, true);
+  static void initConfigService(boolean useSSA, boolean useSSAForFinalizer) {
+    initConfigService(useSSA, useSSAForFinalizer, true);
   }
 
-  static void initConfigService(boolean useSSA, boolean noCloning) {
+  static void initConfigService(boolean useSSA, boolean useSSAForFinalizer, boolean noCloning) {
     /*
      * We need this for mock reconcilers to properly generate the expected UpdateControl: without
      * this, calls such as `when(reconciler.reconcile(eq(testCustomResource),
@@ -98,7 +98,8 @@ public <R extends HasMetadata> R clone(R object) {
                             }
                           }
                         })
-                    .withUseSSAToPatchPrimaryResource(useSSA));
+                    .withUseSSAToPatchPrimaryResource(useSSA)
+                    .withUseSSAToManageFinalizer(useSSAForFinalizer));
   }
 
   private <R extends HasMetadata> ReconciliationDispatcher<R> init(
@@ -149,7 +150,7 @@ void addFinalizerOnNewResource() {
 
   @Test
   void addFinalizerOnNewResourceWithoutSSA() {
-    initConfigService(false);
+    initConfigService(false, false);
     final ReconciliationDispatcher<TestCustomResource> dispatcher =
         init(testCustomResource, reconciler, null, customResourceFacade, true);
 
@@ -640,7 +641,7 @@ void canSkipSchedulingMaxDelayIf() {
 
   @Test
   void retriesAddingFinalizerWithoutSSA() {
-    initConfigService(false);
+    initConfigService(true, false);
     reconciliationDispatcher =
         init(testCustomResource, reconciler, null, customResourceFacade, true);
 
@@ -683,7 +684,7 @@ void reSchedulesFromErrorHandler() {
 
   @Test
   void reconcilerContextUsesTheSameInstanceOfResourceAsParam() {
-    initConfigService(false, false);
+    initConfigService(false, false, false);
 
     final ReconciliationDispatcher<TestCustomResource> dispatcher =
         init(testCustomResource, reconciler, null, customResourceFacade, true);