Skip to content

Commit f188c1f

Browse files
author
Soroosh Sarabadani
committed
rename defaultFinalizer to finalizer
1 parent 25755c5 commit f188c1f

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ public class EventDispatcher {
2121
private final static Logger log = LoggerFactory.getLogger(EventDispatcher.class);
2222

2323
private final ResourceController controller;
24-
private final String resourceDefaultFinalizer;
24+
private final String resourceFinalizer;
2525
private final CustomResourceFacade customResourceFacade;
2626
private final boolean generationAware;
2727
private final Map<String, Long> lastGenerationProcessedSuccessfully = new ConcurrentHashMap<>();
2828

2929
public EventDispatcher(ResourceController controller,
30-
String defaultFinalizer,
30+
String finalizer,
3131
CustomResourceFacade customResourceFacade, boolean generationAware) {
3232
this.controller = controller;
3333
this.customResourceFacade = customResourceFacade;
34-
this.resourceDefaultFinalizer = defaultFinalizer;
34+
this.resourceFinalizer = finalizer;
3535
this.generationAware = generationAware;
3636
}
3737

@@ -43,23 +43,23 @@ public void handleEvent(CustomResourceEvent event) {
4343
log.error("Received error for resource: {}", resource.getMetadata().getName());
4444
return;
4545
}
46-
if (markedForDeletion(resource) && !ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer)) {
47-
log.debug("Skipping event dispatching since its marked for deletion but has no default finalizer: {}", event);
46+
if (markedForDeletion(resource) && !ControllerUtils.hasGivenFinalizer(resource, resourceFinalizer)) {
47+
log.debug("Skipping event dispatching since its marked for deletion but does not have finalizer: {}", event);
4848
return;
4949
}
5050
Context context = new DefaultContext(new RetryInfo(event.getRetryCount(), event.getRetryExecution().isLastExecution()));
5151
if (markedForDeletion(resource)) {
5252
boolean removeFinalizer = controller.deleteResource(resource, context);
53-
boolean hasDefaultFinalizer = ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer);
54-
if (removeFinalizer && hasDefaultFinalizer) {
55-
removeDefaultFinalizer(resource);
53+
boolean hasFinalizer = ControllerUtils.hasGivenFinalizer(resource, resourceFinalizer);
54+
if (removeFinalizer && hasFinalizer) {
55+
removeFinalizer(resource);
5656
} else {
57-
log.debug("Skipping finalizer remove. removeFinalizer: {}, hasDefaultFinalizer: {} ",
58-
removeFinalizer, hasDefaultFinalizer);
57+
log.debug("Skipping finalizer remove. removeFinalizer: {}, hasFinalizer: {} ",
58+
removeFinalizer, hasFinalizer);
5959
}
6060
cleanup(resource);
6161
} else {
62-
if (!ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer) && !markedForDeletion(resource)) {
62+
if (!ControllerUtils.hasGivenFinalizer(resource, resourceFinalizer) && !markedForDeletion(resource)) {
6363
/* We always add the default finalizer if missing and not marked for deletion.
6464
We execute the controller processing only for processing the event sent as a results
6565
of the finalizer add. This will make sure that the resources are not created before
@@ -118,9 +118,9 @@ private void updateCustomResource(CustomResource updatedResource) {
118118
}
119119

120120

121-
private void removeDefaultFinalizer(CustomResource resource) {
121+
private void removeFinalizer(CustomResource resource) {
122122
log.debug("Removing finalizer on resource {}:", resource);
123-
resource.getMetadata().getFinalizers().remove(resourceDefaultFinalizer);
123+
resource.getMetadata().getFinalizers().remove(resourceFinalizer);
124124
customResourceFacade.replaceWithLock(resource);
125125
}
126126

@@ -130,12 +130,12 @@ private void replace(CustomResource resource) {
130130
}
131131

132132
private void addFinalizerIfNotPresent(CustomResource resource) {
133-
if (!ControllerUtils.hasDefaultFinalizer(resource, resourceDefaultFinalizer) && !markedForDeletion(resource)) {
133+
if (!ControllerUtils.hasGivenFinalizer(resource, resourceFinalizer) && !markedForDeletion(resource)) {
134134
log.info("Adding default finalizer to {}", resource.getMetadata());
135135
if (resource.getMetadata().getFinalizers() == null) {
136136
resource.getMetadata().setFinalizers(new ArrayList<>(1));
137137
}
138-
resource.getMetadata().getFinalizers().add(resourceDefaultFinalizer);
138+
resource.getMetadata().getFinalizers().add(resourceFinalizer);
139139
}
140140
}
141141

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void callCreateOrUpdateOnModifiedResource() {
6464
}
6565

6666
@Test
67-
void adsDefaultFinalizerOnCreateIfNotThere() {
67+
void addsFinalizerOnCreateIfNotThere() {
6868
eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));
6969
verify(controller, times(1))
7070
.createOrUpdateResource(argThat(testCustomResource ->
@@ -85,7 +85,7 @@ void callsDeleteIfObjectHasFinalizerAndMarkedForDelete() {
8585
* Note that there could be more finalizers. Out of our control.
8686
*/
8787
@Test
88-
void callDeleteOnControllerIfMarkedForDeletionButThereIsNoDefaultFinalizer() {
88+
void callDeleteOnControllerIfMarkedForDeletionButThereIsNoFinalizer() {
8989
markForDeletion(testCustomResource);
9090

9191
eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));
@@ -94,7 +94,7 @@ void callDeleteOnControllerIfMarkedForDeletionButThereIsNoDefaultFinalizer() {
9494
}
9595

9696
@Test
97-
void removesDefaultFinalizerOnDelete() {
97+
void removesFinalizerOnDelete() {
9898
markForDeletion(testCustomResource);
9999

100100
eventDispatcher.handleEvent(customResourceEvent(Watcher.Action.MODIFIED, testCustomResource));

0 commit comments

Comments
 (0)