IT fix

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

Author: csviri

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

@@ -117,7 +117,7 @@ public DefaultContext<P> setRetryInfo(RetryInfo retryInfo) {
     return this;
   }
 
-    public P getPrimaryResource() {
-        return primaryResource;
-    }
+  public P getPrimaryResource() {
+    return primaryResource;
+  }
 }

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

@@ -7,8 +7,6 @@
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
-import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
-import io.javaoperatorsdk.operator.api.reconciler.DefaultContext;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -19,6 +17,7 @@
 import io.fabric8.kubernetes.api.model.ObjectMeta;
 import io.fabric8.kubernetes.client.CustomResource;
 import io.fabric8.kubernetes.client.KubernetesClientException;
+import io.fabric8.kubernetes.client.utils.KubernetesSerialization;
 import io.javaoperatorsdk.operator.MockKubernetesClient;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.TestUtils;
@@ -29,6 +28,7 @@
 import io.javaoperatorsdk.operator.api.config.MockControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.DefaultContext;
 import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
 import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusUpdateControl;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -70,8 +70,9 @@ void setup() {
   }
 
   static void initConfigService(boolean useSSA) {
-      initConfigService(useSSA,true);
+    initConfigService(useSSA, true);
   }
+
   static void initConfigService(boolean useSSA, boolean noCloning) {
     /*
      * We need this for mock reconcilers to properly generate the expected UpdateControl: without
@@ -82,18 +83,19 @@ static void initConfigService(boolean useSSA, boolean noCloning) {
      */
     configurationService =
         ConfigurationService.newOverriddenConfigurationService(new BaseConfigurationService(),
-            overrider ->  overrider.checkingCRDAndValidateLocalModel(false)
+            overrider -> overrider.checkingCRDAndValidateLocalModel(false)
 
                 .withResourceCloner(new Cloner() {
                   @Override
                   public <R extends HasMetadata> R clone(R object) {
-                  if (noCloning) {
-                    return object;
-                  }else {
-                    return new KubernetesSerialization().clone(object);
+                    if (noCloning) {
+                      return object;
+                    } else {
+                      return new KubernetesSerialization().clone(object);
+                    }
                   }
-                }})
-                    .withUseSSAToPatchPrimaryResource(useSSA));
+                })
+                .withUseSSAToPatchPrimaryResource(useSSA));
   }
 
   private <R extends HasMetadata> ReconciliationDispatcher<R> init(R customResource,
@@ -669,22 +671,24 @@ void reSchedulesFromErrorHandler() {
 
   @Test
   void reconcilerContextUsesTheSameInstanceOfResourceAsParam() {
-    initConfigService(false,false);
+    initConfigService(false, false);
 
     final ReconciliationDispatcher<TestCustomResource> dispatcher =
-            init(testCustomResource, reconciler, null, customResourceFacade, true);
+        init(testCustomResource, reconciler, null, customResourceFacade, true);
 
     testCustomResource.addFinalizer(DEFAULT_FINALIZER);
-    ArgumentCaptor<DefaultContext> contextArgumentCaptor = ArgumentCaptor.forClass(DefaultContext.class);
-    ArgumentCaptor<TestCustomResource> customResourceCaptor = ArgumentCaptor.forClass(TestCustomResource.class);
+    ArgumentCaptor<DefaultContext> contextArgumentCaptor =
+        ArgumentCaptor.forClass(DefaultContext.class);
+    ArgumentCaptor<TestCustomResource> customResourceCaptor =
+        ArgumentCaptor.forClass(TestCustomResource.class);
 
     dispatcher.handleExecution(executionScopeWithCREvent(testCustomResource));
-      verify(reconciler, times(1))
-              .reconcile(customResourceCaptor.capture(), contextArgumentCaptor.capture());
+    verify(reconciler, times(1))
+        .reconcile(customResourceCaptor.capture(), contextArgumentCaptor.capture());
 
-      assertThat(contextArgumentCaptor.getValue().getPrimaryResource())
-              .isSameAs(customResourceCaptor.getValue())
-              .isNotSameAs(testCustomResource);
+    assertThat(contextArgumentCaptor.getValue().getPrimaryResource())
+        .isSameAs(customResourceCaptor.getValue())
+        .isNotSameAs(testCustomResource);
   }
 
   private ObservedGenCustomResource createObservedGenCustomResource() {

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

@@ -8,21 +8,16 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.Duration;
-import java.util.ArrayDeque;
 import java.util.ArrayList;
-import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
-import io.fabric8.kubernetes.client.dsl.NamespaceListVisitFromServerGetDeleteRecreateWaitApplicable;
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +44,8 @@ public class LocallyRunOperatorExtension extends AbstractOperatorExtension {
   private static final Logger LOGGER = LoggerFactory.getLogger(LocallyRunOperatorExtension.class);
   private static final int CRD_DELETE_TIMEOUT = 1000;
   private static final Set<AppliedCRD> appliedCRDs = new HashSet<>();
-  private static final boolean deleteCRDs = Boolean.parseBoolean(System.getProperty("testsuite.deleteCRDs", "true"));
+  private static final boolean deleteCRDs =
+      Boolean.parseBoolean(System.getProperty("testsuite.deleteCRDs", "true"));
 
   private final Operator operator;
   private final List<ReconcilerSpec> reconcilers;

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

@@ -2,6 +2,7 @@
 
 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;
@@ -21,6 +22,7 @@ public UpdateControl<StatusPatchLockingCustomResource> reconcile(
       throws InterruptedException {
     numberOfExecutions.addAndGet(1);
     Thread.sleep(WAIT_TIME);
+
     if (resource.getStatus() == null) {
       resource.setStatus(new StatusPatchLockingCustomResourceStatus());
     }

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

@@ -14,13 +14,14 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
-class StatusPatchNotLockingIT {
+class StatusPatchNotLockingForNonSSAIT {
 
   public static final String TEST_RESOURCE_NAME = "test";
 
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(StatusPatchLockingReconciler.class)
+              .withConfigurationService(o->o.withUseSSAToPatchPrimaryResource(false))
           .build();
 
   @Test