refactor!: rename JUnit extensions more appropriately

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/E2EOperatorExtension.java → operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/ClusterOperatorExtension.java

@@ -20,14 +20,14 @@
 import io.fabric8.kubernetes.api.model.rbac.ClusterRoleBinding;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 
-public class E2EOperatorExtension extends AbstractOperatorExtension {
+public class ClusterOperatorExtension extends AbstractOperatorExtension {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(E2EOperatorExtension.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(ClusterOperatorExtension.class);
 
   private final List<HasMetadata> operatorDeployment;
   private final Duration operatorDeploymentTimeout;
 
-  private E2EOperatorExtension(
+  private ClusterOperatorExtension(
       ConfigurationService configurationService,
       List<HasMetadata> operatorDeployment,
       Duration operatorDeploymentTimeout,
@@ -44,7 +44,7 @@ private E2EOperatorExtension(
   }
 
   /**
-   * Creates a {@link Builder} to set up an {@link E2EOperatorExtension} instance.
+   * Creates a {@link Builder} to set up an {@link ClusterOperatorExtension} instance.
    *
    * @return the builder.
    */
@@ -132,8 +132,8 @@ public Builder withOperatorDeployment(HasMetadata... hms) {
       return this;
     }
 
-    public E2EOperatorExtension build() {
-      return new E2EOperatorExtension(
+    public ClusterOperatorExtension build() {
+      return new ClusterOperatorExtension(
           configurationService,
           operatorDeployment,
           deploymentTimeout,

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java → operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocalOperatorExtension.java

@@ -26,17 +26,17 @@
 import static io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider.override;
 
 @SuppressWarnings("rawtypes")
-public class OperatorExtension extends AbstractOperatorExtension {
+public class LocalOperatorExtension extends AbstractOperatorExtension {
 
-  private static final Logger LOGGER = LoggerFactory.getLogger(OperatorExtension.class);
+  private static final Logger LOGGER = LoggerFactory.getLogger(LocalOperatorExtension.class);
 
   private final Operator operator;
   private final List<ReconcilerSpec> reconcilers;
-  private List<PortFowardSpec> portForwards;
-  private List<LocalPortForward> localPortForwards;
-  private Map<Reconciler, RegisteredController> registeredControllers;
+  private final List<PortFowardSpec> portForwards;
+  private final List<LocalPortForward> localPortForwards;
+  private final Map<Reconciler, RegisteredController> registeredControllers;
 
-  private OperatorExtension(
+  private LocalOperatorExtension(
       ConfigurationService configurationService,
       List<ReconcilerSpec> reconcilers,
       List<HasMetadata> infrastructure,
@@ -60,7 +60,7 @@ private OperatorExtension(
   }
 
   /**
-   * Creates a {@link Builder} to set up an {@link OperatorExtension} instance.
+   * Creates a {@link Builder} to set up an {@link LocalOperatorExtension} instance.
    *
    * @return the builder.
    */
@@ -221,8 +221,8 @@ public Builder withPortForward(String namespace, String labelKey, String labelVa
       return this;
     }
 
-    public OperatorExtension build() {
-      return new OperatorExtension(
+    public LocalOperatorExtension build() {
+      return new LocalOperatorExtension(
           configurationService,
           reconcilers,
           infrastructure,

operator-framework/src/test/java/io/javaoperatorsdk/operator/ChangeNamespaceIT.java

@@ -12,7 +12,7 @@
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.changenamespace.ChangeNamespaceTestCustomResource;
 import io.javaoperatorsdk.operator.sample.changenamespace.ChangeNamespaceTestReconciler;
 
@@ -26,8 +26,8 @@ class ChangeNamespaceIT {
   public static final String TEST_RESOURCE_NAME_3 = "test3";
   public static final String ADDITIONAL_TEST_NAMESPACE = "additional-test-namespace";
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new ChangeNamespaceTestReconciler()).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new ChangeNamespaceTestReconciler()).build();
 
   @Test
   void addNewAndRemoveOldNamespaceTest() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/CleanerForReconcilerIT.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.cleanerforreconciler.CleanerForReconcilerCustomResource;
 import io.javaoperatorsdk.operator.sample.cleanerforreconciler.CleanerForReconcilerTestReconciler;
 
@@ -16,8 +16,9 @@ class CleanerForReconcilerIT {
   public static final String TEST_RESOURCE_NAME = "cleaner-for-reconciler-test1";
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new CleanerForReconcilerTestReconciler()).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new CleanerForReconcilerTestReconciler())
+          .build();
 
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

@@ -10,7 +10,7 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import io.javaoperatorsdk.operator.sample.simple.TestReconciler;
 import io.javaoperatorsdk.operator.support.TestUtils;
@@ -26,8 +26,8 @@ class ConcurrencyIT {
   private static final Logger log = LoggerFactory.getLogger(ConcurrencyIT.class);
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new TestReconciler(true)).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new TestReconciler(true)).build();
 
   @Test
   void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException {

operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import io.javaoperatorsdk.operator.sample.simple.TestReconciler;
 import io.javaoperatorsdk.operator.support.TestUtils;
@@ -18,8 +18,8 @@
 class ControllerExecutionIT {
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new TestReconciler(true)).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new TestReconciler(true)).build();
 
   @Test
   void configMapGetsCreatedForTestCustomResource() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/CreateUpdateInformerEventSourceEventFilterIT.java

@@ -7,7 +7,7 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.createupdateeventfilter.CreateUpdateEventFilterTestCustomResource;
 import io.javaoperatorsdk.operator.sample.createupdateeventfilter.CreateUpdateEventFilterTestCustomResourceSpec;
 import io.javaoperatorsdk.operator.sample.createupdateeventfilter.CreateUpdateEventFilterTestReconciler;
@@ -19,8 +19,8 @@
 class CreateUpdateInformerEventSourceEventFilterIT {
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder()
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder()
           .withReconciler(new CreateUpdateEventFilterTestReconciler())
           .build();
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/CustomResourceFilterIT.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.customfilter.CustomFilteringTestReconciler;
 import io.javaoperatorsdk.operator.sample.customfilter.CustomFilteringTestResource;
 import io.javaoperatorsdk.operator.sample.customfilter.CustomFilteringTestResourceSpec;
@@ -14,8 +14,8 @@
 class CustomResourceFilterIT {
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new CustomFilteringTestReconciler()).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new CustomFilteringTestReconciler()).build();
 
   @Test
   void doesCustomFiltering() throws InterruptedException {

operator-framework/src/test/java/io/javaoperatorsdk/operator/DeleterForManagedDependentResourcesOnlyIT.java

@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.cleanermanageddependent.CleanerForManagedDependentCustomResource;
 import io.javaoperatorsdk.operator.sample.cleanermanageddependent.CleanerForManagedDependentTestReconciler;
 import io.javaoperatorsdk.operator.sample.cleanermanageddependent.ConfigMapDependentResource;
@@ -17,8 +17,9 @@ class DeleterForManagedDependentResourcesOnlyIT {
   public static final String TEST_RESOURCE_NAME = "cleaner-for-reconciler-test1";
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new CleanerForManagedDependentTestReconciler())
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder()
+          .withReconciler(new CleanerForManagedDependentTestReconciler())
           .build();
 
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentOperationEventFilterIT.java

@@ -7,7 +7,7 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.dependentoperationeventfiltering.ConfigMapDependentResource;
 import io.javaoperatorsdk.operator.sample.dependentoperationeventfiltering.DependentOperationEventFilterCustomResource;
 import io.javaoperatorsdk.operator.sample.dependentoperationeventfiltering.DependentOperationEventFilterCustomResourceSpec;
@@ -23,8 +23,8 @@ class DependentOperationEventFilterIT {
   public static final String SPEC_VAL_2 = "val2";
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder()
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder()
           .withReconciler(new DependentOperationEventFilterCustomResourceTestReconciler())
           .build();
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentPrimaryIndexerIT.java

@@ -1,12 +1,13 @@
 package io.javaoperatorsdk.operator;
 
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.primaryindexer.DependentPrimaryIndexerTestReconciler;
 
 public class DependentPrimaryIndexerIT extends PrimaryIndexerIT {
 
-  protected OperatorExtension buildOperator() {
-    return OperatorExtension.builder().withReconciler(new DependentPrimaryIndexerTestReconciler())
+  protected LocalOperatorExtension buildOperator() {
+    return LocalOperatorExtension.builder()
+        .withReconciler(new DependentPrimaryIndexerTestReconciler())
         .build();
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/ErrorStatusHandlerIT.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
 import io.javaoperatorsdk.operator.sample.errorstatushandler.ErrorStatusHandlerTestCustomResource;
 import io.javaoperatorsdk.operator.sample.errorstatushandler.ErrorStatusHandlerTestReconciler;
@@ -20,8 +20,8 @@ class ErrorStatusHandlerIT {
   ErrorStatusHandlerTestReconciler reconciler = new ErrorStatusHandlerTestReconciler();
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder()
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder()
           .withReconciler(reconciler,
               new GenericRetry().setMaxAttempts(MAX_RETRY_ATTEMPTS).withLinearRetry())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSourceIT.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomReconciler;
 import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResource;
 import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResourceSpec;
@@ -17,8 +17,9 @@
 
 class EventSourceIT {
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(EventSourceTestCustomReconciler.class).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(EventSourceTestCustomReconciler.class)
+          .build();
 
   @Test
   void receivingPeriodicEvents() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerEventSourceIT.java

@@ -8,7 +8,7 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.informereventsource.InformerEventSourceTestCustomReconciler;
 import io.javaoperatorsdk.operator.sample.informereventsource.InformerEventSourceTestCustomResource;
 
@@ -24,8 +24,8 @@ class InformerEventSourceIT {
   public static final String UPDATE_STATUS_MESSAGE = "Updated Status";
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder()
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder()
           .withReconciler(new InformerEventSourceTestCustomReconciler())
           .build();
 
@@ -38,7 +38,7 @@ void testUsingInformerToWatchChangesOfConfigMap() {
     waitForCRStatusValue(INITIAL_STATUS_MESSAGE);
 
     configMap.getData().put(TARGET_CONFIG_MAP_KEY, UPDATE_STATUS_MESSAGE);
-    configMap = operator.replace(ConfigMap.class, configMap);
+    operator.replace(ConfigMap.class, configMap);
 
     waitForCRStatusValue(UPDATE_STATUS_MESSAGE);
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/KubernetesResourceStatusUpdateIT.java

@@ -11,7 +11,7 @@
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.fabric8.kubernetes.api.model.apps.DeploymentSpec;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.deployment.DeploymentReconciler;
 
 import static io.javaoperatorsdk.operator.sample.deployment.DeploymentReconciler.STATUS_MESSAGE;
@@ -21,8 +21,8 @@
 class KubernetesResourceStatusUpdateIT {
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new DeploymentReconciler()).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new DeploymentReconciler()).build();
 
   @Test
   void testReconciliationOfNonCustomResourceAndStatusUpdate() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/MaxIntervalIT.java

@@ -6,7 +6,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.maxinterval.MaxIntervalTestCustomResource;
 import io.javaoperatorsdk.operator.sample.maxinterval.MaxIntervalTestReconciler;
 
@@ -15,8 +15,8 @@
 class MaxIntervalIT {
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder().withReconciler(new MaxIntervalTestReconciler()).build();
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder().withReconciler(new MaxIntervalTestReconciler()).build();
 
   @Test
   void reconciliationTriggeredBasedOnMaxInterval() {

operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java

@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.javaoperatorsdk.operator.junit.OperatorExtension;
+import io.javaoperatorsdk.operator.junit.LocalOperatorExtension;
 import io.javaoperatorsdk.operator.sample.multiversioncrd.*;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
@@ -19,8 +19,8 @@ class MultiVersionCRDIT {
   public static final String CR_V2_NAME = "crv2";
 
   @RegisterExtension
-  OperatorExtension operator =
-      OperatorExtension.builder()
+  LocalOperatorExtension operator =
+      LocalOperatorExtension.builder()
           .withReconciler(MultiVersionCRDTestReconciler1.class)
           .withReconciler(MultiVersionCRDTestReconciler2.class)
           .build();