From 2cb2eb8a879efcceff1c03dd286ed14a17ef1db2 Mon Sep 17 00:00:00 2001
From: Minsuk Eom <boxresin@gmail.com>
Date: Wed, 12 Jul 2017 08:49:34 +0900
Subject: [PATCH] The first task to improve the 'setUrl()' method in
 HttpRequester.

---
 .idea/misc.xml                                | 18 ++++++++
 DemoApp/src/main/AndroidManifest.xml          |  3 +-
 .../library/javahttp/MainActivity.java        | 15 -------
 .../library/javahttp/HttpRequester.java       | 28 +++++++++++++
 .../library/javahttp/LibraryTest.java         | 41 +++++++++++++++++++
 build.gradle                                  |  2 +-
 6 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 125ad42..70d16fa 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,24 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="JavadocGenerationManager">
+    <option name="OUTPUT_DIRECTORY" value="$USER_HOME$/Desktop/JavaHTTP-docs" />
+    <option name="OPTION_SCOPE" value="protected" />
+    <option name="OPTION_HIERARCHY" value="false" />
+    <option name="OPTION_NAVIGATOR" value="true" />
+    <option name="OPTION_INDEX" value="false" />
+    <option name="OPTION_SEPARATE_INDEX" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_USE" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_AUTHOR" value="false" />
+    <option name="OPTION_DOCUMENT_TAG_VERSION" value="true" />
+    <option name="OPTION_DOCUMENT_TAG_DEPRECATED" value="true" />
+    <option name="OPTION_DEPRECATED_LIST" value="true" />
+    <option name="OTHER_OPTIONS" value="-encoding UTF-8 -docencoding utf-8 -charset utf-8 -stylesheetfile C:\Users\eomin\Desktop\javadoc_stylesheet.css -link http://docs.oracle.com/javase/7/docs/api/ -windowtitle &quot;JavaHTTP document&quot;" />
+    <option name="HEAP_SIZE" />
+    <option name="LOCALE" />
+    <option name="OPEN_IN_BROWSER" value="true" />
+    <option name="OPTION_INCLUDE_LIBS" value="false" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/DemoApp/src/main/AndroidManifest.xml b/DemoApp/src/main/AndroidManifest.xml
index ddc91aa..53a991b 100644
--- a/DemoApp/src/main/AndroidManifest.xml
+++ b/DemoApp/src/main/AndroidManifest.xml
@@ -8,7 +8,6 @@
 		android:allowBackup = "true"
 		android:icon = "@mipmap/ic_launcher"
 		android:label = "@string/app_name"
-		android:roundIcon = "@mipmap/ic_launcher_round"
 		android:supportsRtl = "true"
 		android:theme = "@style/AppTheme">
 		<activity android:name = ".MainActivity">
@@ -20,4 +19,4 @@
 		</activity>
 	</application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/DemoApp/src/main/java/boxresin/library/javahttp/MainActivity.java b/DemoApp/src/main/java/boxresin/library/javahttp/MainActivity.java
index 5484a46..91d761a 100644
--- a/DemoApp/src/main/java/boxresin/library/javahttp/MainActivity.java
+++ b/DemoApp/src/main/java/boxresin/library/javahttp/MainActivity.java
@@ -25,21 +25,6 @@ protected void onCreate(Bundle savedInstanceState)
 			if (response != null)
 				binding.txtResponse.setText(response);
 		}
-
-		try
-		{
-			HttpResponse response = new HttpRequester()
-					.setUrl("https://www.google.com/")
-					.setMethod("GET")
-					.addHeader("key", "value")
-					.addHeader("key", "value")
-					.addHeader("key", "value")
-					.addHeader("key", "value")
-					.request();
-		}
-		catch (IOException e)
-		{
-		}
 	}
 
 	public void onClick(View view)
diff --git a/Library/src/main/java/boxresin/library/javahttp/HttpRequester.java b/Library/src/main/java/boxresin/library/javahttp/HttpRequester.java
index 97b41b5..4a6461d 100644
--- a/Library/src/main/java/boxresin/library/javahttp/HttpRequester.java
+++ b/Library/src/main/java/boxresin/library/javahttp/HttpRequester.java
@@ -5,9 +5,11 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -55,6 +57,32 @@ public HttpRequester setUrl(String url)
 		return this;
 	}
 
+	/**
+	 * Sets the URL to request.
+	 * @param url    The URL before a part of query parameter
+	 * @param params Query parameters to URL. It will be URL encoded.
+	 * @since v1.1.0
+	 */
+	public HttpRequester setUrl(String url, Map<String, String> params)
+	{
+		this.url = url;
+		if (!params.isEmpty())
+		{
+			this.url += "?";
+			for (Map.Entry<String, String> param : params.entrySet())
+			{
+				try
+				{
+					this.url += (param.getKey() + "=" + URLEncoder.encode(param.getValue(), "UTF-8"));
+					this.url += '&';
+				}
+				catch (UnsupportedEncodingException ignored) {}
+			}
+			this.url = this.url.substring(0, this.url.length() - 1);
+		}
+		return this;
+	}
+
 	/**
 	 * Returns HTTP method to request.
 	 * @return HTTP method as String type (ex. "POST", "GET" etc)
diff --git a/Library/src/test/java/boxresin/library/javahttp/LibraryTest.java b/Library/src/test/java/boxresin/library/javahttp/LibraryTest.java
index 02bf31d..557b8a8 100644
--- a/Library/src/test/java/boxresin/library/javahttp/LibraryTest.java
+++ b/Library/src/test/java/boxresin/library/javahttp/LibraryTest.java
@@ -4,7 +4,10 @@
 import org.junit.Test;
 
 import java.io.IOException;
+import java.net.URLEncoder;
 import java.nio.charset.Charset;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Created by Minsuk Eom on 2017-04-27.
@@ -73,4 +76,42 @@ public void testHttpResponse() throws IOException
 
 		Assert.assertEquals(new String(response.getBodyAsByteArray(), Charset.forName(response.getBodyEncoding())), response.getBody());
 	}
+
+	@Test
+	public void testSetURL()
+	{
+		Map<String, String> params = new HashMap<>();
+		params.put("hello", "world");
+		params.put("test", "it");
+
+		HttpRequester requester = new HttpRequester();
+		requester.setUrl("http://www.google.com", params);
+		Assert.assertEquals("http://www.google.com?test=it&hello=world", requester.getUrl());
+
+		params = new HashMap<>();
+		params.put("hangul", "한글 테스트");
+		params.put("second", "두 번째");
+
+		requester.setUrl("http://www.google.com", params);
+		Assert.assertEquals("http://www.google.com?hangul=%ED%95%9C%EA%B8%80+%ED%85%8C%EC%8A%A4%ED%8A%B8&" +
+				"second=%EB%91%90+%EB%B2%88%EC%A7%B8", requester.getUrl());
+	}
+
+	@Test
+	public void testURLCodec()
+	{
+		System.out.println(URLEncoder.encode("한글"));
+		for (Map.Entry<String, Charset> charset : Charset.availableCharsets().entrySet())
+		{
+			try
+			{
+				if ("%ED%95%9C%EA%B8%80".equals(URLEncoder.encode("한글", charset.getKey())))
+					return;
+			}
+			catch (Exception e)
+			{
+			}
+		}
+		Assert.assertTrue(false);
+	}
 }
diff --git a/build.gradle b/build.gradle
index d7c138c..1b0d6f1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.novoda:bintray-release:0.4.0'
 
         // NOTE: Do not place your application dependencies here; they belong