Merge pull request #1225 from yue9944882/refactor/model-mapper-pt1

Refactor model mapper: adding group-version-resource mapping

Author: k8s-ci-robot

e2e/src/test/groovy/io/kubernetes/client/e2e/util/ModelMapperTest.groovy

@@ -0,0 +1,44 @@
+/*
+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.e2e.util
+
+import io.kubernetes.client.Discovery
+import io.kubernetes.client.apimachinery.GroupVersionKind
+import io.kubernetes.client.apimachinery.GroupVersionResource
+import io.kubernetes.client.openapi.models.V1Deployment
+import io.kubernetes.client.openapi.models.V1Pod
+import io.kubernetes.client.openapi.models.V1beta1CustomResourceDefinition
+import io.kubernetes.client.util.ClientBuilder
+import io.kubernetes.client.util.ModelMapper
+import spock.lang.Specification
+
+class ModelMapperTest extends Specification {
+
+    def "api-discovery should work"() {
+        given:
+        def apiClient = ClientBuilder.defaultClient();
+        def discovery = new Discovery(apiClient)
+        ModelMapper.refresh(discovery);
+
+        expect:
+        new GroupVersionKind("", "v1", "Pod") == ModelMapper.getGroupVersionKindByClass(V1Pod.class)
+        new GroupVersionResource("", "v1", "pods") == ModelMapper.getGroupVersionResourceByClass(V1Pod.class)
+
+        new GroupVersionKind("apps", "v1", "Deployment") == ModelMapper.getGroupVersionKindByClass(V1Deployment.class)
+        new GroupVersionResource("apps", "v1", "deployments") == ModelMapper.getGroupVersionResourceByClass(V1Deployment.class)
+
+        new GroupVersionKind("apiextensions.k8s.io", "v1beta1", "CustomResourceDefinition") == ModelMapper.getGroupVersionKindByClass(V1beta1CustomResourceDefinition.class)
+        new GroupVersionResource("apiextensions.k8s.io", "v1beta1", "customresourcedefinitions") == ModelMapper.getGroupVersionResourceByClass(V1beta1CustomResourceDefinition.class)
+
+    }
+}

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

@@ -38,6 +38,12 @@ public static GroupVersion parse(KubernetesObject obj) {
   }
 
   public GroupVersion(String group, String version) {
+    if (group == null) {
+      throw new IllegalArgumentException("group must not be null");
+    }
+    if (version == null) {
+      throw new IllegalArgumentException("version must not be null");
+    }
     this.group = group;
     this.version = version;
   }

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

@@ -20,6 +20,9 @@ public class GroupVersionKind extends GroupVersion {
 
   public GroupVersionKind(String group, String version, String kind) {
     super(group, version);
+    if (kind == null) {
+      throw new IllegalArgumentException("kind must not be null");
+    }
     this.kind = kind;
   }
 

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

@@ -12,24 +12,32 @@
 */
 package io.kubernetes.client.apimachinery;
 
-public class GroupVersionResource {
+import com.google.common.base.Objects;
+
+public class GroupVersionResource extends GroupVersion {
 
-  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;
+    super(group, version);
+    if (resource == null) {
+      throw new IllegalArgumentException("resource must not be null");
+    }
     this.resource = resource;
   }
 
-  public String getGroup() {
-    return group;
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    if (!super.equals(o)) return false;
+    GroupVersionResource that = (GroupVersionResource) o;
+    return Objects.equal(resource, that.resource);
   }
 
-  public String getVersion() {
-    return version;
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(super.hashCode(), resource);
   }
 
   public String getResource() {