Merge pull request #1658 from yue9944882/model-mapper-lister-kind

Chore: Adding static helper to register lister kind to ModelMapper

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/util/ModelMapper.java

@@ -117,13 +117,21 @@ public static void addModelMap(String group, String version, String kind, Class<
    * @param version the version
    * @param kind the kind
    * @param resourceNamePlural the resource name plural
-   * @param clazz the clazz
+   * @param objClass the clazz
    */
   public static void addModelMap(
-      String group, String version, String kind, String resourceNamePlural, Class<?> clazz) {
+      String group,
+      String version,
+      String kind,
+      String resourceNamePlural,
+      Class<? extends KubernetesObject> objClass,
+      Class<? extends KubernetesListObject> objListClass) {
     // TODO(yue9944882): consistency between bi-directional maps
-    classesByGVK.add(new GroupVersionKind(group, version, kind), clazz);
-    classesByGVR.add(new GroupVersionResource(group, version, resourceNamePlural), clazz);
+    classesByGVK.add(new GroupVersionKind(group, version, kind), objClass);
+    classesByGVR.add(new GroupVersionResource(group, version, resourceNamePlural), objClass);
+    if (objListClass != null) {
+      classesByGVK.add(new GroupVersionKind(group, version, kind + "List"), objListClass);
+    }
   }
 
   /**
@@ -135,17 +143,29 @@ public static void addModelMap(
    * @param kind the kind
    * @param resourceNamePlural the resource name plural
    * @param isNamespacedResource the is namespaced resource
-   * @param clazz the clazz
+   * @param objClass the clazz
    */
   public static void addModelMap(
       String group,
       String version,
       String kind,
       String resourceNamePlural,
       Boolean isNamespacedResource,
-      Class<?> clazz) {
-    addModelMap(group, version, kind, resourceNamePlural, clazz);
-    isNamespacedByClasses.put(clazz, isNamespacedResource);
+      Class<? extends KubernetesObject> objClass) {
+    addModelMap(group, version, kind, resourceNamePlural, objClass, null);
+    isNamespacedByClasses.put(objClass, isNamespacedResource);
+  }
+
+  public static void addModelMap(
+      String group,
+      String version,
+      String kind,
+      String resourceNamePlural,
+      Boolean isNamespacedResource,
+      Class<? extends KubernetesObject> objClass,
+      Class<? extends KubernetesListObject> objListClass) {
+    addModelMap(group, version, kind, resourceNamePlural, objClass, objListClass);
+    isNamespacedByClasses.put(objClass, isNamespacedResource);
   }
 
   /**
@@ -240,19 +260,25 @@ public static Set<Discovery.APIResource> refresh(Discovery discovery, Duration r
 
     for (Discovery.APIResource apiResource : apiResources) {
       for (String version : apiResource.getVersions()) {
-        Class<?> clazz = getApiTypeClass(apiResource.getGroup(), version, apiResource.getKind());
+        Class<? extends KubernetesObject> objClass =
+            (Class<? extends KubernetesObject>)
+                getApiTypeClass(apiResource.getGroup(), version, apiResource.getKind());
         // no such classes registered in the ModelMapper, ignoring
-        if (clazz == null) {
+        if (objClass == null) {
           continue;
         }
+        Class<? extends KubernetesListObject> objListClass =
+            (Class<? extends KubernetesListObject>)
+                getApiTypeClass(apiResource.getGroup(), version, apiResource.getKind() + "List");
         // sync up w/ the latest api discovery
         addModelMap(
             apiResource.getGroup(),
             version,
             apiResource.getKind(),
             apiResource.getResourcePlural(),
             apiResource.getNamespaced(),
-            clazz);
+            objClass,
+            objListClass);
       }
     }