Merge branch 'master' of github.com:elastic/elasticsearch-net

Author: Mpdreamz

src/Elasticsearch.Net/Configuration/ConnectionConfiguration.cs

@@ -123,9 +123,9 @@ public abstract class ConnectionConfiguration<T> : IConnectionConfigurationValue
 		private bool _throwExceptions;
 		bool IConnectionConfigurationValues.ThrowExceptions => _throwExceptions;
 
-		private static void DefaultApiCallHandler(IApiCallDetails status) { }
-		Action<IApiCallDetails> _apiCallHandler = DefaultApiCallHandler;
-		Action<IApiCallDetails> IConnectionConfigurationValues.ApiCallHandler => _apiCallHandler;
+		private static void DefaultCompletedRequestHandler(IApiCallDetails response) { }
+		Action<IApiCallDetails> _completedRequestHandler = DefaultCompletedRequestHandler;
+		Action<IApiCallDetails> IConnectionConfigurationValues.OnRequestCompleted => _completedRequestHandler;
 
 		private readonly NameValueCollection _queryString = new NameValueCollection();
 		NameValueCollection IConnectionConfigurationValues.QueryStringParameters => _queryString;
@@ -290,10 +290,10 @@ public T PrettyJson(bool b = true) => Assign(a =>
 
 		/// <summary>
 		/// Global callback for every response that NEST receives, useful for custom logging.
-		/// Calling this multiple times will register multiple listeners
+		/// Calling this multiple times will register multiple listeners.
 		/// </summary>
-		public T ConnectionStatusHandler(Action<IApiCallDetails> handler) =>
-			Assign(a => a._apiCallHandler += handler ?? DefaultApiCallHandler);
+		public T OnRequestCompleted(Action<IApiCallDetails> handler) =>
+			Assign(a => a._completedRequestHandler += handler ?? DefaultCompletedRequestHandler);
 
 		/// <summary>
 		/// Basic access authentication credentials to specify with all requests.

src/Elasticsearch.Net/Configuration/IConnectionConfigurationValues.cs

@@ -131,7 +131,7 @@ public interface IConnectionConfigurationValues : IDisposable
 		/// <summary>
 		/// Allows you to register a callback every time a an API call is returned
 		/// </summary>
-		Action<IApiCallDetails> ApiCallHandler { get; }
+		Action<IApiCallDetails> OnRequestCompleted { get; }
 
 		/// <summary>
 		/// Basic access authorization credentials to specify with all requests.

src/Elasticsearch.Net/Transport/Transport.cs

@@ -100,6 +100,9 @@ public ElasticsearchResponse<TReturn> Request<TReturn>(HttpMethod method, string
 				}
 				if (response == null || !response.Success)
 					pipeline.BadResponse(ref response, requestData, seenExceptions);
+
+				this.Settings.OnRequestCompleted?.Invoke(response);
+
 				return response;
 			}
 		}
@@ -157,6 +160,9 @@ public async Task<ElasticsearchResponse<TReturn>> RequestAsync<TReturn>(HttpMeth
 				}
 				if (response == null || !response.Success)
 					pipeline.BadResponse(ref response, requestData, seenExceptions);
+
+				this.Settings.OnRequestCompleted?.Invoke(response);
+
 				return response;
 			}
 		}

src/Nest/Mapping/Norms/Norms.cs

@@ -0,0 +1,33 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace Nest
+{
+	[JsonObject(MemberSerialization.OptIn)]
+	[JsonConverter(typeof(ReadAsTypeJsonConverter<Norms>))]
+	public interface INorms
+	{
+		[JsonProperty("enabled")]
+		bool? Enabled { get; set; }
+
+		[JsonProperty("loading")]
+		[JsonConverter(typeof(StringEnumConverter))]
+		NormsLoading? Loading { get; set; }
+	}
+
+	public class Norms : INorms
+	{
+		public bool? Enabled { get; set; }
+		public NormsLoading? Loading { get; set; }
+	}
+
+	public class NormsDescriptor : DescriptorBase<NormsDescriptor, INorms>, INorms
+	{
+		bool? INorms.Enabled { get; set; }
+		NormsLoading? INorms.Loading { get; set; }
+
+		public NormsDescriptor Enabled(bool enabled = true) => Assign(a => a.Enabled = enabled);
+		public NormsDescriptor Loading(NormsLoading loading) => Assign(a => a.Loading = loading);
+	}
+}