Skip to content

Commit 228f8d2

Browse files
committed
explanation and using Set instead of list
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 2910c6a commit 228f8d2

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.api.config;
22

33
import java.time.Duration;
4-
import java.util.List;
54
import java.util.Optional;
65
import java.util.Set;
76
import java.util.concurrent.ExecutorService;
@@ -464,10 +463,14 @@ default boolean previousAnnotationForDependentResourcesEventFiltering() {
464463
* resources. Note that if you are sure that the matcher works (most of the cases does) for your
465464
* case, you can remove the resource from the blocklist.
466465
*
466+
* <p>The consequence of adding a resource type to this list is that it will not use event
467+
* filtering in dependent resources, so will process also events which are results from updates of
468+
* the dependent.
469+
*
467470
* @return blocklist of resource classes where the previous version annotation won't be used.
468471
*/
469-
default List<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
470-
return List.of(Deployment.class, StatefulSet.class);
472+
default Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
473+
return Set.of(Deployment.class, StatefulSet.class);
471474
}
472475

473476
/**

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.javaoperatorsdk.operator.api.config;
22

33
import java.time.Duration;
4-
import java.util.List;
54
import java.util.Optional;
65
import java.util.Set;
76
import java.util.concurrent.ExecutorService;
@@ -41,7 +40,7 @@ public class ConfigurationServiceOverrider {
4140
private Boolean parseResourceVersions;
4241
private Boolean useSSAToPatchPrimaryResource;
4342
private Boolean cloneSecondaryResourcesWhenGettingFromCache;
44-
private List<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist;
43+
private Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist;
4544

4645
@SuppressWarnings("rawtypes")
4746
private DependentResourceFactory dependentResourceFactory;
@@ -191,7 +190,7 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC
191190
}
192191

193192
public ConfigurationServiceOverrider previousAnnotationUsageBlocklist(
194-
List<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist) {
193+
Set<Class<? extends HasMetadata>> previousAnnotationUsageBlacklist) {
195194
this.previousAnnotationUsageBlocklist = previousAnnotationUsageBlacklist;
196195
return this;
197196
}
@@ -338,7 +337,7 @@ public boolean cloneSecondaryResourcesWhenGettingFromCache() {
338337
}
339338

340339
@Override
341-
public List<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
340+
public Set<Class<? extends HasMetadata>> previousAnnotationUsageBlocklist() {
342341
return overriddenValueOrDefault(
343342
previousAnnotationUsageBlocklist,
344343
ConfigurationService::previousAnnotationUsageBlocklist);

0 commit comments

Comments
 (0)