rename hasDefaultFinalizer to hasGivenFinalizer

Soroosh Sarabadani · Soroosh Sarabadani · commit 25755c57f139 · 2020-11-17T15:31:43.000+01:00
diff --git a/operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java b/operator-framework/src/main/java/io/javaoperatorsdk/operator/ControllerUtils.java
@@ -84,10 +84,7 @@ private static Controller getAnnotation(ResourceController controller) {
         return controller.getClass().getAnnotation(Controller.class);
     }
 
-    public static boolean hasDefaultFinalizer(CustomResource resource, String finalizer) {
-        if (resource.getMetadata().getFinalizers() != null) {
-            return resource.getMetadata().getFinalizers().contains(finalizer);
-        }
-        return false;
+    public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {
+        return resource.getMetadata().getFinalizers() != null && resource.getMetadata().getFinalizers().contains(finalizer);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,7 @@ private static Controller getAnnotation(ResourceController controller) {`
`84`	`84`	`return controller.getClass().getAnnotation(Controller.class);`
`85`	`85`	`}`
`86`	`86`
`87`		`- public static boolean hasDefaultFinalizer(CustomResource resource, String finalizer) {`
`88`		`- if (resource.getMetadata().getFinalizers() != null) {`
`89`		`- return resource.getMetadata().getFinalizers().contains(finalizer);`
`90`		`- }`
`91`		`- return false;`
	`87`	`+ public static boolean hasGivenFinalizer(CustomResource resource, String finalizer) {`
	`88`	`+ return resource.getMetadata().getFinalizers() != null && resource.getMetadata().getFinalizers().contains(finalizer);`
`92`	`89`	`}`
`93`	`90`	`}`