From ab7445f59de35ffaa699195860876bb3deccf9bb Mon Sep 17 00:00:00 2001
From: jacalvar <jacalvar@microsoft.com>
Date: Wed, 27 Aug 2014 10:04:29 -0700
Subject: [PATCH] [Fixes #9] Use a common query string builder api

1. Added a reference to Microsoft.AspNet.WebUtilities.
2. Refactored TemplateBinder to use QueryBuilder instead of
   manually creating a query string.
---
 .../Template/TemplateBinder.cs                        | 11 ++++-------
 src/Microsoft.AspNet.Routing/project.json             |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs b/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs
index c381a66bbf..aace63e088 100644
--- a/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs
+++ b/src/Microsoft.AspNet.Routing/Template/TemplateBinder.cs
@@ -8,6 +8,7 @@ using System.Diagnostics.Contracts;
 using System.Globalization;
 using System.Text;
 using System.Text.RegularExpressions;
+using Microsoft.AspNet.WebUtilities;
 
 namespace Microsoft.AspNet.Routing.Template
 {
@@ -241,7 +242,7 @@ namespace Microsoft.AspNet.Routing.Template
             encoded.Append(UriEncode(context.Build()));
 
             // Generate the query string from the remaining values
-            var firstParam = true;
+            var queryBuilder = new QueryBuilder();
             foreach (var kvp in acceptedValues)
             {
                 if (_defaults != null && _defaults.ContainsKey(kvp.Key))
@@ -256,14 +257,10 @@ namespace Microsoft.AspNet.Routing.Template
                     continue;
                 }
 
-                encoded.Append(firstParam ? '?' : '&');
-                firstParam = false;
-
-                encoded.Append(Uri.EscapeDataString(kvp.Key));
-                encoded.Append('=');
-                encoded.Append(Uri.EscapeDataString(converted));
+                queryBuilder.Add(kvp.Key, converted);
             }
 
+            encoded.Append(queryBuilder.ToString());
             return encoded.ToString();
         }
 
diff --git a/src/Microsoft.AspNet.Routing/project.json b/src/Microsoft.AspNet.Routing/project.json
index 24690c6e95..dd873f7335 100644
--- a/src/Microsoft.AspNet.Routing/project.json
+++ b/src/Microsoft.AspNet.Routing/project.json
@@ -6,6 +6,7 @@
   "dependencies": {
     "Microsoft.AspNet.Http": "1.0.0-*",
     "Microsoft.AspNet.RequestContainer": "1.0.0-*",
+    "Microsoft.AspNet.WebUtilities": "1.0.0-*",
     "Microsoft.Framework.DependencyInjection" : "1.0.0-*",
     "Microsoft.Framework.Logging": "1.0.0-*",
     "Microsoft.Framework.OptionsModel": "1.0.0-*"