Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix for unused json map when method with body, but body is null #200

Merged
merged 2 commits into from
Jun 15, 2015
+6 −4
Merged

fix for unused json map when method with body, but body is null #200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
861fd55
fix for unused json map when method with body, but body is null
Jun 15, 2015
931ed7a
don't ignore args when method without body
Jun 15, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/main/java/org/kohsuke/github/Requester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import java.util.regex.Pattern;
import java.util.zip.GZIPInputStream;

import static java.util.Arrays.asList;
import static org.kohsuke.github.GitHub.*;

/**
Expand All @@ -61,6 +62,8 @@
* @author Kohsuke Kawaguchi
*/
class Requester {
private static final List<String> METHODS_WITHOUT_BODY = asList("GET", "DELETE");

private final GitHub root;
private final List<Entry> args = new ArrayList<Entry>();
private final Map<String,String> headers = new LinkedHashMap<String, String>();
Expand Down Expand Up @@ -208,7 +211,7 @@ public <T> T to(String tailApiUrl, Class<T> type, String method) throws IOExcept

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()) {
if (METHODS_WITHOUT_BODY.contains(method) && !args.isEmpty()) {
StringBuilder qs=new StringBuilder();
for (Entry arg : args) {
qs.append(qs.length()==0 ? '?' : '&');
Expand Down Expand Up @@ -296,6 +299,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];
Expand All @@ -311,9 +315,7 @@ private void buildRequest() throws IOException {
}

private boolean isMethodWithBody() {
if (method.equals("GET")) return false;
if (method.equals("DELETE")) return false;
return true;
return !METHODS_WITHOUT_BODY.contains(method);
}

/**
Expand Down