Add back the ability to register callbacks and renamed to OnRequestCompleted

Closes #1712

Author: gmarz

Diff for: 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.

Diff for: 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.

Diff for: src/Elasticsearch.Net/Transport/Transport.cs

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

Diff for: src/Tests/ClientConcepts/LowLevel/Connecting.doc.cs

@@ -53,7 +53,7 @@ public void InstantiatingAConnectionPoolClient()
 			var config = new ConnectionConfiguration(connectionPool);
 			var client = new ElasticsearchClient(config);
 		}
-		
+
 		/** 
 		 * Here instead of directly passing `node`, we pass a `SniffingConnectionPool` which will use our `node` to find out the rest of the available cluster nodes.
 		 * Be sure to read more about [Connection Pooling and Cluster Failover here](/elasticsearch-net/cluster-failover.html)
@@ -98,10 +98,10 @@ public void AvailableOptions()
 				*/
 
 				.DisableDirectStreaming()
-				/**
-				 * By default responses are deserialized off stream to the object you tell it to.
-				 * For debugging purposes it can be very useful to keep a copy of the raw response on the result object. 
-				 */;
+				 /**
+				  * By default responses are deserialized off stream to the object you tell it to.
+				  * For debugging purposes it can be very useful to keep a copy of the raw response on the result object. 
+				  */;
 
 			var result = client.Search<SearchResponse<object>>(new { size = 12 });
 			var raw = result.ResponseBodyInBytes;
@@ -116,12 +116,6 @@ public void AvailableOptions()
 			//hide
 			config = config
 				//endhide
-				.ConnectionStatusHandler(s => { })
-				/** 
-				* Allows you to pass a `Action&lt;IElasticsearchResponse&gt;` that can eaves drop every time a response (good or bad) is created. If you have complex logging needs 
-				* this is a good place to add that in.
-				*/
-
 				.GlobalQueryStringParameters(new NameValueCollection())
 				/**
 				* Allows you to set querystring parameters that have to be added to every request. For instance, if you use a hosted elasticserch provider, and you need need to pass an `apiKey` parameter onto every request.
@@ -179,6 +173,23 @@ public void AvailableOptions()
 			*/
 		}
 
+		/** 
+	     * You can pass a callback of type `Action&lt;IApiCallDetails&gt;` that can eaves drop every time a response (good or bad) is created. 
+		 * If you have complex logging needs this is a good place to add that in.
+		*/
+		[U]public void OnRequestCompletedIsCalled()
+		{
+			var counter = 0;
+			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
+			var settings = new ConnectionSettings(connectionPool, new InMemoryConnection())
+				.OnRequestCompleted(r => counter++);
+			var client = new ElasticClient(settings);
+			client.RootNodeInfo();
+			counter.Should().Be(1);
+			client.RootNodeInfoAsync();
+			counter.Should().Be(2);
+		}
+
 		public void ConfiguringSSL()
 		{
 			/**
@@ -209,7 +220,7 @@ public void ConfiguringSSL()
 		public class MyJsonNetSerializer : JsonNetSerializer
 		{
 			public MyJsonNetSerializer(IConnectionSettingsValues settings) : base(settings) { }
-			
+
 
 			/** 
 			* Override ModifyJsonSerializerSettings if you need access to `JsonSerializerSettings`
@@ -223,15 +234,16 @@ public MyJsonNetSerializer(IConnectionSettingsValues settings) : base(settings)
 			*/
 			protected override IList<Func<Type, JsonConverter>> ContractConverters => new List<Func<Type, JsonConverter>>();
 		}
-		
+
 		/**
 		* You can then register a factory on ConnectionSettings to create an instance of your subclass instead. 
 		* This is called once per instance of ConnectionSettings.
 		*/
-		[U] public void ModifyJsonSerializerSettingsIsCalled()
+		[U]
+		public void ModifyJsonSerializerSettingsIsCalled()
 		{
 			var connectionPool = new SingleNodeConnectionPool(new Uri("http://localhost:9200"));
-			var settings = new ConnectionSettings(connectionPool, new InMemoryConnection(),s => new MyJsonNetSerializer(s));
+			var settings = new ConnectionSettings(connectionPool, new InMemoryConnection(), s => new MyJsonNetSerializer(s));
 			var client = new ElasticClient(settings);
 			client.RootNodeInfo();
 			client.RootNodeInfo();

Diff for: src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: i
+mode: u
 # 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