improved connectors GET and fixed bug in ContentBuilder

Author: fquirin

src/main/java/net/b07z/sepia/server/core/tools/Connectors.java

@@ -268,15 +268,27 @@ public static JSONObject httpGET(String url) {
 	/**
 	 * Make HTTP GET request to URL and get JSON response. Check with {@code httpSuccess(...)} for status.
 	 * @param url - URL address to call including none or only some parameters
-	 * @param params - additional parameters added to URL (use e.g. "?q=search_term" or "&type=json" etc.)
+	 * @param params - additional parameters added to URL (use e.g. "?q=search_term" or "&type=json" etc.) or null
 	 * @return JSONObject response of URL call - Note: if response is not JSON it will be placed e.g. as "STRING" field in the result or "JSONARRAY" if it's an array.
 	 */
 	public static JSONObject httpGET(String url, String[] params) {
+		return httpGET(url, params, null);
+	}
+	/**
+	 * Make HTTP GET request to URL and get JSON response. Check with {@code httpSuccess(...)} for status.
+	 * @param url - URL address to call including none or only some parameters
+	 * @param params - additional parameters added to URL (use e.g. "?q=search_term" or "&type=json" etc.) or null
+	 * @param headers - Map with request properties (keys) and values.
+	 * @return JSONObject response of URL call - Note: if response is not JSON it will be placed e.g. as "STRING" field in the result or "JSONARRAY" if it's an array.
+	 */
+	public static JSONObject httpGET(String url, String[] params, Map<String, String> headers) {
 		int responseCode = -1;
 		String success_str = HTTP_REST_SUCCESS;
 		try{
-			for (String s : params){
-				url = url + s;
+			if (params != null){
+				for (String s : params){
+					url = url + s;
+				}
 			}
 			URL obj = new URL(url);
 			HttpURLConnection con = (HttpURLConnection) obj.openConnection();
@@ -285,6 +297,13 @@ public static JSONObject httpGET(String url, String[] params) {
 			con.setRequestProperty("User-Agent", USER_AGENT);
 			con.setConnectTimeout(CONNECT_TIMEOUT);
 			con.setReadTimeout(READ_TIMEOUT);
+			
+			if (headers != null){
+				for (Map.Entry<String, String> entry : headers.entrySet()){
+					con.setRequestProperty(entry.getKey(), entry.getValue());
+					//System.out.println(entry.getKey() +": "+ entry.getValue());
+				}
+			}
 
 			responseCode = con.getResponseCode();
 			//System.out.println("GET Response Code : " + responseCode);		//debug
@@ -377,8 +396,7 @@ public static JSONObject httpPOST(String targetURL, String data, Map<String, Str
 				headers.put("Content-Type", "application/json");
 				headers.put("Content-Length", Integer.toString(data.getBytes().length));
 			}
-			for (Map.Entry<String, String> entry : headers.entrySet())
-			{
+			for (Map.Entry<String, String> entry : headers.entrySet()){
 				connection.setRequestProperty(entry.getKey(), entry.getValue());
 				//System.out.println(entry.getKey() +": "+ entry.getValue());
 			}			
@@ -467,8 +485,7 @@ public static JSONObject httpPUT(String targetURL, String data, Map<String, Stri
 			connection.setConnectTimeout(CONNECT_TIMEOUT);
 			connection.setReadTimeout(READ_TIMEOUT);
 			//System.out.println("---headers---");
-			for (Map.Entry<String, String> entry : headers.entrySet())
-			{
+			for (Map.Entry<String, String> entry : headers.entrySet()){
 				connection.setRequestProperty(entry.getKey(), entry.getValue());
 				//System.out.println(entry.getKey() +": "+ entry.getValue());
 			}			

src/main/java/net/b07z/sepia/server/core/tools/ContentBuilder.java

@@ -20,7 +20,7 @@ public class ContentBuilder {
 	 */
 	public static String postForm(Object... keyValues){
 		try {
-			String parameters = keyValues[0] + "=" + keyValues[1];
+			String parameters = keyValues[0] + "=" + URLEncoder.encode(keyValues[1].toString(), "UTF-8");
 			int i = 2;
 			while (i < keyValues.length){
 				parameters += "&" + (keyValues[i] + "=" + URLEncoder.encode(keyValues[i+1].toString(), "UTF-8"));

src/main/java/net/b07z/sepia/server/core/tools/JSON.java

@@ -211,7 +211,7 @@ public static long getLongOrDefault(JSONObject jObj, String key, long defaultVal
 	 * 
 	 * @param j_obj - JSONObject input
 	 * @param key - key name of the entry you want, ...get("key")
-	 * @return value as string or empty string (or null of value is actually null)
+	 * @return value as string or empty string (or null if value is actually null)
 	 */
 	public static String getString(JSONObject j_obj, String key){
 		if (j_obj != null && j_obj.containsKey(key)){