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: Mpdreamz

src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs

@@ -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/IConnectionConfigurationValues.cs

@@ -9,6 +9,9 @@ namespace Elasticsearch.Net
 {
 	public interface IConnectionConfigurationValues : IDisposable
 	{
+		/// <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/Extensions/Fluent.cs

@@ -4,14 +4,6 @@ namespace Elasticsearch.Net
 {
 	internal static class Fluent
 	{
-		[Obsolete("Use the overload that accepts TValue")]
-		internal static TDescriptor Assign<TDescriptor, TInterface>(TDescriptor self, Action<TInterface> assign)
-			where TDescriptor : class, TInterface
-		{
-			assign(self);
-			return self;
-		}
-
 		internal static TDescriptor Assign<TDescriptor, TInterface, TValue>(TDescriptor self, TValue value, Action<TInterface, TValue> assign)
 			where TDescriptor : class, TInterface
 		{

src/Nest/CommonAbstractions/ConnectionSettings/ConnectionSettingsBase.cs

@@ -73,10 +73,6 @@ public abstract class ConnectionSettingsBase<TConnectionSettings> : ConnectionCo
 		private Func<string, string> _defaultFieldNameInferrer;
 		private string _defaultIndex;
 
-		private string _defaultTypeName;
-
-		private Func<Type, string> _defaultTypeNameInferrer;
-
 		private HashSet<Type> _disableIdInference = new HashSet<Type>();
 		private bool _defaultDisableAllInference;
 
@@ -96,22 +92,17 @@ IPropertyMappingProvider propertyMappingProvider
 			var serializerAsMappingProvider = _sourceSerializer as IPropertyMappingProvider;
 			_propertyMappingProvider = propertyMappingProvider ?? serializerAsMappingProvider ?? new PropertyMappingProvider();
 
-			_defaultTypeNameInferrer = t => !_defaultTypeName.IsNullOrEmpty() ? _defaultTypeName : t.Name.ToLowerInvariant();
 			_defaultFieldNameInferrer = p => p.ToCamelCase();
 			_defaultIndices = new FluentDictionary<Type, string>();
 			_defaultTypeNames = new FluentDictionary<Type, string>();
 			_defaultRelationNames = new FluentDictionary<Type, string>();
-
 			_inferrer = new Inferrer(this);
 		}
 
 		Func<string, string> IConnectionSettingsValues.DefaultFieldNameInferrer => _defaultFieldNameInferrer;
 		string IConnectionSettingsValues.DefaultIndex => _defaultIndex;
 		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultIndices => _defaultIndices;
 		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultRelationNames => _defaultRelationNames;
-		string IConnectionSettingsValues.DefaultTypeName => _defaultTypeName;
-		Func<Type, string> IConnectionSettingsValues.DefaultTypeNameInferrer => _defaultTypeNameInferrer;
-		FluentDictionary<Type, string> IConnectionSettingsValues.DefaultTypeNames => _defaultTypeNames;
 		FluentDictionary<Type, string> IConnectionSettingsValues.IdProperties => _idProperties;
 		Inferrer IConnectionSettingsValues.Inferrer => _inferrer;
 		IPropertyMappingProvider IConnectionSettingsValues.PropertyMappingProvider => _propertyMappingProvider;
@@ -122,40 +113,14 @@ IPropertyMappingProvider propertyMappingProvider
 		bool IConnectionSettingsValues.DefaultDisableIdInference => _defaultDisableAllInference;
 
 		/// <inheritdoc cref="IConnectionSettingsValues.DefaultIndex"/>
-		public TConnectionSettings DefaultIndex(string defaultIndex)
-		{
-			_defaultIndex = defaultIndex;
-			return (TConnectionSettings)this;
-		}
-
-		/// <inheritdoc cref="IConnectionSettingsValues.DefaultTypeName"/>
-		public TConnectionSettings DefaultTypeName(string defaultTypeName)
-		{
-			_defaultTypeName = defaultTypeName;
-			return (TConnectionSettings)this;
-		}
+		public TConnectionSettings DefaultIndex(string defaultIndex) => Assign(defaultIndex, (a, v) => a._defaultIndex = v);
 
 		/// <inheritdoc cref="IConnectionSettingsValues.DefaultFieldNameInferrer"/>
-		public TConnectionSettings DefaultFieldNameInferrer(Func<string, string> fieldNameInferrer)
-		{
-			_defaultFieldNameInferrer = fieldNameInferrer;
-			return (TConnectionSettings)this;
-		}
+		public TConnectionSettings DefaultFieldNameInferrer(Func<string, string> fieldNameInferrer) => 
+			Assign(fieldNameInferrer, (a, v) => a._defaultFieldNameInferrer = v);
 
 		/// <inheritdoc cref="IConnectionSettingsValues.DisableIdInference"/>
-		public TConnectionSettings DefaultDisableIdInference(bool disable = true)
-		{
-			_defaultDisableAllInference = disable;
-			return (TConnectionSettings)this;
-		}
-
-		/// <inheritdoc cref="IConnectionSettingsValues.DefaultTypeNameInferrer"/>
-		public TConnectionSettings DefaultTypeNameInferrer(Func<Type, string> typeNameInferrer)
-		{
-			typeNameInferrer.ThrowIfNull(nameof(typeNameInferrer));
-			_defaultTypeNameInferrer = typeNameInferrer;
-			return (TConnectionSettings)this;
-		}
+		public TConnectionSettings DefaultDisableIdInference(bool disable = true) => Assign(disable, (a, v) => a._defaultDisableAllInference = v);
 
 		/// <inheritdoc cref="IConnectionSettingsValues.IdProperties"/>
 		private void MapIdPropertyFor<TDocument>(Expression<Func<TDocument, object>> objectPath)
@@ -247,7 +212,7 @@ private void ApplyPropertyMappings<TDocument>(IList<IClrPropertyMapping<TDocumen
 		[Obsolete("Please use " + nameof(DefaultMappingFor))]
 		public TConnectionSettings InferMappingFor<TDocument>(Func<ClrTypeMappingDescriptor<TDocument>, IClrTypeMapping<TDocument>> selector)
 			where TDocument : class =>
-			DefaultMappingFor<TDocument>(selector);
+			DefaultMappingFor(selector);
 
 		/// <inheritdoc cref="InferMappingFor{TDocument}"/>
 		public TConnectionSettings DefaultMappingFor<TDocument>(Func<ClrTypeMappingDescriptor<TDocument>, IClrTypeMapping<TDocument>> selector)
@@ -266,19 +231,19 @@ public TConnectionSettings DefaultMappingFor<TDocument>(Func<ClrTypeMappingDescr
 			if (!string.IsNullOrWhiteSpace(inferMapping.IdPropertyName))
 				_idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
 
-			if (inferMapping.IdProperty != null)
-				MapIdPropertyFor<TDocument>(inferMapping.IdProperty);
+			if (inferMapping.IdProperty != null) 
+				MapIdPropertyFor(inferMapping.IdProperty);
 
 			if (inferMapping.RoutingProperty != null)
-				MapRoutePropertyFor<TDocument>(inferMapping.RoutingProperty);
+				MapRoutePropertyFor(inferMapping.RoutingProperty);
 
 			if (inferMapping.Properties != null)
-				ApplyPropertyMappings<TDocument>(inferMapping.Properties);
+				ApplyPropertyMappings(inferMapping.Properties);
 
 			if (inferMapping.DisableIdInference) _disableIdInference.Add(inferMapping.ClrType);
 			else _disableIdInference.Remove(inferMapping.ClrType);
 
-			return (TConnectionSettings)this;
+			return UpdateId();
 		}
 
 		/// <summary>
@@ -300,13 +265,13 @@ public TConnectionSettings DefaultMappingFor(Type documentType, Func<ClrTypeMapp
 			if (!string.IsNullOrWhiteSpace(inferMapping.IdPropertyName))
 				_idProperties[inferMapping.ClrType] = inferMapping.IdPropertyName;
 
-			return (TConnectionSettings)this;
+			return UpdateId();
 		}
 
 		/// <inheritdoc cref="DefaultMappingFor(Type, Func{ClrTypeMappingDescriptor,IClrTypeMapping})"/>
 		public TConnectionSettings DefaultMappingFor(IEnumerable<IClrTypeMapping> typeMappings)
 		{
-			if (typeMappings == null) return (TConnectionSettings)this;
+			if (typeMappings == null) return UpdateId();
 
 			foreach (var inferMapping in typeMappings)
 			{
@@ -320,7 +285,7 @@ public TConnectionSettings DefaultMappingFor(IEnumerable<IClrTypeMapping> typeMa
 					_defaultRelationNames.Add(inferMapping.ClrType, inferMapping.RelationName);
 			}
 
-			return (TConnectionSettings)this;
+			return UpdateId();
 		}
 	}
 }

src/Nest/CommonAbstractions/ConnectionSettings/IConnectionSettingsValues.cs

@@ -36,21 +36,6 @@ public interface IConnectionSettingsValues : IConnectionConfigurationValues
 		/// </summary>
 		FluentDictionary<Type, string> DefaultRelationNames { get; }
 
-		/// <summary>
-		/// A default type name to use within Elasticsearch for all CLR types. If <see cref="DefaultTypeNameInferrer" /> is also set, a configured
-		/// default type name will only be used when <see cref="DefaultTypeNameInferrer" />returns null or empty. If unset, the default type
-		/// name for types will be the lowercased CLR type name.
-		/// </summary>
-		string DefaultTypeName { get; }
-
-		/// <summary>
-		/// Specify how a type name is inferred from a CLR type.
-		/// By default, a type names is inferred by calling <see cref="string.ToLowerInvariant" /> on the CLR type's name.
-		/// </summary>
-		Func<Type, string> DefaultTypeNameInferrer { get; }
-
-		FluentDictionary<Type, string> DefaultTypeNames { get; }
-
 		/// <summary>
 		/// Specify a property for a CLR type to use to infer the _id of the document when indexed in Elasticsearch.
 		/// </summary>

src/Nest/CommonAbstractions/Infer/RelationName/RelationNameResolver.cs

@@ -37,7 +37,7 @@ private string ResolveType(Type type)
 			if (att != null && !att.RelationName.IsNullOrEmpty())
 				typeName = att.RelationName;
 			else
-				typeName = _connectionSettings.DefaultTypeNameInferrer(type);
+				typeName = type.Name.ToLowerInvariant();
 
 			RelationNames.TryAdd(type, typeName);
 			return typeName;