Skip to content

Commit 9939058

Browse files
committed
Delete control as enum
1 parent b43cd0b commit 9939058

File tree

2 files changed

+6
-16
lines changed

2 files changed

+6
-16
lines changed
Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
package io.javaoperatorsdk.operator.api;
22

3-
public class DeleteControl {
3+
public enum DeleteControl {
44

5-
public static final DeleteControl DEFAULT_DELETE = new DeleteControl(true);
6-
public static final DeleteControl NO_FINALIZER_REMOVAL = new DeleteControl(false);
7-
8-
private final boolean removeFinalizer;
9-
10-
private DeleteControl(boolean removeFinalizer) {
11-
this.removeFinalizer = removeFinalizer;
12-
}
13-
14-
public boolean getRemoveFinalizer() {
15-
return removeFinalizer;
16-
}
5+
DEFAULT_DELETE,
6+
NO_FINALIZER_REMOVAL
177

188
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ private boolean skipBecauseOfGenerations(ExecutionScope executionScope) {
106106
private PostExecutionControl handleDelete(CustomResource resource, Context context) {
107107
DeleteControl deleteControl = controller.deleteResource(resource, context);
108108
boolean hasFinalizer = ControllerUtils.hasGivenFinalizer(resource, resourceFinalizer);
109-
if (deleteControl.getRemoveFinalizer() && hasFinalizer) {
109+
if (deleteControl == DeleteControl.DEFAULT_DELETE && hasFinalizer) {
110110
removeFinalizer(resource);
111111
cleanup(resource);
112112
} else {
113-
log.debug("Skipping finalizer remove. removeFinalizer: {}, hasFinalizer: {} ",
114-
deleteControl.getRemoveFinalizer(), hasFinalizer);
113+
log.debug("Skipping finalizer remove. delete control: {}, hasFinalizer: {} ",
114+
deleteControl, hasFinalizer);
115115
}
116116
return PostExecutionControl.defaultDispatch();
117117
}

0 commit comments

Comments
 (0)