Skip to content

Commit 19ce185

Browse files
committed
refactor: rename so that relation between methods is more explicit
Signed-off-by: Chris Laprun <[email protected]>
1 parent e31793c commit 19ce185

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,8 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() {
474474
*
475475
* @return a Set of resource classes where the previous version annotation won't be used.
476476
*/
477-
default Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
477+
default Set<Class<? extends HasMetadata>>
478+
previousAnnotationForDependentResourcesEventFilteringBlocklist() {
478479
return Set.of(Deployment.class, StatefulSet.class);
479480
}
480481

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC
189189
return this;
190190
}
191191

192-
public ConfigurationServiceOverrider previousAnnotationUsageBlocklist(
193-
Set<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist) {
194-
this.previousAnnotationUsageBlocklist = previousAnnotationUsageBlacklist;
192+
public ConfigurationServiceOverrider withPreviousAnnotationForDependentResourcesBlocklist(
193+
Set<Class<? extends HasMetadata>> blocklist) {
194+
this.previousAnnotationUsageBlocklist = blocklist;
195195
return this;
196196
}
197197

@@ -337,10 +337,11 @@ public boolean cloneSecondaryResourcesWhenGettingFromCache() {
337337
}
338338

339339
@Override
340-
public Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
340+
public Set<Class<? extends HasMetadata>>
341+
previousAnnotationForDependentResourcesEventFilteringBlocklist() {
341342
return overriddenValueOrDefault(
342343
previousAnnotationUsageBlocklist,
343-
ConfigurationService::previousAnnotationUsageBlocklist);
344+
ConfigurationService::previousAnnotationForDependentResourcesEventFilteringBlocklist);
344345
}
345346
};
346347
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ private boolean usePreviousAnnotation(Context<P> context) {
173173
&& !context
174174
.getControllerConfiguration()
175175
.getConfigurationService()
176-
.previousAnnotationUsageBlocklist()
176+
.previousAnnotationForDependentResourcesEventFilteringBlocklist()
177177
.contains(this.resourceType());
178178
}
179179
return usePreviousAnnotationForEventFiltering;

0 commit comments

Comments
 (0)