|
16 | 16 | import com.google.common.io.ByteStreams;
|
17 | 17 | import com.google.common.primitives.Bytes;
|
18 | 18 | import com.google.protobuf.Message;
|
| 19 | +import com.google.protobuf.Message.Builder; |
19 | 20 | import io.kubernetes.client.openapi.ApiClient;
|
20 | 21 | import io.kubernetes.client.openapi.ApiException;
|
21 | 22 | import io.kubernetes.client.openapi.Configuration;
|
@@ -210,17 +211,7 @@ public <T extends Message> ObjectOrStatus<T> delete(
|
210 | 211 | byte[] bytes = encode(deleteOptions, "v1", "DeleteOptions");
|
211 | 212 | request =
|
212 | 213 | request.newBuilder().delete(RequestBody.create(MediaType.parse(MEDIA_TYPE), bytes)).build();
|
213 |
| - Response resp = apiClient.getHttpClient().newCall(request).execute(); |
214 |
| - Unknown u = parse(resp.body().byteStream()); |
215 |
| - resp.body().close(); |
216 |
| - |
217 |
| - if (u.getTypeMeta().getApiVersion().equals("v1") |
218 |
| - && u.getTypeMeta().getKind().equals("Status")) { |
219 |
| - Status status = Status.newBuilder().mergeFrom(u.getRaw()).build(); |
220 |
| - return new ObjectOrStatus(null, status); |
221 |
| - } |
222 |
| - |
223 |
| - return new ObjectOrStatus((T) builder.mergeFrom(u.getRaw()).build(), null); |
| 214 | + return getObjectOrStatusFromServer(builder, request); |
224 | 215 | }
|
225 | 216 |
|
226 | 217 | /**
|
@@ -284,6 +275,11 @@ public <T extends Message> ObjectOrStatus<T> request(
|
284 | 275 | throw new ApiException("Unknown proto client API method: " + method);
|
285 | 276 | }
|
286 | 277 | }
|
| 278 | + return getObjectOrStatusFromServer(builder, request); |
| 279 | + } |
| 280 | + |
| 281 | + private <T extends Message> ObjectOrStatus<T> getObjectOrStatusFromServer( |
| 282 | + Builder builder, Request request) throws IOException, ApiException { |
287 | 283 | Response resp = apiClient.getHttpClient().newCall(request).execute();
|
288 | 284 | Unknown u = parse(resp.body().byteStream());
|
289 | 285 | resp.body().close();
|
|
0 commit comments