eliminate the need for path manipulation and consolidate them to 'with'

kohsuke · kohsuke · commit 77590b4eb3c4 · 2015-03-21T16:52:49.000-07:00
diff --git a/src/main/java/org/kohsuke/github/GHRepository.java b/src/main/java/org/kohsuke/github/GHRepository.java
@@ -1029,10 +1029,7 @@ public GHContent getFileContent(String path, String ref) throws IOException {
         Requester requester = root.retrieve();
         String target = getApiTailUrl("contents/" + path);
 
-        if (ref != null)
-            target = target + "?ref=" + ref;
-
-        return requester.to(target, GHContent.class).wrap(this);
+        return requester.with("ref",ref).to(target, GHContent.class).wrap(this);
     }
 
     public List<GHContent> getDirectoryContent(String path) throws IOException {
@@ -1043,10 +1040,7 @@ public List<GHContent> getDirectoryContent(String path, String ref) throws IOExc
         Requester requester = root.retrieve();
         String target = getApiTailUrl("contents/" + path);
 
-        if (ref != null)
-            target = target + "?ref=" + ref;
-
-        GHContent[] files = requester.to(target, GHContent[].class);
+        GHContent[] files = requester.with("ref",ref).to(target, GHContent[].class);
 
         GHContent.wrap(files, this);
 
diff --git a/src/main/java/org/kohsuke/github/Requester.java b/src/main/java/org/kohsuke/github/Requester.java
@@ -191,6 +191,14 @@ 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()) {
+                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"));
+                }
+                tailApiUrl += qs.toString();
+            }
             HttpURLConnection uc = setupConnection(root.getApiURL(tailApiUrl));
 
             buildRequest(uc);
