ExtendedGitHubClient.java

- add support for delete operations to parse json responses

ExtendedIssueService.java
- the removeLabel() method now calls the new delete() to parse the response returned by this operation.

This fixed jenkinsci#52

Thanks @longwave for tracking this down

Author: aaronjwhiteside

src/main/java/org/jenkinsci/plugins/pipeline/github/client/ExtendedGitHubClient.java

@@ -3,7 +3,6 @@
 import org.eclipse.egit.github.core.client.GitHubClient;
 import org.eclipse.egit.github.core.client.GitHubRequest;
 import org.eclipse.egit.github.core.client.GitHubResponse;
-import org.eclipse.egit.github.core.client.RequestException;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -62,22 +61,6 @@ public <V> V put(final String uri, final Object params, final Type type, final S
         return this.sendJson(request, params, type);
     }
 
-    public void delete(final String uri, final Object params, final String accept) throws IOException {
-        HttpURLConnection request = this.createDelete(uri);
-        if (accept != null) {
-            request.setRequestProperty("Accept", accept);
-        }
-        if (params != null) {
-            this.sendParams(request, params);
-        }
-
-        int code = request.getResponseCode();
-        this.updateRateLimits(request);
-        if (!this.isEmpty(code)) {
-            throw new RequestException(this.parseError(this.getStream(request)), code);
-        }
-    }
-
     // duplicated here because it's private in the super class.
     private <V> V sendJson(final HttpURLConnection request, final Object params, final Type type) throws IOException {
         this.sendParams(request, params);
@@ -101,4 +84,21 @@ public GitHubResponse getUnchecked(final GitHubRequest request) {
         }
     }
 
+    public <V> V delete(final String uri, final Type type, final String accept) throws IOException {
+        HttpURLConnection request = this.createDelete(uri);
+        if (accept != null) {
+            request.setRequestProperty("Accept", accept);
+        }
+
+        int code = request.getResponseCode();
+        this.updateRateLimits(request);
+        if (this.isOk(code)) {
+            return type != null ? this.parseJson(this.getStream(request), type) : null;
+        } else if (this.isEmpty(code)) {
+            return null;
+        } else {
+            throw this.createException(this.getStream(request), code, request.getResponseMessage());
+        }
+    }
+
 }

src/main/java/org/jenkinsci/plugins/pipeline/github/client/ExtendedIssueService.java

@@ -141,9 +141,9 @@ public List<Label> addLabels(final IRepositoryIdProvider repository,
         return getClient().post(uri.toString(), labels, (new TypeToken<List<Label>>() {}).getType());
     }
 
-    public void removeLabel(final IRepositoryIdProvider repository,
-                            final int issueNumber,
-                            final String label) throws IOException {
+    public List<Label> removeLabel(final IRepositoryIdProvider repository,
+                                   final int issueNumber,
+                                   final String label) throws IOException {
         final String repoId = this.getId(repository);
         final StringBuilder uri = new StringBuilder("/repos");
         uri.append('/').append(repoId);
@@ -156,7 +156,8 @@ public void removeLabel(final IRepositoryIdProvider repository,
                 .replace("+", "%20")
                 .replace(".", "%2E");
         uri.append(encodedLabel);
-        getClient().delete(uri.toString());
+
+        return getClient().delete(uri.toString(), (new TypeToken<List<Label>>() {}).getType(), null);
     }
 
 }