Add some null checking.

brendanburns · brendanburns · commit fffa31364c09 · 2020-11-09T21:18:15.000-08:00
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/Kubectl.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/Kubectl.java
@@ -248,10 +248,13 @@ protected void refreshDiscovery() throws KubectlException {
 
     protected <ApiType extends KubernetesObject, ApiListType extends KubernetesListObject>
         GenericKubernetesApi<ApiType, ApiListType> getGenericApi(
-            Class<ApiType> apiTypeClass, Class<ApiListType> apiListTypeClass) {
+            Class<ApiType> apiTypeClass, Class<ApiListType> apiListTypeClass)
+            throws KubectlException {
       GroupVersionResource groupVersionResource =
           ModelMapper.getGroupVersionResourceByClass(apiTypeClass);
-
+      if (groupVersionResource == null) {
+        throw new KubectlException("Unexpected unknown resource type: " + apiTypeClass);
+      }
       GenericKubernetesApi<ApiType, ApiListType> api =
           new GenericKubernetesApi<>(
               apiTypeClass,
@@ -289,7 +292,8 @@ public T name(String name) {
       return (T) this;
     }
 
-    protected GenericKubernetesApi<ApiType, KubernetesListObject> getGenericApi() {
+    protected GenericKubernetesApi<ApiType, KubernetesListObject> getGenericApi()
+        throws KubectlException {
       return getGenericApi(apiTypeClass, KubernetesListObject.class);
     }
   }
diff --git a/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java b/extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java
@@ -14,6 +14,7 @@
 
 import io.kubernetes.client.common.KubernetesObject;
 import io.kubernetes.client.custom.V1Patch;
+import io.kubernetes.client.extended.kubectl.exception.KubectlException;
 import io.kubernetes.client.util.ModelMapper;
 import io.kubernetes.client.util.generic.GenericKubernetesApi;
 
@@ -39,7 +40,7 @@ public KubectlPatch patchType(String patchType) {
   }
 
   @Override
-  public ApiType execute() {
+  public ApiType execute() throws KubectlException {
     GenericKubernetesApi genericKubernetesApi = getGenericApi();
     if (ModelMapper.isNamespaced(apiTypeClass)) {
       return (ApiType) genericKubernetesApi.patch(namespace, name, patchType, patchContent);
