Merge pull request #1051 from sarveshkaushal/master

Removing duplicate code

Author: k8s-ci-robot

util/src/main/java/io/kubernetes/client/ProtoClient.java

@@ -16,6 +16,7 @@
 import com.google.common.io.ByteStreams;
 import com.google.common.primitives.Bytes;
 import com.google.protobuf.Message;
+import com.google.protobuf.Message.Builder;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.openapi.Configuration;
@@ -210,17 +211,7 @@ public <T extends Message> ObjectOrStatus<T> delete(
     byte[] bytes = encode(deleteOptions, "v1", "DeleteOptions");
     request =
         request.newBuilder().delete(RequestBody.create(MediaType.parse(MEDIA_TYPE), bytes)).build();
-    Response resp = apiClient.getHttpClient().newCall(request).execute();
-    Unknown u = parse(resp.body().byteStream());
-    resp.body().close();
-
-    if (u.getTypeMeta().getApiVersion().equals("v1")
-        && u.getTypeMeta().getKind().equals("Status")) {
-      Status status = Status.newBuilder().mergeFrom(u.getRaw()).build();
-      return new ObjectOrStatus(null, status);
-    }
-
-    return new ObjectOrStatus((T) builder.mergeFrom(u.getRaw()).build(), null);
+    return getObjectOrStatusFromServer(builder, request);
   }
 
   /**
@@ -284,6 +275,11 @@ public <T extends Message> ObjectOrStatus<T> request(
           throw new ApiException("Unknown proto client API method: " + method);
       }
     }
+    return getObjectOrStatusFromServer(builder, request);
+  }
+
+  private <T extends Message> ObjectOrStatus<T> getObjectOrStatusFromServer(
+      Builder builder, Request request) throws IOException, ApiException {
     Response resp = apiClient.getHttpClient().newCall(request).execute();
     Unknown u = parse(resp.body().byteStream());
     resp.body().close();