From ff80fa1dd267bbe443b7c20e51e5ce946bec4656 Mon Sep 17 00:00:00 2001 From: yue9944882 <291271447@qq.com> Date: Sun, 7 Feb 2021 19:24:17 +0800 Subject: [PATCH] passing actual response status code in error-handler --- .../client/util/generic/KubernetesApiResponse.java | 8 ++++---- .../client/util/generic/KubernetesApiResponseTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/util/src/main/java/io/kubernetes/client/util/generic/KubernetesApiResponse.java b/util/src/main/java/io/kubernetes/client/util/generic/KubernetesApiResponse.java index 54e86cb93d..77b65364f0 100644 --- a/util/src/main/java/io/kubernetes/client/util/generic/KubernetesApiResponse.java +++ b/util/src/main/java/io/kubernetes/client/util/generic/KubernetesApiResponse.java @@ -59,8 +59,8 @@ public boolean isSuccess() { */ public KubernetesApiResponse throwsApiException() throws ApiException { return onFailure( - errorStatus -> { - throw new ApiException(errorStatus.toString()); + (code, errorStatus) -> { + throw new ApiException(code, errorStatus.toString()); }); } @@ -74,12 +74,12 @@ public KubernetesApiResponse throwsApiException() throws ApiException public KubernetesApiResponse onFailure(ErrorStatusHandler errorStatusHandler) throws ApiException { if (!isSuccess()) { - errorStatusHandler.handle(this.status); + errorStatusHandler.handle(this.getHttpStatusCode(), this.status); } return this; } public interface ErrorStatusHandler { - void handle(V1Status errorStatus) throws ApiException; + void handle(int code, V1Status errorStatus) throws ApiException; } } diff --git a/util/src/test/java/io/kubernetes/client/util/generic/KubernetesApiResponseTest.java b/util/src/test/java/io/kubernetes/client/util/generic/KubernetesApiResponseTest.java index db04f933e0..1a26c0235d 100644 --- a/util/src/test/java/io/kubernetes/client/util/generic/KubernetesApiResponseTest.java +++ b/util/src/test/java/io/kubernetes/client/util/generic/KubernetesApiResponseTest.java @@ -55,7 +55,7 @@ public void testErrorStatusHandler() throws ApiException { podClient .delete("default", "foo") .onFailure( - errStatus -> { + (code, errStatus) -> { catched.set(true); }) .getObject());