refactor: move test sample / duplicate some to fix integration tests

The issue is that since the sample code was living under the
operator-framework-core module, which doesn't include the annotation
processor, the controller implementations were not processed and thus
not found by the runtime when needed. This should, hopefully, address
the issue.

Author: metacosm

operator-framework-core/pom.xml

@@ -28,7 +28,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
             </plugin>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.2.0</version>
@@ -39,7 +39,7 @@
                         </goals>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
         </plugins>
     </build>
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

@@ -42,7 +42,7 @@ public <R extends CustomResource> void register(ResourceController<R> controller
       throws OperatorException {
     final var configuration = configurationService.getConfigurationFor(controller);
     final var retry = GenericRetry.fromConfiguration(configuration.getRetryConfiguration());
-    final var targetNamespaces = configuration.getNamespaces().toArray(new String[]{});
+    final var targetNamespaces = configuration.getNamespaces().toArray(new String[] {});
     registerController(controller, configuration.watchAllNamespaces(), retry, targetNamespaces);
   }
 
@@ -129,7 +129,7 @@ private CustomResourceEventSource createCustomResourceEventSource(
     CustomResourceEventSource customResourceEventSource =
         watchAllNamespaces
             ? CustomResourceEventSource.customResourceEventSourceForAllNamespaces(
-            customResourceCache, client, generationAware, finalizer)
+                customResourceCache, client, generationAware, finalizer)
             : CustomResourceEventSource.customResourceEventSourceForTargetNamespaces(
                 customResourceCache, client, targetNamespaces, generationAware, finalizer);
 
@@ -152,15 +152,15 @@ private CustomResourceDefinitionContext getCustomResourceDefinitionForController
   }
 
   public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl>
-  getCustomResourceClients() {
+      getCustomResourceClients() {
     return customResourceClients;
   }
 
   public <
-      T extends CustomResource,
-      L extends CustomResourceList<T>,
-      D extends CustomResourceDoneable<T>>
-  CustomResourceOperationsImpl<T, L, D> getCustomResourceClients(Class<T> customResourceClass) {
+          T extends CustomResource,
+          L extends CustomResourceList<T>,
+          D extends CustomResourceDoneable<T>>
+      CustomResourceOperationsImpl<T, L, D> getCustomResourceClients(Class<T> customResourceClass) {
     return customResourceClients.get(customResourceClass);
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/OperatorException.java

@@ -2,8 +2,7 @@
 
 public class OperatorException extends RuntimeException {
 
-  public OperatorException() {
-  }
+  public OperatorException() {}
 
   public OperatorException(String message) {
     super(message);

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

@@ -37,8 +37,7 @@ public interface ResourceController<R extends CustomResource> {
    *
    * @param eventSourceManager
    */
-  default void init(EventSourceManager eventSourceManager) {
-  }
+  default void init(EventSourceManager eventSourceManager) {}
 
   default String getName() {
     final var clazz = getClass();

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

@@ -1,5 +1,3 @@
 package io.javaoperatorsdk.operator.api.config;
 
-public class DefaultRetryConfiguration implements RetryConfiguration {
-
-}
+public class DefaultRetryConfiguration implements RetryConfiguration {}

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

@@ -10,6 +10,5 @@ public void setEventHandler(EventHandler eventHandler) {
   }
 
   @Override
-  public void eventSourceDeRegisteredForResource(String customResourceUid) {
-  }
+  public void eventSourceDeRegisteredForResource(String customResourceUid) {}
 }

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

@@ -42,7 +42,7 @@ public String toString() {
         + getCustomResource().getMetadata().getResourceVersion()
         + ", markedForDeletion: "
         + (getCustomResource().getMetadata().getDeletionTimestamp() != null
-        && !getCustomResource().getMetadata().getDeletionTimestamp().isEmpty())
+            && !getCustomResource().getMetadata().getDeletionTimestamp().isEmpty())
         + " ]}";
   }
 

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

@@ -19,9 +19,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * This is a special case since is not bound to a single custom resource
- */
+/** This is a special case since is not bound to a single custom resource */
 public class CustomResourceEventSource extends AbstractEventSource
     implements Watcher<CustomResource> {
 

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java

@@ -120,9 +120,7 @@ void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() {
     verify(controller, times(1)).deleteResource(eq(testCustomResource), any());
   }
 
-  /**
-   * Note that there could be more finalizers. Out of our control.
-   */
+  /** Note that there could be more finalizers. Out of our control. */
   @Test
   void callDeleteOnControllerIfMarkedForDeletionButThereIsNoDefaultFinalizer() {
     markForDeletion(testCustomResource);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomResourceController.java

@@ -4,21 +4,18 @@
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.TestExecutionInfoProvider;
 import io.javaoperatorsdk.operator.api.Context;
 import io.javaoperatorsdk.operator.api.Controller;
 import io.javaoperatorsdk.operator.api.DeleteControl;
 import io.javaoperatorsdk.operator.api.ResourceController;
 import io.javaoperatorsdk.operator.api.UpdateControl;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Controller(generationAwareEventProcessing = false, crdName = TestCustomResourceController.CRD_NAME)
-public class TestCustomResourceController
-    implements ResourceController<TestCustomResource>, TestExecutionInfoProvider {
+public class TestCustomResourceController implements ResourceController<TestCustomResource> {
 
   private static final Logger log = LoggerFactory.getLogger(TestCustomResourceController.class);
 
@@ -27,7 +24,6 @@ public class TestCustomResourceController
 
   private final KubernetesClient kubernetesClient;
   private final boolean updateStatus;
-  private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
   public TestCustomResourceController(KubernetesClient kubernetesClient) {
     this(kubernetesClient, true);
@@ -64,7 +60,6 @@ public DeleteControl deleteResource(
   @Override
   public UpdateControl<TestCustomResource> createOrUpdateResource(
       TestCustomResource resource, Context<TestCustomResource> context) {
-    numberOfExecutions.addAndGet(1);
     if (!resource.getMetadata().getFinalizers().contains(FINALIZER_NAME)) {
       throw new IllegalStateException("Finalizer is not present.");
     }
@@ -116,8 +111,4 @@ private Map<String, String> configMapData(TestCustomResource resource) {
     data.put(resource.getSpec().getKey(), resource.getSpec().getValue());
     return data;
   }
-
-  public int getNumberOfExecutions() {
-    return numberOfExecutions.get();
-  }
 }