Remove high level to low level dispatch (#3658)

High level client now directly calls into DoRequest and no longer calls its equivalent low level method

* remove _LowLevelDispatch.generated.cs
* renamed temp names for methods to DoRequest(Async)
* LowLevelDispatch no longer part of code generation
* Requests now responsible for building urls, came up with a decent first attempt at cached builders
* fixed test failures mainly to do with _all no no longer magically be rewritten

* IndexRequest is an odd one it needs a reference to a resolved id in order to determine the right HttpMethod

Made this explicit through ResolvedRouteValues but not too keen to keep this around.

ConnectionSettings small refactor, now exposes Id to uniquely identify the instance

Author: russcam

src/CodeGeneration/ApiGenerator/ApiGenerator.cs

@@ -4,7 +4,6 @@
 using System.IO;
 using System.Linq;
 using ApiGenerator.Domain;
-using CsQuery.EquationParser.Implementation;
 using Newtonsoft.Json.Linq;
 using RazorLight;
 using ShellProgressBar;
@@ -31,7 +30,6 @@ public static void Generate(string downloadBranch, params string[] folders)
 				{ GenerateRequests, "Requests" },
 				{ GenerateEnums, "Enums" },
 				{ GenerateRawClient, "Lowlevel client" },
-				{ GenerateRawDispatch, "Dispatch" },
 			};
 
 			using (var pbar = new ProgressBar(actions.Count, "Generating code", new ProgressBarOptions { BackgroundColor = ConsoleColor.DarkGray }))
@@ -195,14 +193,6 @@ private static void GenerateClientInterface(RestApiSpec model)
 			File.WriteAllText(targetFile, source);
 		}
 
-		private static void GenerateRawDispatch(RestApiSpec model)
-		{
-			var targetFile = CodeConfiguration.NestFolder + @"_Generated/_LowLevelDispatch.Generated.cs";
-			var source = DoRazor(nameof(GenerateRawDispatch), File.ReadAllText(CodeConfiguration.ViewFolder + @"_LowLevelDispatch.Generated.cshtml"),
-				model);
-			File.WriteAllText(targetFile, source);
-		}
-
 		private static void GenerateRawClient(RestApiSpec model)
 		{
 			var targetFile = CodeConfiguration.EsNetFolder + @"ElasticLowLevelClient.Generated.cs";

src/CodeGeneration/ApiGenerator/Views/_Descriptors.Generated.cshtml

@@ -37,6 +37,7 @@ namespace Nest
 	///<summary>descriptor for @method.FullName <pre>@method.Documentation</pre></summary>
 	public partial class @Raw(type) @(Raw(string.Format(" : RequestDescriptorBase<{0},{1}, {2}>, {2}", type, method.QueryStringParamName, concreteInterface)))
 	{ 
+		internal override ApiUrls ApiUrls => @(Raw(method.RequestType)).Urls;
 @foreach (Constructor c in Constructor.DescriptorConstructors(method))
 {
 <text>		@(Raw(CodeGenerator.Constructor(c)))

src/CodeGeneration/ApiGenerator/Views/_LowLevelDispatch.Generated.cshtml

@@ -76,6 +76,8 @@ namespace Nest
 	public partial class @Raw(method.RequestType) @Raw(string.Format(": PlainRequestBase<{0}>, {1}", method.QueryStringParamName, method.InterfaceType))
 	{
 		protected @(Raw(method.InterfaceType)) Self => this;
+		internal static ApiUrls Urls = new ApiUrls(new [] {@Raw(string.Join(", ", method.Url.ExposedApiPaths.Select(p=>$"\"{p.Path}\"")))});
+		internal override ApiUrls ApiUrls => Urls;
 @foreach (Constructor c in Constructor.RequestConstructors(method, inheritsFromPlainRequestBase: true))
 {
 <text>		@(Raw(CodeGenerator.Constructor(c)))

src/CodeGeneration/ApiGenerator/Views/_Requests.Generated.cshtml

@@ -64,71 +64,42 @@ public abstract class ConnectionConfiguration<T> : IConnectionConfigurationValue
 		where T : ConnectionConfiguration<T>
 	{
 		private readonly IConnection _connection;
-
 		private readonly IConnectionPool _connectionPool;
-
 		private readonly NameValueCollection _headers = new NameValueCollection();
-
 		private readonly NameValueCollection _queryString = new NameValueCollection();
 		private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
-
+		private readonly ElasticsearchUrlFormatter _urlFormatter;
+		
 		private BasicAuthenticationCredentials _basicAuthCredentials;
-
 		private X509CertificateCollection _clientCertificates;
 		private Action<IApiCallDetails> _completedRequestHandler = DefaultCompletedRequestHandler;
-
 		private int _connectionLimit;
-
 		private TimeSpan? _deadTimeout;
-
 		private bool _disableAutomaticProxyDetection = false;
-
 		private bool _disableDirectStreaming = false;
-
 		private bool _disablePings;
-
 		private bool _enableHttpCompression;
-
 		private bool _enableHttpPipelining = true;
-
 		private TimeSpan? _keepAliveInterval;
-
 		private TimeSpan? _keepAliveTime;
-
 		private TimeSpan? _maxDeadTimeout;
-
 		private int? _maxRetries;
-
 		private TimeSpan? _maxRetryTimeout;
-
 		private Func<Node, bool> _nodePredicate = DefaultNodePredicate;
 		private Action<RequestData> _onRequestDataCreated = DefaultRequestDataCreated;
-
 		private TimeSpan? _pingTimeout;
-
 		private bool _prettyJson;
-
 		private string _proxyAddress;
-
 		private string _proxyPassword;
-
 		private string _proxyUsername;
-
 		private TimeSpan _requestTimeout;
-
 		private Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> _serverCertificateValidationCallback;
-
 		private IReadOnlyCollection<int> _skipDeserializationForStatusCodes = new ReadOnlyCollection<int>(new int[] { });
-
 		private TimeSpan? _sniffLifeSpan;
-
 		private bool _sniffOnConnectionFault;
-
 		private bool _sniffOnStartup;
-
 		private bool _throwExceptions;
-
-		private readonly ElasticsearchUrlFormatter _urlFormatter;
+		private string _uniqueId = Guid.NewGuid().ToString("N");
 
 		protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection connection, IElasticsearchSerializer requestResponseSerializer)
 		{
@@ -147,6 +118,7 @@ protected ConnectionConfiguration(IConnectionPool connectionPool, IConnection co
 			_urlFormatter = new ElasticsearchUrlFormatter(this);
 		}
 
+		string IConnectionConfigurationValues.Id => _uniqueId;
 		protected IElasticsearchSerializer UseThisRequestResponseSerializer { get; set; }
 		BasicAuthenticationCredentials IConnectionConfigurationValues.BasicAuthenticationCredentials => _basicAuthCredentials;
 		SemaphoreSlim IConnectionConfigurationValues.BootstrapLock => _semaphore;
@@ -205,11 +177,11 @@ private static void DefaultRequestDataCreated(RequestData response) { }
 
 		private static bool DefaultNodePredicate(Node node) => true;
 
-		private T Assign<TValue>(TValue value, Action<ConnectionConfiguration<T>, TValue> assigner) => Fluent.Assign((T)this, value, assigner);
+		protected T UpdateId() => Fluent.Assign<T, T, string>((T)this, Guid.NewGuid().ToString("N"), (a, v) => a._uniqueId = v);
+		
+		protected T Assign<TValue>(TValue value, Action<T, TValue> assigner) => Fluent.Assign((T)this, value, assigner).UpdateId();
 
-		/// <summary>
-		/// The default serializer used to serialize documents to and from JSON
-		/// </summary>
+		/// <summary> The default serializer used to serialize documents to and from JSON </summary>
 		protected virtual IElasticsearchSerializer DefaultSerializer(T settings) => new LowLevelRequestResponseSerializer();
 
 		/// <summary>
@@ -225,9 +197,7 @@ public T EnableTcpKeepAlive(TimeSpan keepAliveTime, TimeSpan keepAliveInterval)
 			Assign(keepAliveTime, (a, v) => a._keepAliveTime = v)
 			.Assign(keepAliveInterval, (a, v) => a._keepAliveInterval = v);
 
-		/// <summary>
-		/// The maximum number of retries for a given request,
-		/// </summary>
+		/// <summary> The maximum number of retries for a given request </summary>
 		public T MaximumRetries(int maxRetries) => Assign(maxRetries, (a, v) => a._maxRetries = v);
 
 		/// <summary>
@@ -341,14 +311,10 @@ public T SniffOnConnectionFault(bool sniffsOnConnectionFault = true) =>
 		/// <summary>
 		/// If your connection has to go through proxy, use this method to specify the proxy url
 		/// </summary>
-		public T Proxy(Uri proxyAdress, string username, string password)
-		{
-			proxyAdress.ThrowIfNull(nameof(proxyAdress));
-			_proxyAddress = proxyAdress.ToString();
-			_proxyUsername = username;
-			_proxyPassword = password;
-			return (T)this;
-		}
+		public T Proxy(Uri proxyAdress, string username, string password) =>
+			Assign(proxyAdress.ToString(), (a, v) => a._proxyAddress = v)
+				.Assign(username, (a, v) => a._proxyUsername = v)
+				.Assign(password, (a, v) => a._proxyPassword = v);
 
 		/// <summary>
 		/// Forces all requests to have ?pretty=true querystring parameter appended,
@@ -422,13 +388,7 @@ public T BasicAuthentication(string userName, string password) =>
 		/// verbatim.
 		/// </summary>
 		/// <param name="predicate">Return true if you want the node to be used for API calls</param>
-		public T NodePredicate(Func<Node, bool> predicate)
-		{
-			if (predicate == null) return (T)this;
-
-			_nodePredicate = predicate;
-			return (T)this;
-		}
+		public T NodePredicate(Func<Node, bool> predicate) => Assign(predicate ?? DefaultNodePredicate, (a, v) => a._nodePredicate = predicate);
 
 		/// <summary>
 		/// Turns on settings that aid in debugging like DisableDirectStreaming() and PrettyJson()
@@ -440,22 +400,20 @@ public T NodePredicate(Func<Node, bool> predicate)
 		/// ConnectionSettings. If no callback is passed, DebugInformation from the response
 		/// will be written to the debug output by default.
 		/// </param>
-		public T EnableDebugMode(Action<IApiCallDetails> onRequestCompleted = null)
-		{
-			_disableDirectStreaming = true;
-			PrettyJson(true);
-			IncludeServerStackTraceOnError(true);
-
-			var originalCompletedRequestHandler = _completedRequestHandler;
-			var debugCompletedRequestHandler = onRequestCompleted ?? (d => Debug.WriteLine(d.DebugInformation));
-			_completedRequestHandler = d =>
-			{
-				originalCompletedRequestHandler?.Invoke(d);
-				debugCompletedRequestHandler?.Invoke(d);
-			};
-
-			return (T)this;
-		}
+		public T EnableDebugMode(Action<IApiCallDetails> onRequestCompleted = null) =>
+			PrettyJson()
+				.IncludeServerStackTraceOnError()
+				.DisableDirectStreaming()
+				.Assign(onRequestCompleted, (a, v) =>
+				{
+					var originalCompletedRequestHandler = _completedRequestHandler;
+					var debugCompletedRequestHandler = v ?? (d => Debug.WriteLine(d.DebugInformation));
+					_completedRequestHandler = d =>
+					{
+						originalCompletedRequestHandler?.Invoke(d);
+						debugCompletedRequestHandler.Invoke(d);
+					};
+				});
 
 		/// <summary>
 		/// Register a ServerCertificateValidationCallback, this is called per endpoint until it returns true.

src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs

@@ -9,6 +9,10 @@ namespace Elasticsearch.Net
 {
 	public interface IConnectionConfigurationValues : IDisposable
 	{
+		// TODO: reevaluate for the 7.0.0-beta1
+		/// <summary> A unique id for this connection settings instance </summary>
+		string Id { get; }
+		
 		/// <summary>
 		/// Basic access authorization credentials to specify with all requests.
 		/// </summary>

src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs

@@ -26,12 +26,6 @@ public string Format(string format, object arg, IFormatProvider formatProvider)
 
 		public object GetFormat(Type formatType) => formatType == typeof(ICustomFormatter) ? this : null;
 
-		public string CreateEscapedString(object value)
-		{
-			var r = CreateString(value, _settings);
-			return r.IsNullOrEmpty() ? string.Empty : Uri.EscapeDataString(r);
-		}
-
 		public string CreateString(object value) => CreateString(value, _settings);
 
 		public static string CreateString(object value, IConnectionConfigurationValues settings)