Skip to content

Commit 8455d5a

Browse files
committed
refactor: improve method names
1 parent 793c0f2 commit 8455d5a

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void eventReceived(Watcher.Action action, CustomResource customResource)
9393
return;
9494
}
9595

96-
if (!skipBecauseOfGenerations(customResource)) {
96+
if (!skipBecauseOfGeneration(customResource)) {
9797
eventHandler.handleEvent(new CustomResourceEvent(action, customResource, this));
9898
markLastGenerationProcessed(customResource);
9999
} else {
@@ -111,21 +111,18 @@ private void markLastGenerationProcessed(CustomResource resource) {
111111
}
112112
}
113113

114-
private boolean skipBecauseOfGenerations(CustomResource customResource) {
114+
private boolean skipBecauseOfGeneration(CustomResource customResource) {
115115
if (!generationAware) {
116116
return false;
117117
}
118118
// if CR being deleted generation is naturally not changing, so we process all the events
119119
if (customResource.isMarkedForDeletion()) {
120120
return false;
121121
}
122-
if (!largerGenerationThenProcessedBefore(customResource)) {
123-
return true;
124-
}
125-
return false;
122+
return !hasGenerationAlreadyBeenProcessed(customResource);
126123
}
127124

128-
public boolean largerGenerationThenProcessedBefore(CustomResource resource) {
125+
private boolean hasGenerationAlreadyBeenProcessed(CustomResource resource) {
129126
Long lastGeneration = lastGenerationProcessedSuccessfully.get(resource.getMetadata().getUid());
130127
if (lastGeneration == null) {
131128
return true;

0 commit comments

Comments
 (0)