fix #1799, needed to go deeper to make sure we properly encode again

Author: Mpdreamz

src/Elasticsearch.Net/Extensions/NameValueCollectionExtensions.cs

@@ -26,7 +26,8 @@ internal static string ToQueryString(this NameValueCollection self, string prefi
 			return prefix + string.Join("&", self.AllKeys.Select(key => $"{Encode(key)}={Encode(self[key])}"));
 		}
 
-		private static string Encode(string s) => s == null ? null : Uri.EscapeDataString(s);
+		private static string Encode(string s) => s;
+		//private static string Encode(string s) => s == null ? null : Uri.EscapeDataString(s);
 
 		internal static NameValueCollection ToNameValueCollection(this IDictionary<string, object> dict, IFormatProvider provider)
 		{

src/Elasticsearch.Net/Serialization/UrlFormatProvider.cs

@@ -21,7 +21,7 @@ public string Format(string format, object arg, IFormatProvider formatProvider)
 				throw new ArgumentNullException();
 			if (format == "r")
 				return arg.ToString();
-			return this.GetStringValue(arg);
+			return Uri.EscapeDataString(this.GetStringValue(arg));
 		}
 
 		public string GetStringValue(object valueType)

src/Nest/CommonAbstractions/Request/RouteValues.cs

@@ -49,7 +49,7 @@ public void Resolve(IConnectionSettingsValues settings)
 			foreach (var kv in _routeValues)
 			{
 				var key = kv.Value.GetString(settings);
-				this._resolved[kv.Key] = key.IsNullOrEmpty() ?key : Uri.EscapeDataString(key);
+				this._resolved[kv.Key] = key.IsNullOrEmpty() ? key : key;
 			}
 		}
 

src/Tests/Document/Single/Get/GetApiTests.cs

@@ -43,6 +43,33 @@ protected override void ExpectResponse(IGetResponse<Project> response)
 		}
 	}
 
+	[Collection(IntegrationContext.ReadOnly)]
+	public class GetApiLowLevelTests : GetApiTests
+	{
+		public GetApiLowLevelTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cluster, usage) { }
+
+		protected override string UrlPath => $"/project/project/{ProjectIdForUrl}?fields=name%2CnumberOfCommits";
+
+		protected override LazyResponses ClientUsage() => Calls(
+			fluent: (client, f) => client.Raw.Get<GetResponse<Project>>("project", "project", this.ProjectId, RequestParameter).Body,
+			fluentAsync: (client, f) => client.Raw.GetAsync<GetResponse<Project>>("project", "project", this.ProjectId, RequestParameter)
+				.ContinueWith<IGetResponse<Project>>(t=>t.Result.Body),
+			request: (client, f) => client.Raw.Get<GetResponse<Project>>("project", "project", this.ProjectId, RequestParameter).Body,
+			requestAsync: (client, f) => client.Raw.GetAsync<GetResponse<Project>>("project", "project", this.ProjectId, RequestParameter)
+				.ContinueWith<IGetResponse<Project>>(t=>t.Result.Body)
+		);
+
+		private GetRequestParameters RequestParameter(GetRequestParameters r) => r
+			.Fields("name", "numberOfCommits");
+
+		protected override void ExpectResponse(IGetResponse<Project> response)
+		{
+			response.Fields.Should().NotBeNull();
+			response.Fields.ValueOf<Project, string>(p => p.Name).Should().Be(ProjectId);
+			response.Fields.ValueOf<Project, int?>(p => p.NumberOfCommits).Should().BeGreaterThan(0);
+		}
+	}
+
 	[Collection(IntegrationContext.ReadOnly)]
 	public class GetApiFieldsTests : GetApiTests
 	{

src/Tests/Document/Single/Get/GetUrlTests.cs

@@ -44,6 +44,10 @@ await GET($"/project/project/{escaped}?routing={escaped}")
 				.FluentAsync(c => c.GetAsync<Project>(urlId, s=>s.Routing(urlId)))
 				.RequestAsync(c => c.GetAsync<Project>(new GetRequest<Project>(urlId) { Routing = urlId }))
 				;
+
+			GET($"/project/project/{escaped}?routing={escaped}")
+				.LowLevel(c => c.Get<dynamic>("project", "project", urlId, s=>s.Routing(urlId)))
+				;
 		}
 	}
 }

src/Tests/Framework/UrlTests.cs

@@ -47,12 +47,17 @@ public UrlTester Request<TResponse>(Func<IElasticClient, TResponse> call)
 		public Task<UrlTester> RequestAsync<TResponse>(Func<IElasticClient, Task<TResponse>> call) 
 			where TResponse : IResponse => WhenCallingAsync(call, "request async");
 
+		public UrlTester LowLevel(Func<IElasticsearchClient, IApiCallDetails> call)
+		{
+			var callDetails = call(this.GetClient().Raw);
+			return Assert("lowleve", callDetails);
+		}
 
 		internal UrlTester WhenCalling<TResponse>(Func<IElasticClient, TResponse> call, string typeOfCall)
 			where TResponse : IResponse
 		{
-			var callDetails = call(this.GetClient()).CallDetails;
-			return Assert(typeOfCall, callDetails);
+			var callDetails = call(this.GetClient());
+			return Assert(typeOfCall, callDetails.CallDetails);
 		}
 
 		internal async Task<UrlTester> WhenCallingAsync<TResponse>(Func<IElasticClient, Task<TResponse>> call, string typeOfCall)

src/Tests/tests.yaml

@@ -1,5 +1,6 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: u# the elasticsearch version that should be started
+mode: m
+# the elasticsearch version that should be started
 elasticsearch_version: 2.0.1
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true