Fix url creation

Author: flobernd

src/Elastic.Clients.Elasticsearch/_Shared/Client/ElasticsearchClient.cs

@@ -164,14 +164,12 @@ private ValueTask<TResponse> DoRequestCoreAsync<TRequest, TResponse, TRequestPar
 
 		ValueTask<TResponse> SendRequest()
 		{
-			var (resolvedUrl, _, resolvedRouteValues, postData) = PrepareRequest<TRequest, TRequestParameters>(request);
+			var (endpointPath, resolvedRouteValues, postData) = PrepareRequest<TRequest, TRequestParameters>(request);
 			var openTelemetryData = PrepareOpenTelemetryData<TRequest, TRequestParameters>(request, resolvedRouteValues);
 
 			return isAsync
-				? new ValueTask<TResponse>(_transport
-					.RequestAsync<TResponse>(new EndpointPath(request.HttpMethod, resolvedUrl), postData, in openTelemetryData, request.RequestConfig, cancellationToken))
-				: new ValueTask<TResponse>(_transport
-					.Request<TResponse>(new EndpointPath(request.HttpMethod, resolvedUrl), postData, in openTelemetryData, request.RequestConfig));
+				? new ValueTask<TResponse>(_transport.RequestAsync<TResponse>(endpointPath, postData, in openTelemetryData, request.RequestConfig, cancellationToken))
+				: new ValueTask<TResponse>(_transport.Request<TResponse>(endpointPath, postData, in openTelemetryData, request.RequestConfig));
 		}
 
 		async ValueTask<TResponse> SendRequestWithProductCheck()
@@ -212,21 +210,20 @@ async ValueTask<TResponse> SendRequestWithProductCheckCore()
 
 			// Send request
 
-			var (resolvedUrl, _, resolvedRouteValues, postData) = PrepareRequest<TRequest, TRequestParameters>(request);
+			var (endpointPath, resolvedRouteValues, postData) = PrepareRequest<TRequest, TRequestParameters>(request);
 			var openTelemetryData = PrepareOpenTelemetryData<TRequest, TRequestParameters>(request, resolvedRouteValues);
 
 			TResponse response;
 
 			if (isAsync)
 			{
 				response = await _transport
-					.RequestAsync<TResponse>(new EndpointPath(request.HttpMethod, resolvedUrl), postData, in openTelemetryData, requestConfig, cancellationToken)
+					.RequestAsync<TResponse>(endpointPath, postData, in openTelemetryData, requestConfig, cancellationToken)
 					.ConfigureAwait(false);
 			}
 			else
 			{
-				response = _transport
-					.Request<TResponse>(new EndpointPath(request.HttpMethod, resolvedUrl), postData, in openTelemetryData, requestConfig);
+				response = _transport.Request<TResponse>(endpointPath, postData, in openTelemetryData, requestConfig);
 			}
 
 			// Evaluate product check result
@@ -290,20 +287,21 @@ private static OpenTelemetryData PrepareOpenTelemetryData<TRequest, TRequestPara
 		return openTelemetryData;
 	}
 
-	private (string resolvedUrl, string urlTemplate, Dictionary<string, string>? resolvedRouteValues, PostData data) PrepareRequest<TRequest, TRequestParameters>(TRequest request)
+	private (EndpointPath endpointPath, Dictionary<string, string>? resolvedRouteValues, PostData data) PrepareRequest<TRequest, TRequestParameters>(TRequest request)
 		where TRequest : Request<TRequestParameters>
 		where TRequestParameters : RequestParameters, new()
 	{
 		request.ThrowIfNull(nameof(request), "A request is required.");
 
-		var (resolvedUrl, urlTemplate, routeValues) = request.GetUrl(ElasticsearchClientSettings);
+		var (resolvedUrl, _, routeValues) = request.GetUrl(ElasticsearchClientSettings);
+		var pathAndQuery = request.RequestParameters.CreatePathWithQueryStrings(resolvedUrl, ElasticsearchClientSettings);
 
 		var postData =
 			request.HttpMethod == HttpMethod.GET ||
 			request.HttpMethod == HttpMethod.HEAD || !request.SupportsBody
 				? null
 				: PostData.Serializable(request);
 
-		return (resolvedUrl, urlTemplate, routeValues, postData);
+		return (new EndpointPath(request.HttpMethod, pathAndQuery), routeValues, postData);
 	}
 }