merged master, build fix

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/EventDispatcher.java

@@ -53,7 +53,7 @@ private PostExecutionControl handDispatch(ExecutionScope executionScope) {
             cleanup(executionScope.getCustomResource());
             return PostExecutionControl.defaultDispatch();
         }
-        if ((markedForDeletion(resource) && !ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer))) {
+        if ((markedForDeletion(resource) && !ControllerUtils.hasGivenFinalizer(resource, resourceDefaultFinalizer))) {
             log.debug("Skipping event dispatching since its marked for deletion but has no default finalizer: {}", executionScope);
             return PostExecutionControl.defaultDispatch();
         }
@@ -66,7 +66,7 @@ private PostExecutionControl handDispatch(ExecutionScope executionScope) {
     }
 
     private PostExecutionControl handleCreateOrUpdate(ExecutionScope executionScope, CustomResource resource, Context context) {
-        if (!ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer) && !markedForDeletion(resource)) {
+        if (!ControllerUtils.hasGivenFinalizer(resource, resourceDefaultFinalizer) && !markedForDeletion(resource)) {
             /*  We always add the default finalizer if missing and not marked for deletion.
                 We execute the controller processing only for processing the event sent as a results
                 of the finalizer add. This will make sure that the resources are not created before
@@ -101,7 +101,7 @@ private boolean skipBecauseOfGenerations(ExecutionScope executionScope) {
 
     private PostExecutionControl handleDelete(CustomResource resource, Context context) {
         DeleteControl deleteControl = controller.deleteResource(resource, context);
-        boolean hasDefaultFinalizer = ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer);
+        boolean hasDefaultFinalizer = ControllerUtils.hasGivenFinalizer(resource, resourceDefaultFinalizer);
         if (deleteControl.getRemoveFinalizer() && hasDefaultFinalizer) {
             removeDefaultFinalizer(resource);
             cleanup(resource);
@@ -160,7 +160,7 @@ private void replace(CustomResource resource) {
     }
 
     private void addFinalizerIfNotPresent(CustomResource resource) {
-        if (!ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer) && !markedForDeletion(resource)) {
+        if (!ControllerUtils.hasGivenFinalizer(resource, resourceDefaultFinalizer) && !markedForDeletion(resource)) {
             log.info("Adding default finalizer to {}", resource.getMetadata());
             if (resource.getMetadata().getFinalizers() == null) {
                 resource.getMetadata().setFinalizers(new ArrayList<>(1));

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

@@ -1,10 +1,7 @@
 package io.javaoperatorsdk.operator;
 
 import io.fabric8.kubernetes.client.CustomResourceDoneable;
-import io.javaoperatorsdk.operator.api.Context;
-import io.javaoperatorsdk.operator.api.Controller;
-import io.javaoperatorsdk.operator.api.ResourceController;
-import io.javaoperatorsdk.operator.api.UpdateControl;
+import io.javaoperatorsdk.operator.api.*;
 import io.javaoperatorsdk.operator.sample.TestCustomResource;
 import io.javaoperatorsdk.operator.sample.TestCustomResourceController;
 import org.junit.jupiter.api.Assertions;
@@ -29,8 +26,8 @@ public void returnsValuesFromControllerAnnotationFinalizer() {
     static class TestCustomFinalizerController implements ResourceController<TestCustomResource> {
 
         @Override
-        public boolean deleteResource(TestCustomResource resource, Context<TestCustomResource> context) {
-            return false;
+        public DeleteControl deleteResource(TestCustomResource resource, Context<TestCustomResource> context) {
+            return DeleteControl.defaultDelete();
         }
 
         @Override