Fix HttpUrl.getPath()

Author: fornwall

.gitignore

@@ -27,3 +27,5 @@ hs_err_pid*
 
 # IntelliJ files
 .idea/
+
+.DS_Store

src/main/java/com/meeshkan/http/types/HttpUrl.java

@@ -90,11 +90,17 @@ public String getPath() {
         StringBuilder result = new StringBuilder();
         result.append(pathname);
         if (!queryParameters.isEmpty()) {
-            result.append('?');
+            boolean first = true;
             try {
                 for (Map.Entry<String, List<String>> entry : queryParameters.entrySet()) {
                     String encodedName = URLEncoder.encode(entry.getKey(), "utf-8");
                     for (String value : entry.getValue()) {
+                        if (first) {
+                            first = false;
+                            result.append('?');
+                        } else {
+                            result.append('&');
+                        }
                         String encodedValue = URLEncoder.encode(value, "utf-8");
                         result.append(encodedName).append('=').append(encodedValue);
                     }

src/test/java/com/meeshkan/http/types/HttpExchangeTest.java

@@ -7,6 +7,7 @@
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -54,10 +55,10 @@ void loadFromJson() throws Exception {
 
         assertEquals("/user/repos", exchange.getRequest().getUrl().getPathname());
         String path = exchange.getRequest().getUrl().getPath();
-        assertTrue(path.startsWith("/user/repos?"));
-        assertTrue(path.contains("mykey=myvalue"));
-        assertTrue(path.contains("anotherkey=value1"));
-        assertTrue(path.contains("anotherkey=value2"));
+        String queryString = path.substring(path.indexOf('?') + 1);
+        String[] queryParts = queryString.split("&");
+        assertEquals(3, queryParts.length);
+        assertEquals(new HashSet<>(Arrays.asList("mykey=myvalue", "anotherkey=value1", "anotherkey=value2")), new HashSet<>(Arrays.asList(queryParts)));
         assertNull(exchange.getRequest().getTimestamp());
         assertEquals("myvalue", exchange.getRequest().getUrl().getFirstQueryParameter("mykey"));
         assertEquals(Collections.singletonList("myvalue"), exchange.getRequest().getUrl().getAllQueryParameters("mykey"));

src/test/resources/sample-with-path.json

@@ -1,22 +1,22 @@
 {
   "request": {
-    "protocol": "http",
+    "timestamp": "2018-11-13T20:20:39+02:00",
     "method": "get",
+    "protocol": "http",
+    "host": "example.com",
     "headers": {
       "accept": "*/*",
       "user-agent": "Mozilla/5.0 (pc-x86_64-linux-gnu) Siege/3.0.8"
     },
-    "timestamp": "2018-11-13T20:20:39+02:00",
     "path": "/user/repos?mykey=myvalue&anotherkey=value1&anotherkey=value2",
-    "host": "example.com"
   },
   "response": {
-    "statusCode": 200,
-    "body": "...",
     "timestamp": "2019-11-13T20:20:39+02:00",
+    "statusCode": 200,
     "headers": {
       "content-length": "1999",
       "content-type": "text/html; charset=utf-8"
-    }
+    },
+    "body": "..."
   }
 }