wip

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

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ReconcileUtils.java

@@ -802,9 +802,9 @@ public static <P extends HasMetadata> P removeFinalizer(
   /**
    * Patches the resource using JSON Patch. In case the server responds with conflict (HTTP 409) or
    * unprocessable content (HTTP 422) it retries the operation up to the maximum number defined in
-   * {@link PrimaryUpdateAndCacheUtils#DEFAULT_MAX_RETRY}.
+   * {@link ReconcileUtils#DEFAULT_MAX_RETRY}.
    *
-   * @param context reconiciliation context
+   * @param context reconciliation context
    * @param resourceChangesOperator changes to be done on the resource before update
    * @param preCondition condition to check if the patch operation still needs to be performed or
    *     not.

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/triggerallevent/eventing/TriggerReconcilerOnAllEventReconciler.java

@@ -22,7 +22,7 @@
 
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
-import io.javaoperatorsdk.operator.api.reconciler.PrimaryUpdateAndCacheUtils;
+import io.javaoperatorsdk.operator.api.reconciler.ReconcileUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 
@@ -75,7 +75,7 @@ public UpdateControl<TriggerReconcilerOnAllEventCustomResource> reconcile(
 
     if (!primary.isMarkedForDeletion() && getUseFinalizer() && !primary.hasFinalizer(FINALIZER)) {
       log.info("Adding finalizer");
-      PrimaryUpdateAndCacheUtils.addFinalizer(context, FINALIZER);
+      ReconcileUtils.addFinalizer(context, FINALIZER);
       return UpdateControl.noUpdate();
     }
 
@@ -98,7 +98,7 @@ public UpdateControl<TriggerReconcilerOnAllEventCustomResource> reconcile(
       setEventOnMarkedForDeletion(true);
       if (getUseFinalizer() && primary.hasFinalizer(FINALIZER)) {
         log.info("Removing finalizer");
-        PrimaryUpdateAndCacheUtils.removeFinalizer(context, FINALIZER);
+        ReconcileUtils.removeFinalizer(context, FINALIZER);
       }
     }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/triggerallevent/finalizerhandling/SelectiveFinalizerHandlingReconciler.java

@@ -17,7 +17,7 @@
 
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
-import io.javaoperatorsdk.operator.api.reconciler.PrimaryUpdateAndCacheUtils;
+import io.javaoperatorsdk.operator.api.reconciler.ReconcileUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
 
@@ -37,11 +37,11 @@ public UpdateControl<SelectiveFinalizerHandlingReconcilerCustomResource> reconci
     }
 
     if (resource.getSpec().getUseFinalizer()) {
-      PrimaryUpdateAndCacheUtils.addFinalizer(context, FINALIZER);
+      ReconcileUtils.addFinalizer(context, FINALIZER);
     }
 
     if (resource.isMarkedForDeletion()) {
-      PrimaryUpdateAndCacheUtils.removeFinalizer(context, FINALIZER);
+      ReconcileUtils.removeFinalizer(context, FINALIZER);
     }
 
     return UpdateControl.noUpdate();