Draft PR - nextlink encode

src/Microsoft.AspNet.OData.Shared/GetNextPageHelper.cs

@@ -6,6 +6,7 @@
 using System.Diagnostics.Contracts;
 using System.Globalization;
 using System.Text;
+using System.Web;
 
 namespace Microsoft.AspNet.OData
 {
@@ -14,7 +15,7 @@ namespace Microsoft.AspNet.OData
     /// </summary>
     internal static partial class GetNextPageHelper
     {
-        internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<string, string>> queryParameters, int pageSize, object instance = null, Func<object, string> objectToSkipTokenValue = null, CompatibilityOptions options = CompatibilityOptions.None)
+        internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<string, string>> queryParameters, int pageSize, object instance = null, Func<object, string> objectToSkipTokenValue = null, CompatibilityOptions options = CompatibilityOptions.None, bool encodeUrl = false)
         {
             Contract.Assert(requestUri != null);
             Contract.Assert(queryParameters != null);
@@ -96,7 +97,7 @@ internal static Uri GetNextPageLink(Uri requestUri, IEnumerable<KeyValuePair<str
 
             UriBuilder uriBuilder = new UriBuilder(requestUri)
             {
-                Query = queryBuilder.ToString()
+                Query = encodeUrl? HttpUtility.UrlEncode( queryBuilder.ToString()): queryBuilder.ToString()
             };
 
             return uriBuilder.Uri;

src/Microsoft.AspNet.OData.Shared/Interfaces/IWebApiRequestMessage.cs

@@ -86,8 +86,9 @@ internal interface IWebApiRequestMessage
         /// <param name="pageSize">The page size.</param>
         /// <param name="instance">The instance based on which the skiptoken value is generated</param>
         /// <param name="objToSkipTokenValue">Function that takes in the last object and returns the skiptoken value string.</param>
+        /// <param name="encodeUrl">Optional Parameter to determine whether the nextpace url should be encoded.</param>
         /// <returns></returns>
-        Uri GetNextPageLink(int pageSize, object instance, Func<object, string> objToSkipTokenValue);
+        Uri GetNextPageLink(int pageSize, object instance, Func<object, string> objToSkipTokenValue,bool encodeUrl);
 
         /// <summary>
         /// Get a list of content Id mappings associated with the request.

src/Microsoft.AspNet.OData.Shared/Query/DefaultSkipTokenHandler.cs

@@ -72,7 +72,7 @@ public override Uri GenerateNextPageLink(Uri baseUri, int pageSize, Object insta
                         return GenerateSkipTokenValue(obj, model, orderByNodes);
                     };
 
-                    return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, instance, skipTokenGenerator);
+                    return GetNextPageHelper.GetNextPageLink(baseUri, pageSize, instance, skipTokenGenerator,encodeUrl:true);
                 }
 
                 if (context.QueryOptions != null && context.QueryOptions.OrderBy != null)
@@ -86,7 +86,7 @@ public override Uri GenerateNextPageLink(Uri baseUri, int pageSize, Object insta
                 };
             }
 
-            return context.InternalRequest.GetNextPageLink(pageSize, instance, skipTokenGenerator);
+            return context.InternalRequest.GetNextPageLink(pageSize, instance, skipTokenGenerator, encodeUrl: true);
         }
 
         /// <summary>

src/Microsoft.AspNetCore.OData/Adapters/WebApiRequestMessage.cs

@@ -138,10 +138,11 @@ public ODataDeserializerProvider DeserializerProvider
         /// <param name="pageSize">The page size.</param>
         /// <param name="instance">Object which will be used to generate the skiptoken value.</param>
         /// <param name="objToSkipTokenValue">Function that takes in an instance and returns the skiptoken value string.</param>
+        /// <param name="encodeUrl">Optional Parameter to determine whether the nextpace url should be encoded.</param>
         /// <returns></returns>
-        public Uri GetNextPageLink(int pageSize, object instance = null, Func<object, string> objToSkipTokenValue = null)
+        public Uri GetNextPageLink(int pageSize, object instance = null, Func<object, string> objToSkipTokenValue = null,bool encodeUrl =false)
         {
-            return this.innerRequest.GetNextPageLink(pageSize, instance, objToSkipTokenValue);
+            return this.innerRequest.GetNextPageLink(pageSize, instance, objToSkipTokenValue,encodeUrl:encodeUrl);
         }
 
         /// <summary>

src/Microsoft.AspNetCore.OData/Extensions/HttpRequestExtensions.cs

@@ -263,10 +263,11 @@ public static ETag<TEntity> GetETag<TEntity>(this HttpRequest request, EntityTag
         /// </summary>
         /// <param name="request">The request on which to base the next page link.</param>
         /// <param name="pageSize">The number of results allowed per page.</param>
+        /// <param name="encodeUrl">Optional Parameter to determine whether the nextpace url should be encoded.</param>
         /// <returns>A next page link.</returns>
-        public static Uri GetNextPageLink(this HttpRequest request, int pageSize)
+        public static Uri GetNextPageLink(this HttpRequest request, int pageSize,bool encodeUrl =false)
         {
-            return GetNextPageLink(request, pageSize, null, null);
+            return  GetNextPageLink(request, pageSize, null, null);
         }
 
         /// <summary>
@@ -276,8 +277,9 @@ public static Uri GetNextPageLink(this HttpRequest request, int pageSize)
         /// <param name="pageSize">The number of results allowed per page.</param>
         /// <param name="instance">Object which can be used to generate the skiptoken value.</param>
         /// <param name="objectToSkipTokenValue">Function that takes in the last object and returns the skiptoken value string.</param>
+        /// <param name="encodeUrl">Optional Parameter to determine whether the nextpace url should be encoded.</param>
         /// <returns>A next page link.</returns>
-        public static Uri GetNextPageLink(this HttpRequest request, int pageSize, object instance, Func<object,string> objectToSkipTokenValue)
+        public static Uri GetNextPageLink(this HttpRequest request, int pageSize, object instance, Func<object,string> objectToSkipTokenValue, bool encodeUrl = false)
         {
             if (request == null)
             {

src/Microsoft.AspNetCore.OData/GetNextPageHelper.cs

@@ -16,15 +16,15 @@ namespace Microsoft.AspNet.OData
     internal static partial class GetNextPageHelper
     {
         /// <remarks>This signature uses types that are AspNetCore-specific.</remarks>
-        internal static Uri GetNextPageLink(Uri requestUri, int pageSize, object instance = null, Func<object, String> objectToSkipTokenValue = null)
+        internal static Uri GetNextPageLink(Uri requestUri, int pageSize, object instance = null, Func<object, String> objectToSkipTokenValue = null, bool encodeUrl =false)
         {
             Contract.Assert(requestUri != null);
 
             Dictionary<string, StringValues> queryValues = QueryHelpers.ParseQuery(requestUri.Query);
             IEnumerable<KeyValuePair<string, string>> queryParameters = queryValues.SelectMany(
                 kvp => kvp.Value, (kvp, value) => new KeyValuePair<string, string>(kvp.Key, value));
 
-            return GetNextPageLink(requestUri, queryParameters, pageSize, instance, objectToSkipTokenValue);
+            return GetNextPageLink(requestUri, queryParameters, pageSize, instance, objectToSkipTokenValue,encodeUrl:encodeUrl);
         }
     }
 }