- code quality improvements

Author: csviri

operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java

@@ -1,6 +1,5 @@
 package com.github.containersolutions.operator;
 
-import com.github.containersolutions.operator.api.Controller;
 import com.github.containersolutions.operator.api.ResourceController;
 import com.github.containersolutions.operator.processing.EventDispatcher;
 import com.github.containersolutions.operator.processing.EventScheduler;
@@ -61,7 +60,7 @@ private <R extends CustomResource> void registerController(ResourceController<R>
         MixedOperation client = k8sClient.customResources(crd, resClass, CustomResourceList.class, getCustomResourceDoneableClass(controller));
         EventDispatcher eventDispatcher = new EventDispatcher(controller,
                 finalizer, new EventDispatcher.CustomResourceFacade(client), ControllerUtils.getGenerationEventProcessing(controller));
-        EventScheduler eventScheduler = new EventScheduler(eventDispatcher, retry, finalizer);
+        EventScheduler eventScheduler = new EventScheduler(eventDispatcher, retry);
         registerWatches(controller, client, resClass, watchAllNamespaces, targetNamespaces, eventScheduler);
     }
 

operator-framework/src/main/java/com/github/containersolutions/operator/api/Controller.java

@@ -25,5 +25,5 @@
      * See generation meta attribute
      * <a href="https://kubernetes.io/docs/tasks/access-kubernetes-api/custom-resources/custom-resource-definitions/#status-subresource">here</a>
      */
-    boolean generationAwareEventProcessing() default false;
+    boolean generationAwareEventProcessing() default true;
 }

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java

@@ -114,7 +114,7 @@ private void updateCustomResource(CustomResource updatedResource) {
 
 
     private void removeDefaultFinalizer(CustomResource resource) {
-        log.debug("Removing finalizer on {}: {}", resource);
+        log.debug("Removing finalizer on resource {}:", resource);
         resource.getMetadata().getFinalizers().remove(resourceDefaultFinalizer);
         customResourceFacade.replaceWithLock(resource);
     }

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java

@@ -40,14 +40,12 @@ public class EventScheduler implements Watcher<CustomResource> {
     private final ScheduledThreadPoolExecutor executor;
     private final EventStore eventStore = new EventStore();
     private final Retry retry;
-    private final String finalizer;
 
     private ReentrantLock lock = new ReentrantLock();
 
-    public EventScheduler(EventDispatcher eventDispatcher, Retry retry, String finalizer) {
+    public EventScheduler(EventDispatcher eventDispatcher, Retry retry) {
         this.eventDispatcher = eventDispatcher;
         this.retry = retry;
-        this.finalizer = finalizer;
         executor = new ScheduledThreadPoolExecutor(1);
         executor.setRemoveOnCancelPolicy(true);
     }

operator-framework/src/main/java/com/github/containersolutions/operator/processing/retry/GenericRetryExecution.java

@@ -21,7 +21,7 @@ public GenericRetryExecution(GenericRetry genericRetry) {
     public Optional<Long> nextDelay() {
         if (lastAttemptIndex == 0) {
             lastAttemptIndex++;
-            return Optional.of(0l);
+            return Optional.of(0L);
         }
         if (genericRetry.getMaxAttempts() > -1 && lastAttemptIndex >= genericRetry.getMaxAttempts()) {
             return Optional.empty();

operator-framework/src/test/java/com/github/containersolutions/operator/ControllerExecutionIT.java

@@ -65,7 +65,7 @@ public void retryConflict() {
         integrationTestSupport.teardownIfSuccess(() -> {
             TestCustomResource resource = testCustomResource();
             TestCustomResource resource2 = testCustomResource();
-            resource2.getMetadata().getAnnotations().put("testannotation", "val");
+            resource2.getMetadata().getAnnotations().put("test-annotation", "val");
 
             integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).create(resource);
             integrationTestSupport.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(resource2);
@@ -77,7 +77,7 @@ public void retryConflict() {
 
 
     void awaitResourcesCreatedOrUpdated() {
-        await("configmap created").atMost(5, TimeUnit.SECONDS)
+        await("config map created").atMost(5, TimeUnit.SECONDS)
                 .untilAsserted(() -> {
                     ConfigMap configMap = integrationTestSupport.getK8sClient().configMaps().inNamespace(TEST_NAMESPACE)
                             .withName("test-config-map").get();

operator-framework/src/test/java/com/github/containersolutions/operator/EventSchedulerTest.java

@@ -1,6 +1,5 @@
 package com.github.containersolutions.operator;
 
-import com.github.containersolutions.operator.api.Controller;
 import com.github.containersolutions.operator.processing.CustomResourceEvent;
 import com.github.containersolutions.operator.processing.EventDispatcher;
 import com.github.containersolutions.operator.processing.EventScheduler;
@@ -33,7 +32,6 @@ class EventSchedulerTest {
 
     public static final int INVOCATION_DURATION = 80;
     public static final int MAX_RETRY_ATTEMPTS = 3;
-    public static final String finalizer = Controller.DEFAULT_FINALIZER;
     @SuppressWarnings("unchecked")
     private EventDispatcher eventDispatcher = mock(EventDispatcher.class);
 
@@ -210,7 +208,7 @@ private Object normalExecution(InvocationOnMock invocation) {
 
 
     private EventScheduler initScheduler() {
-        return new EventScheduler(eventDispatcher, new GenericRetry().setMaxAttempts(MAX_RETRY_ATTEMPTS).withLinearRetry(), finalizer);
+        return new EventScheduler(eventDispatcher, new GenericRetry().setMaxAttempts(MAX_RETRY_ATTEMPTS).withLinearRetry());
     }
 
     private Object exceptionInExecution(InvocationOnMock invocation) {

operator-framework/src/test/java/com/github/containersolutions/operator/sample/TestCustomResourceController.java

@@ -12,12 +12,12 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
 @Controller(
+        generationAwareEventProcessing = false,
         crdName = TestCustomResourceController.CRD_NAME,
         customResourceClass = TestCustomResource.class)
 public class TestCustomResourceController implements ResourceController<TestCustomResource>, TestExecutionInfoProvider {

operator-framework/src/test/java/com/github/containersolutions/operator/sample/subresource/SubResourceTestCustomResourceController.java

@@ -12,7 +12,8 @@
 
 @Controller(
         crdName = SubResourceTestCustomResourceController.CRD_NAME,
-        customResourceClass = SubResourceTestCustomResource.class)
+        customResourceClass = SubResourceTestCustomResource.class,
+        generationAwareEventProcessing = false)
 public class SubResourceTestCustomResourceController implements ResourceController<SubResourceTestCustomResource>,
         TestExecutionInfoProvider {
 

samples/common/src/main/java/com/github/containersolutions/operator/sample/CustomServiceController.java

@@ -11,6 +11,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Arrays;
+import java.util.Collections;
 
 /**
  * A very simple sample controller that creates a service with a label.
@@ -43,7 +44,7 @@ public UpdateControl<CustomService> createOrUpdateResource(CustomService resourc
         ServicePort servicePort = new ServicePort();
         servicePort.setPort(8080);
         ServiceSpec serviceSpec = new ServiceSpec();
-        serviceSpec.setPorts(Arrays.asList(servicePort));
+        serviceSpec.setPorts(Collections.singletonList(servicePort));
 
         kubernetesClient.services().inNamespace(resource.getMetadata().getNamespace()).createOrReplaceWithNew()
                 .withNewMetadata()