Remove duplicate request param collection code

Author: LucaScorpion

src/main/java/com/scorpiac/javarant/DevRant.java

@@ -13,6 +13,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -323,20 +325,7 @@ public boolean postComment(int rantId, String comment) {
      * @return A {@link JsonObject} containing the response.
      */
     JsonObject post(String url, NameValuePair... params) {
-        List<NameValuePair> paramList = new ArrayList<>(params.length + 5);
-        paramList.addAll(Arrays.asList(params));
-
-        // Add the parameters which always need to be present.
-        paramList.add(new BasicNameValuePair("app", APP_ID));
-        paramList.add(new BasicNameValuePair("plat", PLAT_ID));
-
-        // Add the auth information.
-        if (isLoggedIn()) {
-            paramList.add(new BasicNameValuePair("token_id", auth.getId()));
-            paramList.add(new BasicNameValuePair("token_key", auth.getKey()));
-            paramList.add(new BasicNameValuePair("user_id", auth.getUserId()));
-        }
-
+        List<NameValuePair> paramList = getParameters(params);
         return executeRequest(Request.Post(BASE_URL + url).bodyForm(paramList));
     }
 
@@ -347,17 +336,43 @@ JsonObject post(String url, NameValuePair... params) {
      * @return A {@link JsonObject} containing the response.
      */
     JsonObject get(String url, NameValuePair... params) {
-        StringBuilder finalUrl = new StringBuilder(url).append("?app=").append(APP_ID).append("&plat=").append(PLAT_ID);
+        StringBuilder finalUrl = new StringBuilder(url).append('?');
+        List<NameValuePair> paramList = getParameters(params);
 
         // Add all parameters.
-        for (NameValuePair param : params)
-            finalUrl.append('&').append(param.getName()).append('=').append(param.getValue());
+        try {
+            for (NameValuePair param : paramList)
+                finalUrl.append('&').append(param.getName()).append('=').append(URLEncoder.encode(param.getValue(), "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            // This never happens.
+            e.printStackTrace();
+        }
+
+        return executeRequest(Request.Get(BASE_URL + finalUrl.toString()));
+    }
+
+    /**
+     * Get a list with all the parameters, including default and auth parameters.
+     *
+     * @param params The parameters to use.
+     * @return A list containing the given parameters, the default parameters, and the auth parameters.
+     */
+    private List<NameValuePair> getParameters(NameValuePair... params) {
+        List<NameValuePair> paramList = new ArrayList<>(params.length + 5);
+        paramList.addAll(Arrays.asList(params));
+
+        // Add the parameters which always need to be present.
+        paramList.add(new BasicNameValuePair("app", APP_ID));
+        paramList.add(new BasicNameValuePair("plat", PLAT_ID));
 
         // Add the auth information.
-        if (isLoggedIn())
-            finalUrl.append("&token_id=").append(auth.getId()).append("&token_key=").append(auth.getKey()).append("&user_id=").append(auth.getUserId());
+        if (isLoggedIn()) {
+            paramList.add(new BasicNameValuePair("token_id", auth.getId()));
+            paramList.add(new BasicNameValuePair("token_key", auth.getKey()));
+            paramList.add(new BasicNameValuePair("user_id", auth.getUserId()));
+        }
 
-        return executeRequest(Request.Get(BASE_URL + finalUrl.toString()));
+        return paramList;
     }
 
     /**