Test fix

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

Author: csviri

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

@@ -49,7 +49,7 @@ class ReconciliationDispatcher<P extends HasMetadata> {
     this.controller = controller;
     this.customResourceFacade = customResourceFacade;
     final var configuration = controller.getConfiguration();
-        this.cloner = configuration.getConfigurationService().getResourceCloner();
+    this.cloner = configuration.getConfigurationService().getResourceCloner();
 
     var retry = configuration.getRetry();
     retryConfigurationHasZeroAttempts = retry == null || retry.initExecution().isLastAttempt();
@@ -402,22 +402,22 @@ public R patchResource(R resource, R originalResource) {
 
     public R patchStatus(R resource, R originalResource) {
       log.trace("Patching status for resource: {} with ssa: {}", resource, useSSA);
-        if (useSSA) {
-          var managedFields = resource.getMetadata().getManagedFields();
-          try {
-            resource.getMetadata().setManagedFields(null);
-            var res = resource(resource);
-            return res.subresource("status").patch(new PatchContext.Builder()
-                .withFieldManager(fieldManager)
-                .withForce(true)
-                .withPatchType(PatchType.SERVER_SIDE_APPLY)
-                .build());
-          } finally {
-            resource.getMetadata().setManagedFields(managedFields);
-          }
-        } else {
-          return editStatus(resource, originalResource);
+      if (useSSA) {
+        var managedFields = resource.getMetadata().getManagedFields();
+        try {
+          resource.getMetadata().setManagedFields(null);
+          var res = resource(resource);
+          return res.subresource("status").patch(new PatchContext.Builder()
+              .withFieldManager(fieldManager)
+              .withForce(true)
+              .withPatchType(PatchType.SERVER_SIDE_APPLY)
+              .build());
+        } finally {
+          resource.getMetadata().setManagedFields(managedFields);
         }
+      } else {
+        return editStatus(resource, originalResource);
+      }
     }
 
     private R editStatus(R resource, R originalResource) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuspatchnonlocking/StatusPatchLockingReconciler.java

@@ -2,7 +2,6 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuspatchnonlocking/StatusPatchNotLockingForNonSSAIT.java

@@ -21,7 +21,7 @@ class StatusPatchNotLockingForNonSSAIT {
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(StatusPatchLockingReconciler.class)
-              .withConfigurationService(o->o.withUseSSAToPatchPrimaryResource(false))
+          .withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false))
           .build();
 
   @Test