refine

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -505,16 +505,14 @@ default boolean useSSAToPatchPrimaryResource() {
   }
 
   /**
-   * {@link io.javaoperatorsdk.operator.api.reconciler.UpdateControl} patch resource or status can
-   * either use simple patches or SSA. Setting this to {@code true}, controllers will use SSA for
-   * adding finalizers.
+   * Setting this to {@code true}, controllers will use SSA for adding finalizers.
    *
    * @return {@code true} if Server-Side Apply (SSA) should be used when managing finalizers, {@code
    *     false} otherwise
-   * @see ConfigurationServiceOverrider#withUseSSAToManageFinalizer(boolean)
+   * @see ConfigurationServiceOverrider#withUseSSAToAddFinalizer(boolean)
    * @since 5.1.2
    */
-  default boolean useSSAToManageFinalizer() {
+  default boolean useSSAToAddFinalizer() {
     return true;
   }
 

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

@@ -39,7 +39,7 @@ public class ConfigurationServiceOverrider {
   private Boolean previousAnnotationForDependentResources;
   private Boolean parseResourceVersions;
   private Boolean useSSAToPatchPrimaryResource;
-  private Boolean useSSAToManageFinalizer;
+  private Boolean useSSAToAddFinalizer;
   private Boolean cloneSecondaryResourcesWhenGettingFromCache;
   private Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist;
 
@@ -184,8 +184,8 @@ public ConfigurationServiceOverrider withUseSSAToPatchPrimaryResource(boolean va
     return this;
   }
 
-  public ConfigurationServiceOverrider withUseSSAToManageFinalizer(boolean value) {
-    this.useSSAToManageFinalizer = value;
+  public ConfigurationServiceOverrider withUseSSAToAddFinalizer(boolean value) {
+    this.useSSAToAddFinalizer = value;
     return this;
   }
 
@@ -343,9 +343,9 @@ public boolean useSSAToPatchPrimaryResource() {
       }
 
       @Override
-      public boolean useSSAToManageFinalizer() {
+      public boolean useSSAToAddFinalizer() {
         return overriddenValueOrDefault(
-            useSSAToManageFinalizer, ConfigurationService::useSSAToPatchPrimaryResource);
+            useSSAToAddFinalizer, ConfigurationService::useSSAToPatchPrimaryResource);
       }
 
       @Override

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

@@ -42,7 +42,7 @@ class ReconciliationDispatcher<P extends HasMetadata> {
   private final boolean retryConfigurationHasZeroAttempts;
   private final Cloner cloner;
   private final boolean useSSA;
-  private final boolean useSSAForFinalizer;
+  private final boolean useSSAToAddFinalizer;
 
   ReconciliationDispatcher(Controller<P> controller, CustomResourceFacade<P> customResourceFacade) {
     this.controller = controller;
@@ -53,7 +53,7 @@ class ReconciliationDispatcher<P extends HasMetadata> {
     var retry = configuration.getRetry();
     retryConfigurationHasZeroAttempts = retry == null || retry.initExecution().isLastAttempt();
     useSSA = configuration.getConfigurationService().useSSAToPatchPrimaryResource();
-    useSSAForFinalizer = configuration.getConfigurationService().useSSAToManageFinalizer();
+    useSSAToAddFinalizer = configuration.getConfigurationService().useSSAToAddFinalizer();
   }
 
   public ReconciliationDispatcher(Controller<P> controller) {
@@ -121,7 +121,7 @@ private PostExecutionControl<P> handleReconcile(
        * finalizer.
        */
       P updatedResource;
-      if (useSSAForFinalizer) {
+      if (useSSAToAddFinalizer) {
         updatedResource = addFinalizerWithSSA(originalResource);
       } else {
         updatedResource = updateCustomResourceWithFinalizer(resourceForExecution, originalResource);

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

@@ -99,7 +99,7 @@ public <R extends HasMetadata> R clone(R object) {
                           }
                         })
                     .withUseSSAToPatchPrimaryResource(useSSA)
-                    .withUseSSAToManageFinalizer(useSSAForFinalizer));
+                    .withUseSSAToAddFinalizer(useSSAForFinalizer));
   }
 
   private <R extends HasMetadata> ReconciliationDispatcher<R> init(