QueryStringParser

src/WireMock.Net/RequestBuilders/Request.cs

@@ -4,7 +4,6 @@ using System.Collections.ObjectModel;
 using System.Linq;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
-using WireMock.Util;
 using WireMock.Validation;
 
 namespace WireMock.RequestBuilders

src/WireMock.Net/RequestMessage.cs

@@ -171,40 +171,7 @@ namespace WireMock
             Headers = headers?.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
             Cookies = cookies;
             RawQuery = WebUtility.UrlDecode(urlDetails.Url.Query);
-            Query = ParseQuery(RawQuery);
-        }
-
-        private static IDictionary<string, WireMockList<string>> ParseQuery(string queryString)
-        {
-            if (string.IsNullOrEmpty(queryString))
-            {
-                return null;
-            }
-
-            if (queryString.StartsWith("?"))
-            {
-                queryString = queryString.Substring(1);
-            }
-
-            return queryString.Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries)
-                .Aggregate(new Dictionary<string, WireMockList<string>>(),
-                (dict, term) =>
-                {
-                    string[] parts = term.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
-                    string key = parts[0];
-                    if (!dict.ContainsKey(key))
-                    {
-                        dict.Add(key, new WireMockList<string>());
-                    }
-
-                    if (parts.Length == 2)
-                    {
-                        string[] values = parts[1].Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries);
-                        dict[key].AddRange(values);
-                    }
-
-                    return dict;
-                });
+            Query = QueryStringParser.Parse(RawQuery);
         }
 
         /// <summary>

src/WireMock.Net/Util/QueryStringParser.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace WireMock.Util
+{
+    /// <summary>
+    /// Based on https://stackoverflow.com/questions/659887/get-url-parameters-from-a-string-in-net
+    /// </summary>
+    internal static class QueryStringParser
+    {
+        public static IDictionary<string, WireMockList<string>> Parse(string queryString)
+        {
+            if (string.IsNullOrEmpty(queryString))
+            {
+                return new Dictionary<string, WireMockList<string>>();
+            }
+
+            string[] JoinParts(string[] parts)
+            {
+                if (parts.Length > 2)
+                {
+                    return new[] { string.Join("=", parts, 1, parts.Length - 1) };
+                }
+
+                if (parts.Length > 1)
+                {
+                    return parts[1].Split(new[] { "," }, StringSplitOptions.RemoveEmptyEntries); // support "?key=1,2"
+                }
+
+                return new string[0];
+            }
+
+            return queryString.TrimStart('?')
+                .Split(new[] { '&', ';' }, StringSplitOptions.RemoveEmptyEntries) // Support "?key=value;key=anotherValue" and "?key=value&key=anotherValue"
+                .Select(parameter => parameter.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries))
+                .GroupBy(parts => parts[0], JoinParts)
+                .ToDictionary(grouping => grouping.Key, grouping => new WireMockList<string>(grouping.SelectMany(x => x)));
+        }
+    }
+}