addressing review comments

Author: yue9944882

util/src/main/java/io/kubernetes/client/apimachinery/GroupVersionKind.java

@@ -0,0 +1,38 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.apimachinery;
+
+public class GroupVersionKind {
+
+  private final String group;
+  private final String version;
+  private final String kind;
+
+  public GroupVersionKind(String group, String version, String kind) {
+    this.group = group;
+    this.version = version;
+    this.kind = kind;
+  }
+
+  public String getGroup() {
+    return group;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public String getKind() {
+    return kind;
+  }
+}

util/src/main/java/io/kubernetes/client/apimachinery/GroupVersionResource.java

@@ -0,0 +1,38 @@
+/*
+Copyright 2020 The Kubernetes Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+package io.kubernetes.client.apimachinery;
+
+public class GroupVersionResource {
+
+  private final String group;
+  private final String version;
+  private final String resource;
+
+  public GroupVersionResource(String group, String version, String resource) {
+    this.group = group;
+    this.version = version;
+    this.resource = resource;
+  }
+
+  public String getGroup() {
+    return group;
+  }
+
+  public String getVersion() {
+    return version;
+  }
+
+  public String getResource() {
+    return resource;
+  }
+}

util/src/main/java/io/kubernetes/client/apimachinery/KubernetesRequestDigest.java

@@ -102,17 +102,23 @@ public String toString() {
     }
 
     String groupVersion;
-    if (Strings.isNullOrEmpty(resourceMeta.getApiGroup())) { // core resource
+    if (Strings.isNullOrEmpty(resourceMeta.getGroupVersionResource().getGroup())) { // core resource
       groupVersion = "";
     } else { // regular resource
-      groupVersion = resourceMeta.getApiGroup() + "/" + resourceMeta.getApiVersion();
+      groupVersion =
+          resourceMeta.getGroupVersionResource().getGroup()
+              + "/"
+              + resourceMeta.getGroupVersionResource().getVersion();
     }
 
     String targetResourceName;
     if (Strings.isNullOrEmpty(resourceMeta.getSubResource())) {
-      targetResourceName = resourceMeta.getResource();
+      targetResourceName = resourceMeta.getGroupVersionResource().getResource();
     } else { // subresource
-      targetResourceName = resourceMeta.getResource() + "/" + resourceMeta.getSubResource();
+      targetResourceName =
+          resourceMeta.getGroupVersionResource().getResource()
+              + "/"
+              + resourceMeta.getSubResource();
     }
 
     return new StringBuilder()

util/src/main/java/io/kubernetes/client/apimachinery/KubernetesResource.java

@@ -33,9 +33,7 @@ public static KubernetesResource parseCoreResource(String urlPath)
     }
     KubernetesResource resource =
         new KubernetesResource(
-            "",
-            "v1",
-            matcher.group("resource"),
+            new GroupVersionResource("", "v1", matcher.group("resource")),
             matcher.group("subresource"),
             matcher.group("namespace"),
             matcher.group("name"));
@@ -50,48 +48,29 @@ public static KubernetesResource parseRegularResource(String urlPath)
     }
     KubernetesResource resource =
         new KubernetesResource(
-            matcher.group("group"),
-            matcher.group("version"),
-            matcher.group("resource"),
+            new GroupVersionResource(
+                matcher.group("group"), matcher.group("version"), matcher.group("resource")),
             matcher.group("subresource"),
             matcher.group("namespace"),
             matcher.group("name"));
     return resource;
   }
 
-  KubernetesResource(
-      String apiGroup,
-      String apiVersion,
-      String resource,
-      String subResource,
-      String namespace,
-      String name) {
-    this.apiGroup = apiGroup;
-    this.apiVersion = apiVersion;
-    this.resource = resource;
+  KubernetesResource(GroupVersionResource gvr, String subResource, String namespace, String name) {
+    this.groupVersionResource = gvr;
     this.subResource = subResource;
     this.namespace = namespace;
     this.name = name;
   }
 
-  private final String apiGroup;
-  private final String apiVersion;
-  private final String resource;
+  private final GroupVersionResource groupVersionResource;
   private final String subResource;
 
   private final String namespace;
   private final String name;
 
-  public String getApiGroup() {
-    return apiGroup;
-  }
-
-  public String getApiVersion() {
-    return apiVersion;
-  }
-
-  public String getResource() {
-    return resource;
+  public GroupVersionResource getGroupVersionResource() {
+    return groupVersionResource;
   }
 
   public String getSubResource() {

util/src/main/java/io/kubernetes/client/monitoring/PrometheusInterceptor.java

@@ -42,8 +42,8 @@ public class PrometheusInterceptor implements Interceptor {
           .help("Kubernetes resource request latency (seconds)")
           .labelNames(
               "http_response_code",
-              "api_group",
-              "api_version",
+              "group",
+              "version",
               "resource",
               "subresource",
               "api_verb",
@@ -73,7 +73,6 @@ public Response intercept(Interceptor.Chain chain) throws IOException {
     }
 
     codes.labels(Integer.toString(response.code())).inc();
-    ;
 
     if (requestDigest.isNonResourceRequest()) {
       nonResourceRequestLatencyHistogram
@@ -83,9 +82,12 @@ public Response intercept(Interceptor.Chain chain) throws IOException {
       resourceRequestLatencyHistogram
           .labels(
               Integer.toString(response.code()),
-              Strings.nullToEmpty(requestDigest.getResourceMeta().getApiGroup()),
-              Strings.nullToEmpty(requestDigest.getResourceMeta().getApiVersion()),
-              Strings.nullToEmpty(requestDigest.getResourceMeta().getResource()),
+              Strings.nullToEmpty(
+                  requestDigest.getResourceMeta().getGroupVersionResource().getGroup()),
+              Strings.nullToEmpty(
+                  requestDigest.getResourceMeta().getGroupVersionResource().getVersion()),
+              Strings.nullToEmpty(
+                  requestDigest.getResourceMeta().getGroupVersionResource().getResource()),
               Strings.nullToEmpty(requestDigest.getResourceMeta().getSubResource()),
               requestDigest.getVerb().value(),
               Strings.nullToEmpty(requestDigest.getResourceMeta().getNamespace()))