Skip to content

Commit c1c65b1

Browse files
authored
refactor: rename method more appropriately (#2536)
Signed-off-by: Chris Laprun <[email protected]>
1 parent 24494cb commit c1c65b1

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

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

+10-3
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ default <R extends HasMetadata, P extends HasMetadata> boolean shouldUseSSA(
381381
.flatMap(KubernetesDependentResourceConfig::useSSA);
382382
// don't use SSA for certain resources by default, only if explicitly overriden
383383
if (useSSAConfig.isEmpty()
384-
&& defaultNonSSAResource().contains(dependentResource.resourceType())) {
384+
&& defaultNonSSAResources().contains(dependentResource.resourceType())) {
385385
return false;
386386
}
387387
return useSSAConfig.orElse(ssaBasedCreateUpdateMatchForDependentResources());
@@ -397,12 +397,19 @@ && defaultNonSSAResource().contains(dependentResource.resourceType())) {
397397
* By default, SSA is disabled for {@link ConfigMap} and {@link Secret} resources.
398398
*
399399
* @return The set of resource types for which SSA will not be used
400-
* @since 4.4.0
401400
*/
402-
default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
401+
default Set<Class<? extends HasMetadata>> defaultNonSSAResources() {
403402
return Set.of(ConfigMap.class, Secret.class);
404403
}
405404

405+
/**
406+
* @deprecated Use {@link #defaultNonSSAResources()} instead
407+
*/
408+
@Deprecated(forRemoval = true)
409+
default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
410+
return defaultNonSSAResources();
411+
}
412+
406413
/**
407414
* If a javaoperatorsdk.io/previous annotation should be used so that the operator sdk can detect
408415
* events from its own updates of dependent resources and then filter them.

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class ConfigurationServiceOverrider {
4040
private Set<Class<? extends HasMetadata>> defaultNonSSAResource;
4141
private Boolean previousAnnotationForDependentResources;
4242
private Boolean parseResourceVersions;
43+
@SuppressWarnings("rawtypes")
4344
private DependentResourceFactory dependentResourceFactory;
4445

4546
ConfigurationServiceOverrider(ConfigurationService original) {
@@ -79,6 +80,7 @@ public ConfigurationServiceOverrider withMinConcurrentWorkflowExecutorThreads(in
7980
return this;
8081
}
8182

83+
@SuppressWarnings("rawtypes")
8284
public ConfigurationServiceOverrider withDependentResourceFactory(
8385
DependentResourceFactory dependentResourceFactory) {
8486
this.dependentResourceFactory = dependentResourceFactory;
@@ -192,6 +194,7 @@ public boolean checkCRDAndValidateLocalModel() {
192194
return checkCR != null ? checkCR : original.checkCRDAndValidateLocalModel();
193195
}
194196

197+
@SuppressWarnings("rawtypes")
195198
@Override
196199
public DependentResourceFactory dependentResourceFactory() {
197200
return dependentResourceFactory != null ? dependentResourceFactory
@@ -302,9 +305,9 @@ public boolean ssaBasedCreateUpdateMatchForDependentResources() {
302305
}
303306

304307
@Override
305-
public Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
308+
public Set<Class<? extends HasMetadata>> defaultNonSSAResources() {
306309
return defaultNonSSAResource != null ? defaultNonSSAResource
307-
: super.defaultNonSSAResource();
310+
: super.defaultNonSSAResources();
308311
}
309312

310313
@Override

0 commit comments

Comments
 (0)