Merge pull request kubernetes-client#1583 from yue9944882/cherry-pick-11-generic-api-status-code

k8s-ci-robot · web-flow · commit ef53b6574dd5 · 2021-03-09T15:39:05.000-08:00
Cherrypick for RELEASE-11: Passing actual response status code in error-handler
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
@@ -59,8 +59,8 @@ public boolean isSuccess() {
    */
   public KubernetesApiResponse<DataType> 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<DataType> throwsApiException() throws ApiException
   public KubernetesApiResponse<DataType> 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
@@ -55,7 +55,7 @@ public void testErrorStatusHandler() throws ApiException {
         podClient
             .delete("default", "foo")
             .onFailure(
-                errStatus -> {
+                (code, errStatus) -> {
                   catched.set(true);
                 })
             .getObject());

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,8 @@ public boolean isSuccess() {`
`59`	`59`	`*/`
`60`	`60`	`public KubernetesApiResponse<DataType> throwsApiException() throws ApiException {`
`61`	`61`	`return onFailure(`
`62`		`- errorStatus -> {`
`63`		`- throw new ApiException(errorStatus.toString());`
	`62`	`+ (code, errorStatus) -> {`
	`63`	`+ throw new ApiException(code, errorStatus.toString());`
`64`	`64`	`});`
`65`	`65`	`}`
`66`	`66`
`@@ -74,12 +74,12 @@ public KubernetesApiResponse<DataType> throwsApiException() throws ApiException`
`74`	`74`	`public KubernetesApiResponse<DataType> onFailure(ErrorStatusHandler errorStatusHandler)`
`75`	`75`	`throws ApiException {`
`76`	`76`	`if (!isSuccess()) {`
`77`		`- errorStatusHandler.handle(this.status);`
	`77`	`+ errorStatusHandler.handle(this.getHttpStatusCode(), this.status);`
`78`	`78`	`}`
`79`	`79`	`return this;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public interface ErrorStatusHandler {`
`83`		`- void handle(V1Status errorStatus) throws ApiException;`
	`83`	`+ void handle(int code, V1Status errorStatus) throws ApiException;`
`84`	`84`	`}`
`85`	`85`	`}`