Use DeserializationState to deserialize Ping response

Author: gmarz

src/Nest/Domain/Responses/PingResponse.cs

@@ -1,4 +1,5 @@
-using Newtonsoft.Json;
+using Elasticsearch.Net;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -13,5 +14,9 @@ public interface IPingResponse : IResponse
 	[JsonObject]
 	public class PingResponse : BaseResponse, IPingResponse
 	{
+		public PingResponse(IElasticsearchResponse response)
+		{
+			this.IsValid = response.Success && response.HttpStatusCode == 200;
+		}
 	}
 }

src/Nest/ElasticClient-Ping.cs

@@ -1,12 +1,15 @@
 using Elasticsearch.Net;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Nest
 {
+	using PingConverter = Func<IElasticsearchResponse, Stream, PingResponse>;
+
 	public partial class ElasticClient
 	{
 		/// <inheritdoc />
@@ -15,7 +18,9 @@ public IPingResponse Ping(Func<PingDescriptor, PingDescriptor> pingSelector = nu
 			pingSelector = pingSelector ?? (s => s);
 			return this.Dispatch<PingDescriptor, PingRequestParameters, PingResponse>(
 				pingSelector,
-				(p, d) => this.RawDispatch.PingDispatch<PingResponse>(p)
+				(p, d) => this.RawDispatch.PingDispatch<PingResponse>(
+					p.DeserializationState(new PingConverter(DeserializePingResponse))
+				)
 			);
 		}
 
@@ -25,7 +30,9 @@ public Task<IPingResponse> PingAsync(Func<PingDescriptor, PingDescriptor> pingSe
 			pingSelector = pingSelector ?? (s => s);
 			return this.DispatchAsync<PingDescriptor, PingRequestParameters, PingResponse, IPingResponse>(
 				pingSelector,
-				(p, d) => this.RawDispatch.PingDispatchAsync<PingResponse>(p)
+				(p, d) => this.RawDispatch.PingDispatchAsync<PingResponse>(
+					p.DeserializationState(new PingConverter(DeserializePingResponse))
+				)
 			);
 		}
 
@@ -34,7 +41,9 @@ public IPingResponse Ping(IPingRequest pingRequest)
 		{
 			return this.Dispatch<IPingRequest, PingRequestParameters, PingResponse>(
 				pingRequest,
-				(p, d) => this.RawDispatch.PingDispatch<PingResponse>(p)
+				(p, d) => this.RawDispatch.PingDispatch<PingResponse>(
+					p.DeserializationState(new PingConverter(DeserializePingResponse))
+				)
 			);
 		}
 
@@ -43,8 +52,15 @@ public Task<IPingResponse> PingAsync(IPingRequest pingRequest)
 		{
 			return this.DispatchAsync<IPingRequest, PingRequestParameters, PingResponse, IPingResponse>(
 				pingRequest,
-				(p, d) => this.RawDispatch.PingDispatchAsync<PingResponse>(p)
+				(p, d) => this.RawDispatch.PingDispatchAsync<PingResponse>(
+					p.DeserializationState(new PingConverter(DeserializePingResponse))
+				)
 			);
 		}
+
+		private PingResponse DeserializePingResponse(IElasticsearchResponse response, Stream stream)
+		{
+			return new PingResponse(response);
+		}
 	}
 }

src/Nest/ElasticClient.cs

@@ -95,12 +95,6 @@ D descriptor
 
 			if (c.Success || statusCodeAllowed)
 			{
-				if (c.Response == null)
-				{
-					var bodilessResponse = CreateBodilessInstance<R>(c);
-					return bodilessResponse;
-				}
-
 				c.Response.IsValid = true;
 				return c.Response;
 			}
@@ -115,14 +109,6 @@ private static R CreateInvalidInstance<R>(IElasticsearchResponse response) where
 			return r;
 		}
 
-		private static R CreateBodilessInstance<R>(IElasticsearchResponse response) where R : BaseResponse
-		{
-			var r = (R)typeof(R).CreateInstance();
-			((IResponseWithRequestInformation)r).RequestInformation = response;
-			r.IsValid = true;
-			return r;
-		}
-
 		internal Task<I> DispatchAsync<D, Q, R, I>(
 			Func<D, D> selector
 			, Func<ElasticsearchPathInfo<Q>, D, Task<ElasticsearchResponse<R>>> dispatch