addressing review comments

Author: yue9944882

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

@@ -28,6 +28,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 import okhttp3.Call;
@@ -68,27 +69,18 @@ public Set<APIResource> findAll(
       String group, List<String> versions, String preferredVersion, String path)
       throws ApiException {
     V1APIResourceList resourceList = resourceDiscovery(path);
-    return sort(group, versions, preferredVersion, resourceList);
+    return groupResourcesByName(group, versions, preferredVersion, resourceList);
   }
 
-  private Set<APIResource> sort(
-      String group, List<String> versions, String preferredVersion, V1APIResourceList resourceList)
-      throws ApiException {
-    Map<String, Set<String>> subResources = new HashMap<>();
+  public Set<APIResource> groupResourcesByName(
+      String group,
+      List<String> versions,
+      String preferredVersion,
+      V1APIResourceList resourceList) {
+    // parse raw discovery responses to APIResource for better readability
     Set<APIResource> resources =
         resourceList.getResources().stream()
-            .filter(
-                r -> {
-                  boolean isSubResource = r.getName().contains("/");
-                  if (isSubResource) {
-                    String[] parts = r.getName().split("/", 2);
-                    if (!subResources.containsKey(parts[0])) {
-                      subResources.put(parts[0], new HashSet<>());
-                    }
-                    subResources.get(parts[0]).add(parts[1]);
-                  }
-                  return !isSubResource;
-                })
+            .filter(r -> !getSubResourceNameIfPossible(r.getName()).isPresent())
             .map(
                 r ->
                     new APIResource(
@@ -100,6 +92,9 @@ private Set<APIResource> sort(
                         r.getName(),
                         r.getSingularName()))
             .collect(Collectors.toSet());
+
+    // wiring up connections between major-resource and sub-resources
+    Map<String, Set<String>> subResources = manageRelationFromResourceToSubResources(resourceList);
     resources.stream()
         .forEach(
             r -> {
@@ -110,6 +105,37 @@ private Set<APIResource> sort(
     return resources;
   }
 
+  private Map<String, Set<String>> manageRelationFromResourceToSubResources(
+      V1APIResourceList resourceList) {
+    Map<String, Set<String>> subResources = new HashMap<>();
+    resourceList.getResources().stream()
+        .forEach(r -> subResources.put(r.getName(), new HashSet<>()));
+    resourceList.getResources().stream()
+        .forEach(
+            r -> {
+              getSubResourceNameIfPossible(r.getName())
+                  .ifPresent(
+                      subResourceName -> {
+                        subResources.get(getMajorResourceName(r.getName())).add(subResourceName);
+                      });
+            });
+    return subResources;
+  }
+
+  private String getMajorResourceName(String discoveredResourceName) {
+    String[] parts = discoveredResourceName.split("/", 2);
+    return parts[0];
+  }
+
+  private Optional<String> getSubResourceNameIfPossible(String discoveredResourceName) {
+    boolean isSubResource = discoveredResourceName.contains("/");
+    if (!isSubResource) {
+      return Optional.empty();
+    }
+    String[] parts = discoveredResourceName.split("/", 2);
+    return Optional.of(parts[1]);
+  }
+
   public V1APIVersions legacyCoreApi() throws ApiException {
     return versionDiscovery("/api");
   }

util/src/test/java/io/kubernetes/client/DiscoveryTest.java

@@ -18,10 +18,13 @@
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
+import io.kubernetes.client.openapi.models.V1APIResource;
+import io.kubernetes.client.openapi.models.V1APIResourceList;
 import io.kubernetes.client.openapi.models.V1APIVersions;
 import io.kubernetes.client.util.ClientBuilder;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.Set;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -56,4 +59,44 @@ public void testDiscoveryRequest() throws ApiException {
     verify(1, getRequestedFor(urlPathEqualTo("/foo")));
     assertEquals(2, versions.getVersions().size());
   }
+
+  @Test
+  public void testGroupResourcesByName() {
+    Discovery discovery = new Discovery(apiClient);
+    Set<Discovery.APIResource> discoveredResources =
+        discovery.groupResourcesByName(
+            "foo",
+            Arrays.asList("v1", "v2"),
+            "v1",
+            new V1APIResourceList()
+                .resources(
+                    Arrays.asList(
+                        new V1APIResource()
+                            .name("meows")
+                            .kind("Meow")
+                            .namespaced(true)
+                            .singularName("meow"),
+                        new V1APIResource()
+                            .name("meows/mouse")
+                            .kind("MeowMouse")
+                            .namespaced(true)
+                            .singularName(""),
+                        new V1APIResource()
+                            .name("zigs")
+                            .kind("Zig")
+                            .namespaced(false)
+                            .singularName("zig"))));
+    assertEquals(2, discoveredResources.size());
+
+    Discovery.APIResource meow =
+        discoveredResources.stream()
+            .filter(r -> r.getResourcePlural().equals("meows"))
+            .findFirst()
+            .get();
+    assertEquals(1, meow.getSubResources().size());
+    assertEquals("meows", meow.getResourcePlural());
+    assertEquals("meow", meow.getResourceSingular());
+    assertEquals(true, meow.getNamespaced());
+    assertEquals("mouse", meow.getSubResources().get(0));
+  }
 }