Merge pull request #224 from blmarket/fix-url-encoding

Fix query and fragment removed from request
line · Aug 11, 2016 · 9c81fc6 · 9c81fc6
2 parents 07e767f + 86a888e
commit 9c81fc6
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/com/linecorp/armeria/client/http/DefaultSimpleHttpClient.java b/src/main/java/com/linecorp/armeria/client/http/DefaultSimpleHttpClient.java
@@ -18,6 +18,7 @@
 
 import static com.linecorp.armeria.common.util.Functions.voidFunction;
 
+import java.net.URI;
 import java.util.Arrays;
 
 import com.linecorp.armeria.client.ClientOptionValue;
@@ -47,9 +48,19 @@ public Future<SimpleHttpResponse> execute(SimpleHttpRequest sReq) {
         final EventLoop eventLoop = client.eventLoop0();
         final Promise<SimpleHttpResponse> promise = eventLoop.newPromise();
         try {
+            URI uri = sReq.uri();
+            StringBuilder uriBuilder = new StringBuilder(uri.getPath());
+            if (uri.getQuery() != null) {
+                uriBuilder.append('?');
+                uriBuilder.append(uri.getQuery());
+            }
+            if (uri.getFragment() != null) {
+                uriBuilder.append('#');
+                uriBuilder.append(uri.getFragment());
+            }
             final AggregatedHttpMessage aReq = AggregatedHttpMessage.of(
                     HttpMethod.valueOf(sReq.method().name()),
-                    sReq.uri().getPath(),
+                    uriBuilder.toString(),
                     HttpData.of(sReq.content()));
 
             // Convert the headers.