feat: add getPlural method on GroupVersionKind

Signed-off-by: Chris Laprun <claprun@redhat.com>

Author: metacosm

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/GroupVersionKind.java

@@ -2,12 +2,15 @@
 
 import java.util.Objects;
 
+import io.fabric8.kubernetes.api.Pluralize;
 import io.fabric8.kubernetes.api.model.HasMetadata;
 
 public class GroupVersionKind {
   private final String group;
   private final String version;
   private final String kind;
+  private final String plural;
+  private final String apiVersion;
 
   public GroupVersionKind(String apiVersion, String kind) {
     this.kind = kind;
@@ -19,17 +22,26 @@ public GroupVersionKind(String apiVersion, String kind) {
       this.group = groupAndVersion[0];
       this.version = groupAndVersion[1];
     }
+    this.plural = Pluralize.toPlural(kind);
+    this.apiVersion = apiVersion;
   }
 
   public GroupVersionKind(String group, String version, String kind) {
+    this(group, version, kind, null);
+  }
+
+  public GroupVersionKind(String group, String version, String kind, String plural) {
     this.group = group;
     this.version = version;
     this.kind = kind;
+    this.plural = plural != null ? plural : Pluralize.toPlural(kind);
+    this.apiVersion = (group == null || group.isBlank()) ? version : group + "/" + version;
   }
 
   public static GroupVersionKind gvkFor(Class<? extends HasMetadata> resourceClass) {
     return new GroupVersionKind(HasMetadata.getGroup(resourceClass),
-        HasMetadata.getVersion(resourceClass), HasMetadata.getKind(resourceClass));
+        HasMetadata.getVersion(resourceClass), HasMetadata.getKind(resourceClass),
+        HasMetadata.getPlural(resourceClass));
   }
 
   public String getGroup() {
@@ -44,8 +56,12 @@ public String getKind() {
     return kind;
   }
 
+  public String getPlural() {
+    return plural;
+  }
+
   public String apiVersion() {
-    return group == null || group.isBlank() ? version : group + "/" + version;
+    return apiVersion;
   }
 
   @Override
@@ -55,13 +71,12 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass())
       return false;
     GroupVersionKind that = (GroupVersionKind) o;
-    return Objects.equals(group, that.group) && Objects.equals(version, that.version)
-        && Objects.equals(kind, that.kind);
+    return Objects.equals(apiVersion, that.apiVersion) && Objects.equals(kind, that.kind);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(group, version, kind);
+    return Objects.hash(apiVersion, kind);
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java

@@ -66,16 +66,12 @@ private ConfigMap configMap(DynamicGenericEventSourceRegistrationCustomResource
     return cm;
   }
 
-  private GroupVersionKind gvkFor(Class<? extends HasMetadata> clazz) {
-    return new GroupVersionKind(HasMetadata.getApiVersion(clazz), HasMetadata.getKind(clazz));
-  }
-
   private InformerEventSource<GenericKubernetesResource, DynamicGenericEventSourceRegistrationCustomResource> genericInformerFor(
       Class<? extends HasMetadata> clazz,
       Context<DynamicGenericEventSourceRegistrationCustomResource> context) {
 
     return new InformerEventSource<>(
-        InformerConfiguration.from(gvkFor(clazz),
+        InformerConfiguration.from(GroupVersionKind.gvkFor(clazz),
             context.eventSourceRetriever().eventSourceContextForDynamicRegistration()).build(),
         context.eventSourceRetriever().eventSourceContextForDynamicRegistration());
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentresourcemanaged/ConfigMapGenericKubernetesDependent.java

@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.util.Map;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
@@ -24,7 +25,7 @@ public class ConfigMapGenericKubernetesDependent extends
   public static final String KEY = "key";
 
   public ConfigMapGenericKubernetesDependent() {
-    super(new GroupVersionKind("", VERSION, KIND));
+    super(GroupVersionKind.gvkFor(ConfigMap.class));
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentstandalone/ConfigMapGenericKubernetesDependent.java

@@ -4,6 +4,7 @@
 import java.io.InputStream;
 import java.util.Map;
 
+import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
@@ -24,7 +25,7 @@ public class ConfigMapGenericKubernetesDependent extends
   public static final String KEY = "key";
 
   public ConfigMapGenericKubernetesDependent() {
-    super(new GroupVersionKind("", VERSION, KIND));
+    super(GroupVersionKind.gvkFor(ConfigMap.class));
   }
 
   @Override