comment

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Author: csviri

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

@@ -59,6 +59,7 @@ private InformerConfiguration<R> createInformerConfiguration(KubernetesDependent
     try {
       Class<? extends KubernetesDependentResource<?, ?>> dependentResourceClass =
           (Class<? extends KubernetesDependentResource<?, ?>>) spec.getDependentResourceClass();
+      // this is quite ugly but getting the resource type would be quite cumbersome
       var resourceType = dependentResourceClass.getConstructor().newInstance().resourceType();
 
       InformerConfiguration.InformerConfigurationBuilder informerConfig;

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

@@ -43,8 +43,7 @@ public abstract class KubernetesDependentResource<R extends HasMetadata, P exten
   @SuppressWarnings("unchecked")
   private final ResourceUpdaterMatcher<R> updaterMatcher = usingCustomResourceUpdateMatcher
       ? (ResourceUpdaterMatcher<R>) this
-      : GenericResourceUpdaterMatcher.updaterMatcherFor(resourceType());
-  private final boolean clustered;
+      : GenericResourceUpdaterMatcher.updaterMatcherFor();
   private KubernetesDependentResourceConfig<R> kubernetesDependentResourceConfig;
 
   public KubernetesDependentResource(Class<R> resourceType) {
@@ -53,14 +52,6 @@ public KubernetesDependentResource(Class<R> resourceType) {
 
   public KubernetesDependentResource(Class<R> resourceType, String name) {
     super(resourceType, name);
-    final var primaryResourceType = getPrimaryResourceType();
-    clustered = !Namespaced.class.isAssignableFrom(primaryResourceType);
-  }
-
-  protected KubernetesDependentResource(Class<R> resourceType, String name,
-      boolean primaryIsClustered) {
-    super(resourceType, name);
-    clustered = primaryIsClustered;
   }
 
   @SuppressWarnings("unchecked")
@@ -121,11 +112,11 @@ public Result<R> match(R actualResource, P primary, Context<P> context) {
     return match(actualResource, desired, primary, updaterMatcher, context);
   }
 
-  @SuppressWarnings({"unused", "unchecked"})
+  @SuppressWarnings({"unused"})
   public Result<R> match(R actualResource, R desired, P primary, Context<P> context) {
     return match(actualResource, desired, primary,
-        (ResourceUpdaterMatcher<R>) GenericResourceUpdaterMatcher
-            .updaterMatcherFor(actualResource.getClass()),
+        GenericResourceUpdaterMatcher
+            .updaterMatcherFor(),
         context);
   }
 

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

@@ -17,8 +17,7 @@ public class GenericResourceUpdaterMatcher<R extends HasMetadata> implements
   protected GenericResourceUpdaterMatcher() {}
 
   @SuppressWarnings("unchecked")
-  public static <R extends HasMetadata> ResourceUpdaterMatcher<R> updaterMatcherFor(
-      Class<R> resourceType) {
+  public static <R extends HasMetadata> ResourceUpdaterMatcher<R> updaterMatcherFor() {
     return (ResourceUpdaterMatcher<R>) INSTANCE;
   }