build fix

Author: csviri

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

@@ -109,11 +109,4 @@ public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> getCus
         return customResourceClients.get(customResourceClass);
     }
 
-    private String getKind(CustomResourceDefinition crd) {
-        return crd.getSpec().getNames().getKind();
-    }
-
-    private String getApiVersion(CustomResourceDefinition crd) {
-        return crd.getSpec().getGroup() + "/" + crd.getSpec().getVersion();
-    }
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/DeleteControl.java

@@ -2,25 +2,17 @@
 
 public class DeleteControl {
 
-    public static DeleteControl defaultDelete() {
-        return new DeleteControl();
-    }
+    public static final DeleteControl DEFAULT_DELETE = new DeleteControl(true);
+    public static final DeleteControl NO_FINALIZER_REMOVAL = new DeleteControl(false);
 
-    public static DeleteControl noFinalizerRemoval() {
-        DeleteControl deleteControl = new DeleteControl();
-        deleteControl.setRemoveFinalizer(false);
-        return deleteControl;
-    }
+    private final boolean removeFinalizer;
 
-    private boolean removeFinalizer = true;
+    private DeleteControl(boolean removeFinalizer) {
+        this.removeFinalizer = removeFinalizer;
+    }
 
     public boolean getRemoveFinalizer() {
         return removeFinalizer;
     }
 
-    public DeleteControl setRemoveFinalizer(boolean removeFinalizer) {
-        this.removeFinalizer = removeFinalizer;
-        return this;
-    }
-
 }

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

@@ -5,7 +5,7 @@
 
 import java.util.*;
 
-public class EventBuffer {
+class EventBuffer {
 
     private Map<String, List<Event>> events = new HashMap<>();
 

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

@@ -27,7 +27,7 @@ static class TestCustomFinalizerController implements ResourceController<TestCus
 
         @Override
         public DeleteControl deleteResource(TestCustomResource resource, Context<TestCustomResource> context) {
-            return DeleteControl.defaultDelete();
+            return DeleteControl.DEFAULT_DELETE;
         }
 
         @Override

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

@@ -36,7 +36,7 @@ void setup() {
         testCustomResource.getMetadata().setFinalizers(new ArrayList<>(Collections.singletonList(DEFAULT_FINALIZER)));
 
         when(controller.createOrUpdateResource(eq(testCustomResource), any())).thenReturn(UpdateControl.updateCustomResource(testCustomResource));
-        when(controller.deleteResource(eq(testCustomResource), any())).thenReturn(DeleteControl.defaultDelete());
+        when(controller.deleteResource(eq(testCustomResource), any())).thenReturn(DeleteControl.DEFAULT_DELETE);
         when(customResourceFacade.replaceWithLock(any())).thenReturn(null);
     }
 
@@ -106,7 +106,7 @@ void removesDefaultFinalizerOnDelete() {
 
     @Test
     void doesNotRemovesTheFinalizerIfTheDeleteNotMethodInstructsIt() {
-        when(controller.deleteResource(eq(testCustomResource), any())).thenReturn(DeleteControl.noFinalizerRemoval());
+        when(controller.deleteResource(eq(testCustomResource), any())).thenReturn(DeleteControl.NO_FINALIZER_REMOVAL);
         markForDeletion(testCustomResource);
 
         eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));

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

@@ -46,7 +46,7 @@ public DeleteControl deleteResource(TestCustomResource resource, Context<TestCus
         } else {
             log.error("Failed to delete ConfigMap {} for resource: {}", resource.getSpec().getConfigMapName(), resource.getMetadata().getName());
         }
-        return new DeleteControl();
+        return DeleteControl.DEFAULT_DELETE;
     }
 
     @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/subresource/SubResourceTestCustomResourceController.java

@@ -21,7 +21,7 @@ public class SubResourceTestCustomResourceController implements ResourceControll
 
     @Override
     public DeleteControl deleteResource(SubResourceTestCustomResource resource, Context<SubResourceTestCustomResource> context) {
-        return DeleteControl.defaultDelete();
+        return DeleteControl.DEFAULT_DELETE;
     }
 
     @Override

samples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceController.java

@@ -30,7 +30,7 @@ public DeleteControl deleteResource(CustomService resource, Context<CustomServic
         log.info("Execution deleteResource for: {}", resource.getMetadata().getName());
         kubernetesClient.services().inNamespace(resource.getMetadata().getNamespace())
                 .withName(resource.getSpec().getName()).delete();
-        return new DeleteControl();
+        return DeleteControl.DEFAULT_DELETE;
     }
 
     @Override

samples/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/SchemaController.java

@@ -122,10 +122,10 @@ public DeleteControl deleteResource(Schema schema, Context<Schema> context) {
                 log.info("Delete event ignored for schema '{}', real schema doesn't exist",
                         schema.getMetadata().getName());
             }
-            return DeleteControl.defaultDelete();
+            return DeleteControl.DEFAULT_DELETE;
         } catch (SQLException e) {
             log.error("Error while trying to delete Schema", e);
-            return DeleteControl.noFinalizerRemoval();
+            return DeleteControl.NO_FINALIZER_REMOVAL;
         }
     }
 

samples/tomcat/src/main/java/io/javaoperatorsdk/operator/sample/TomcatController.java

@@ -86,7 +86,7 @@ public void onClose(KubernetesClientException cause) {
     public DeleteControl deleteResource(Tomcat tomcat, Context<Tomcat> context) {
         deleteDeployment(tomcat);
         deleteService(tomcat);
-        return DeleteControl.defaultDelete();
+        return DeleteControl.DEFAULT_DELETE;
     }
 
     private Deployment createOrUpdateDeployment(Tomcat tomcat) {