Fix regression introduced by b976e0e

Author: henryju

src/main/java/org/kohsuke/github/Requester.java

@@ -26,34 +26,16 @@
 import com.fasterxml.jackson.databind.JsonMappingException;
 import org.apache.commons.io.IOUtils;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
+import java.io.*;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.ProtocolException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
+import java.net.*;
+import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.zip.GZIPInputStream;
 
-import static org.kohsuke.github.GitHub.*;
+import static org.kohsuke.github.GitHub.MAPPER;
 
 /**
  * A builder pattern for making HTTP call and parsing its output.
@@ -63,7 +45,7 @@
 class Requester {
     private final GitHub root;
     private final List<Entry> args = new ArrayList<Entry>();
-    private final Map<String,String> headers = new LinkedHashMap<String, String>();
+    private final Map<String, String> headers = new LinkedHashMap<String, String>();
 
     /**
      * Request method.
@@ -97,7 +79,7 @@ private Entry(String key, Object value) {
      * If a header of the same name is already set, this method overrides it.
      */
     public void setHeader(String name, String value) {
-        headers.put(name,value);
+        headers.put(name, value);
     }
 
     /**
@@ -115,19 +97,19 @@ public Requester with(String key, int value) {
     }
 
     public Requester with(String key, Integer value) {
-        if (value!=null)
+        if (value != null)
             _with(key, value.intValue());
         return this;
     }
 
     public Requester with(String key, boolean value) {
         return _with(key, value);
     }
+
     public Requester with(String key, Boolean value) {
         return _with(key, value);
     }
 
-
     public Requester with(String key, String value) {
         return _with(key, value);
     }
@@ -146,8 +128,8 @@ public Requester with(InputStream body) {
     }
 
     public Requester _with(String key, Object value) {
-        if (value!=null) {
-            args.add(new Entry(key,value));
+        if (value != null) {
+            args.add(new Entry(key, value));
         }
         return this;
     }
@@ -162,7 +144,7 @@ public Requester set(String key, Object value) {
                 return this;
             }
         }
-        return _with(key,value);
+        return _with(key, value);
     }
 
     public Requester method(String method) {
@@ -176,7 +158,7 @@ public Requester contentType(String contentType) {
     }
 
     public void to(String tailApiUrl) throws IOException {
-        to(tailApiUrl,null);
+        to(tailApiUrl, null);
     }
 
     /**
@@ -203,16 +185,16 @@ public <T> T to(String tailApiUrl, T existingInstance) throws IOException {
      */
     @Deprecated
     public <T> T to(String tailApiUrl, Class<T> type, String method) throws IOException {
-        return method(method).to(tailApiUrl,type);
+        return method(method).to(tailApiUrl, type);
     }
 
     private <T> T _to(String tailApiUrl, Class<T> type, T instance) throws IOException {
         while (true) {// loop while API rate limit is hit
             if (method.equals("GET") && !args.isEmpty()) {
-                StringBuilder qs=new StringBuilder();
+                StringBuilder qs = new StringBuilder();
                 for (Entry arg : args) {
-                    qs.append(qs.length()==0 ? '?' : '&');
-                    qs.append(arg.key).append('=').append(URLEncoder.encode(arg.value.toString(),"UTF-8"));
+                    qs.append(qs.length() == 0 ? '?' : '&');
+                    qs.append(arg.key).append('=').append(URLEncoder.encode(arg.value.toString(), "UTF-8"));
                 }
                 tailApiUrl += qs.toString();
             }
@@ -282,7 +264,6 @@ public String getResponseHeader(String header) {
         return uc.getHeaderField(header);
     }
 
-
     /**
      * Set up the request parameters or POST payload.
      */
@@ -296,6 +277,7 @@ private void buildRequest() throws IOException {
                 for (Entry e : args) {
                     json.put(e.key, e.value);
                 }
+                MAPPER.writeValue(uc.getOutputStream(), json);
             } else {
                 try {
                     byte[] bytes = new byte[32768];
@@ -311,8 +293,10 @@ private void buildRequest() throws IOException {
     }
 
     private boolean isMethodWithBody() {
-        if (method.equals("GET"))       return false;
-        if (method.equals("DELETE"))    return false;
+        if (method.equals("GET"))
+            return false;
+        if (method.equals("DELETE"))
+            return false;
         return true;
     }
 
@@ -321,19 +305,19 @@ private boolean isMethodWithBody() {
      *
      * Every iterator call reports a new batch.
      */
-    /*package*/ <T> Iterator<T> asIterator(String _tailApiUrl, final Class<T> type) {
+    /* package */<T> Iterator<T> asIterator(String _tailApiUrl, final Class<T> type) {
         method("GET");
 
         if (!args.isEmpty()) {
-            boolean first=true;
+            boolean first = true;
             try {
                 for (Entry a : args) {
                     _tailApiUrl += first ? '?' : '&';
                     first = false;
-                    _tailApiUrl += URLEncoder.encode(a.key,"UTF-8")+'='+URLEncoder.encode(a.value.toString(),"UTF-8");
+                    _tailApiUrl += URLEncoder.encode(a.key, "UTF-8") + '=' + URLEncoder.encode(a.value.toString(), "UTF-8");
                 }
             } catch (UnsupportedEncodingException e) {
-                throw new AssertionError(e);    // UTF-8 is mandatory
+                throw new AssertionError(e); // UTF-8 is mandatory
             }
         }
 
@@ -359,13 +343,14 @@ private boolean isMethodWithBody() {
 
             public boolean hasNext() {
                 fetch();
-                return next!=null;
+                return next != null;
             }
 
             public T next() {
                 fetch();
                 T r = next;
-                if (r==null)    throw new NoSuchElementException();
+                if (r == null)
+                    throw new NoSuchElementException();
                 next = null;
                 return r;
             }
@@ -375,15 +360,17 @@ public void remove() {
             }
 
             private void fetch() {
-                if (next!=null) return; // already fetched
-                if (url==null)  return; // no more data to fetch
+                if (next != null)
+                    return; // already fetched
+                if (url == null)
+                    return; // no more data to fetch
 
                 try {
                     while (true) {// loop while API rate limit is hit
                         setupConnection(url);
                         try {
-                            next = parse(type,null);
-                            assert next!=null;
+                            next = parse(type, null);
+                            assert next != null;
                             findNextURL();
                             return;
                         } catch (IOException e) {
@@ -401,14 +388,15 @@ private void fetch() {
             private void findNextURL() throws MalformedURLException {
                 url = null; // start defensively
                 String link = uc.getHeaderField("Link");
-                if (link==null) return;
+                if (link == null)
+                    return;
 
                 for (String token : link.split(", ")) {
                     if (token.endsWith("rel=\"next\"")) {
                         // found the next page. This should look something like
                         // <https://api.github.com/repos?page=3&per_page=100>; rel="next"
                         int idx = token.indexOf('>');
-                        url = new URL(token.substring(1,idx));
+                        url = new URL(token.substring(1, idx));
                         return;
                     }
                 }
@@ -418,18 +406,17 @@ private void findNextURL() throws MalformedURLException {
         };
     }
 
-
     private void setupConnection(URL url) throws IOException {
         uc = root.getConnector().connect(url);
 
         // if the authentication is needed but no credential is given, try it anyway (so that some calls
         // that do work with anonymous access in the reduced form should still work.)
-        if (root.encodedAuthorization!=null)
+        if (root.encodedAuthorization != null)
             uc.setRequestProperty("Authorization", root.encodedAuthorization);
 
         for (Map.Entry<String, String> e : headers.entrySet()) {
             String v = e.getValue();
-            if (v!=null)
+            if (v != null)
                 uc.setRequestProperty(e.getKey(), v);
         }
 
@@ -440,28 +427,28 @@ private void setupConnection(URL url) throws IOException {
             try {
                 Field $method = HttpURLConnection.class.getDeclaredField("method");
                 $method.setAccessible(true);
-                $method.set(uc,method);
+                $method.set(uc, method);
             } catch (Exception x) {
-                throw (IOException)new IOException("Failed to set the custom verb").initCause(x);
+                throw (IOException) new IOException("Failed to set the custom verb").initCause(x);
             }
         }
         uc.setRequestProperty("Accept-Encoding", "gzip");
     }
 
     private <T> T parse(Class<T> type, T instance) throws IOException {
-        if (uc.getResponseCode()==304)
-            return null;    // special case handling for 304 unmodified, as the content will be ""
+        if (uc.getResponseCode() == 304)
+            return null; // special case handling for 304 unmodified, as the content will be ""
         InputStreamReader r = null;
         try {
             r = new InputStreamReader(wrapStream(uc.getInputStream()), "UTF-8");
             String data = IOUtils.toString(r);
-            if (type!=null)
+            if (type != null)
                 try {
-                    return MAPPER.readValue(data,type);
+                    return MAPPER.readValue(data, type);
                 } catch (JsonMappingException e) {
-                    throw (IOException)new IOException("Failed to deserialize "+data).initCause(e);
+                    throw (IOException) new IOException("Failed to deserialize " + data).initCause(e);
                 }
-            if (instance!=null)
+            if (instance != null)
                 return MAPPER.readerForUpdating(instance).<T>readValue(data);
             return null;
         } finally {
@@ -474,33 +461,33 @@ private <T> T parse(Class<T> type, T instance) throws IOException {
      */
     private InputStream wrapStream(InputStream in) throws IOException {
         String encoding = uc.getContentEncoding();
-        if (encoding==null || in==null) return in;
-        if (encoding.equals("gzip"))    return new GZIPInputStream(in);
+        if (encoding == null || in == null)
+            return in;
+        if (encoding.equals("gzip"))
+            return new GZIPInputStream(in);
 
-        throw new UnsupportedOperationException("Unexpected Content-Encoding: "+encoding);
+        throw new UnsupportedOperationException("Unexpected Content-Encoding: " + encoding);
     }
 
     /**
      * Handle API error by either throwing it or by returning normally to retry.
      */
-    /*package*/ void handleApiError(IOException e) throws IOException {
+    /* package */void handleApiError(IOException e) throws IOException {
         if (uc.getResponseCode() == 401) // Unauthorized == bad creds
             throw e;
 
         if ("0".equals(uc.getHeaderField("X-RateLimit-Remaining"))) {
-            root.rateLimitHandler.onError(e,uc);
+            root.rateLimitHandler.onError(e, uc);
         }
 
         InputStream es = wrapStream(uc.getErrorStream());
         try {
-            if (es!=null) {
+            if (es != null) {
                 if (e instanceof FileNotFoundException) {
                     // pass through 404 Not Found to allow the caller to handle it intelligently
                     throw (IOException) new FileNotFoundException(IOUtils.toString(es, "UTF-8")).initCause(e);
-                } else
-                    throw (IOException) new IOException(IOUtils.toString(es, "UTF-8")).initCause(e);
-            } else
-                throw e;
+                } else throw (IOException) new IOException(IOUtils.toString(es, "UTF-8")).initCause(e);
+            } else throw e;
         } finally {
             IOUtils.closeQuietly(es);
         }