refactor: rename method more appropriately (#2536)

Signed-off-by: Chris Laprun <[email protected]>
operator-framework · Sep 24, 2024 · c1c65b1 · c1c65b1
1 parent 24494cb
commit c1c65b1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/...ework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java b/...ework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationService.java
@@ -381,7 +381,7 @@ default <R extends HasMetadata, P extends HasMetadata> boolean shouldUseSSA(
         .flatMap(KubernetesDependentResourceConfig::useSSA);
     // don't use SSA for certain resources by default, only if explicitly overriden
     if (useSSAConfig.isEmpty()
-        && defaultNonSSAResource().contains(dependentResource.resourceType())) {
+        && defaultNonSSAResources().contains(dependentResource.resourceType())) {
       return false;
     }
     return useSSAConfig.orElse(ssaBasedCreateUpdateMatchForDependentResources());
@@ -397,12 +397,19 @@ && defaultNonSSAResource().contains(dependentResource.resourceType())) {
    * By default, SSA is disabled for {@link ConfigMap} and {@link Secret} resources.
    *
    * @return The set of resource types for which SSA will not be used
-   * @since 4.4.0
    */
-  default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
+  default Set<Class<? extends HasMetadata>> defaultNonSSAResources() {
     return Set.of(ConfigMap.class, Secret.class);
   }
 
+  /**
+   * @deprecated Use {@link #defaultNonSSAResources()} instead
+   */
+  @Deprecated(forRemoval = true)
+  default Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
+    return defaultNonSSAResources();
+  }
+
   /**
    * If a javaoperatorsdk.io/previous annotation should be used so that the operator sdk can detect
    * events from its own updates of dependent resources and then filter them.

diff --git a/...e/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java b/...e/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java
@@ -40,6 +40,7 @@ public class ConfigurationServiceOverrider {
   private Set<Class<? extends HasMetadata>> defaultNonSSAResource;
   private Boolean previousAnnotationForDependentResources;
   private Boolean parseResourceVersions;
+  @SuppressWarnings("rawtypes")
   private DependentResourceFactory dependentResourceFactory;
 
   ConfigurationServiceOverrider(ConfigurationService original) {
@@ -79,6 +80,7 @@ public ConfigurationServiceOverrider withMinConcurrentWorkflowExecutorThreads(in
     return this;
   }
 
+  @SuppressWarnings("rawtypes")
   public ConfigurationServiceOverrider withDependentResourceFactory(
       DependentResourceFactory dependentResourceFactory) {
     this.dependentResourceFactory = dependentResourceFactory;
@@ -192,6 +194,7 @@ public boolean checkCRDAndValidateLocalModel() {
         return checkCR != null ? checkCR : original.checkCRDAndValidateLocalModel();
       }
 
+      @SuppressWarnings("rawtypes")
       @Override
       public DependentResourceFactory dependentResourceFactory() {
         return dependentResourceFactory != null ? dependentResourceFactory
@@ -302,9 +305,9 @@ public boolean ssaBasedCreateUpdateMatchForDependentResources() {
       }
 
       @Override
-      public Set<Class<? extends HasMetadata>> defaultNonSSAResource() {
+      public Set<Class<? extends HasMetadata>> defaultNonSSAResources() {
         return defaultNonSSAResource != null ? defaultNonSSAResource
-            : super.defaultNonSSAResource();
+            : super.defaultNonSSAResources();
       }
 
       @Override