improvements

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericDependentResource.java

@@ -31,7 +31,6 @@ public class GenericDependentResource
 
   protected final GenericKubernetesResource desired;
   protected final String desiredTemplate;
-  protected final String name;
   // resource name might be templated
   protected final String resourceName;
   protected final String namespace;
@@ -43,12 +42,11 @@ public class GenericDependentResource
   public GenericDependentResource(GenericTemplateHandler genericTemplateHandler,
       GenericKubernetesResource desired, String name, String resourceName, String namespace,
       boolean clusterScoped, Matcher matcher) {
-    super(new GroupVersionKind(desired.getApiVersion(), desired.getKind()));
+    super(new GroupVersionKind(desired.getApiVersion(), desired.getKind()), name);
     this.desired = desired;
     this.namespace = namespace;
     this.matcher = matcher;
     this.desiredTemplate = null;
-    this.name = name;
     this.resourceName = resourceName;
     this.clusterScoped = clusterScoped;
     this.genericTemplateHandler = genericTemplateHandler;
@@ -59,9 +57,8 @@ public GenericDependentResource(GenericTemplateHandler genericTemplateHandler,
       boolean clusterScoped,
       Matcher matcher) {
     super(new GroupVersionKind(Utils.getApiVersionFromTemplate(desiredTemplate),
-        Utils.getKindFromTemplate(desiredTemplate)));
+        Utils.getKindFromTemplate(desiredTemplate)), name);
     this.genericTemplateHandler = genericTemplateHandler;
-    this.name = name;
     this.resourceName = resourceName;
     this.desiredTemplate = desiredTemplate;
     this.namespace = namespace;
@@ -136,8 +133,4 @@ protected Optional<GenericKubernetesResource> selectTargetSecondaryResource(
     }
   }
 
-  @Override
-  public String name() {
-    return name;
-  }
 }

src/main/java/io/javaoperatorsdk/operator/glue/reconciler/glue/GlueReconciler.java

@@ -119,7 +119,7 @@ public DeleteControl cleanup(Glue primary, Context<Glue> context) {
       actualWorkflow.getDependentResourcesWithoutActivationCondition().forEach(dr -> {
         var genericDependentResource = (GenericDependentResource) dr;
         informerRegister.deRegisterInformer(
-            toGVKIfGVKP(genericDependentResource.getGroupVersionKind()),
+            genericDependentResource.getGroupVersionKind(),
             primary, context);
       });
       informerRegister.deRegisterInformerForRelatedResources(primary, context);
@@ -203,7 +203,7 @@ private void createAndAddDependentToWorkflow(Glue primary, Context<Glue> context
     }
     var dr = createDependentResource(name, spec, resourceInSameNamespaceAsPrimary,
         targetNamespace.orElse(null));
-    GroupVersionKind gvk = toGVKIfGVKP(dr.getGroupVersionKind());
+    GroupVersionKind gvk = dr.getGroupVersionKind();
     var es = informerRegister.registerInformer(context, gvk, primary);
     dr.setEventSource(es);