Skip to content

Commit db12bdc

Browse files
authored
Merge pull request #1363 from brendandburns/async
Add some null checking.
2 parents 517ddc5 + fffa313 commit db12bdc

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

extended/src/main/java/io/kubernetes/client/extended/kubectl/Kubectl.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,10 +248,13 @@ protected void refreshDiscovery() throws KubectlException {
248248

249249
protected <ApiType extends KubernetesObject, ApiListType extends KubernetesListObject>
250250
GenericKubernetesApi<ApiType, ApiListType> getGenericApi(
251-
Class<ApiType> apiTypeClass, Class<ApiListType> apiListTypeClass) {
251+
Class<ApiType> apiTypeClass, Class<ApiListType> apiListTypeClass)
252+
throws KubectlException {
252253
GroupVersionResource groupVersionResource =
253254
ModelMapper.getGroupVersionResourceByClass(apiTypeClass);
254-
255+
if (groupVersionResource == null) {
256+
throw new KubectlException("Unexpected unknown resource type: " + apiTypeClass);
257+
}
255258
GenericKubernetesApi<ApiType, ApiListType> api =
256259
new GenericKubernetesApi<>(
257260
apiTypeClass,
@@ -289,7 +292,8 @@ public T name(String name) {
289292
return (T) this;
290293
}
291294

292-
protected GenericKubernetesApi<ApiType, KubernetesListObject> getGenericApi() {
295+
protected GenericKubernetesApi<ApiType, KubernetesListObject> getGenericApi()
296+
throws KubectlException {
293297
return getGenericApi(apiTypeClass, KubernetesListObject.class);
294298
}
295299
}

extended/src/main/java/io/kubernetes/client/extended/kubectl/KubectlPatch.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
import io.kubernetes.client.common.KubernetesObject;
1616
import io.kubernetes.client.custom.V1Patch;
17+
import io.kubernetes.client.extended.kubectl.exception.KubectlException;
1718
import io.kubernetes.client.util.ModelMapper;
1819
import io.kubernetes.client.util.generic.GenericKubernetesApi;
1920

@@ -39,7 +40,7 @@ public KubectlPatch patchType(String patchType) {
3940
}
4041

4142
@Override
42-
public ApiType execute() {
43+
public ApiType execute() throws KubectlException {
4344
GenericKubernetesApi genericKubernetesApi = getGenericApi();
4445
if (ModelMapper.isNamespaced(apiTypeClass)) {
4546
return (ApiType) genericKubernetesApi.patch(namespace, name, patchType, patchContent);

0 commit comments

Comments
 (0)