fix #657 fix #662 fix #655 some integration tests we're ignored which caused me to miss that the serializer simplification commits broke quite a few integration tests

Mpdreamz · Mpdreamz · commit 12fc3ced0c9a · 2014-05-14T17:37:43.000+02:00
diff --git a/src/Elasticsearch.Net/Domain/ElasticsearchResponse.cs b/src/Elasticsearch.Net/Domain/ElasticsearchResponse.cs
@@ -40,7 +40,7 @@ internal static ElasticsearchResponse<DynamicDictionary> Wrap(ElasticsearchRespo
 
 		public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse from, TTo to)
 		{
-			return new ElasticsearchResponse<TTo>(from.Settings)
+			var response = new ElasticsearchResponse<TTo>(from.Settings)
 			{
 				OriginalException = from.OriginalException,
 				HttpStatusCode = from.HttpStatusCode,
@@ -52,8 +52,11 @@ public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse f
 				Serializer = from.Settings.Serializer,
 				Settings = from.Settings,
 				Success = from.Success
-
 			};
+			var tt = to as IResponseWithRequestInformation;
+			if (tt != null)
+				tt.RequestInformation = response;
+ 			return response;
 		}
 
 		private static ElasticsearchResponse<DynamicDictionary> ToDynamicResponse(ElasticsearchResponse<Dictionary<string, object>> response)
diff --git a/src/Elasticsearch.Net/Domain/FluentRequestParameters.cs b/src/Elasticsearch.Net/Domain/FluentRequestParameters.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using Elasticsearch.Net.Connection;
@@ -36,9 +37,9 @@ public T RequestConfiguration(Func<RequestConfiguration, RequestConfiguration> s
 			return (T)this;
 		}
 		
-		public T DeserializationState(object deserializationState)
+		public T DeserializationState(object customObjectCreator)
 		{
-			_DeserializationState = deserializationState;
+			_DeserializationState = customObjectCreator;
 			return (T)this;
 		}
 
diff --git a/src/Nest/DSL/DocumentExistsDescriptor.cs b/src/Nest/DSL/DocumentExistsDescriptor.cs
@@ -13,13 +13,15 @@
 namespace Nest
 {
 	[DescriptorFor("Exists")]
-	public partial class IndexDescriptor<T> : DocumentPathDescriptorBase<IndexDescriptor<T>, T, IndexRequestParameters>
+	public partial class IndexDescriptor<T> : DocumentOptionalPathDescriptorBase<IndexDescriptor<T>, T, IndexRequestParameters>
 		, IPathInfo<IndexRequestParameters>
 		where T : class
 	{
 		ElasticsearchPathInfo<IndexRequestParameters> IPathInfo<IndexRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)
 		{
 			var pathInfo = base.ToPathInfo(settings, this._QueryString);
+			pathInfo.Index.ThrowIfNull("index");
+			pathInfo.Type.ThrowIfNull("type");
 			pathInfo.HttpMethod = this._Id.IsNullOrEmpty() ? PathInfoHttpMethod.POST : PathInfoHttpMethod.PUT;
 			return pathInfo;
 		}
diff --git a/src/Nest/Domain/Paths/ElasticSearchPathInfo.cs b/src/Nest/Domain/Paths/ElasticSearchPathInfo.cs
@@ -1,4 +1,6 @@
-﻿using Elasticsearch.Net;
+﻿using System;
+using System.IO;
+using Elasticsearch.Net;
 
 namespace Nest
 {
@@ -27,9 +29,9 @@ public ElasticsearchPathInfo()
 			this.RequestParameters = new T();
 		}
 
-		public ElasticsearchPathInfo<T> DeserializationState(object deserializationState)
+		public ElasticsearchPathInfo<T> DeserializationState(object customObjectCreation)
 		{
-			this.RequestParameters.DeserializationState(deserializationState);
+			this.RequestParameters.DeserializationState(customObjectCreation);
 			return this;
 		}
 	}
diff --git a/src/Nest/Domain/Responses/BaseResponse.cs b/src/Nest/Domain/Responses/BaseResponse.cs
@@ -2,6 +2,7 @@
 using System.Globalization;
 using System.Linq;
 using Elasticsearch.Net;
+using Elasticsearch.Net.Connection;
 using Nest.Resolvers;
 
 namespace Nest
@@ -11,6 +12,8 @@ public interface IResponse : IResponseWithRequestInformation
 		bool IsValid { get; }
 		IElasticsearchResponse ConnectionStatus { get; }
 		ElasticInferrer Infer { get; }
+
+		ElasticsearchServerError GetServerException();
 	}
 		
 	public class BaseResponse : IResponse
@@ -25,6 +28,21 @@ public BaseResponse()
 
 		public IElasticsearchResponse ConnectionStatus { get { return ((IResponseWithRequestInformation)this).RequestInformation;  } }
 		
+		public ElasticsearchServerError GetServerException()
+		{
+			if (this.IsValid || this.ConnectionStatus == null || this.ConnectionStatus.OriginalException == null)
+				return null;
+			var e = this.ConnectionStatus.OriginalException as ElasticsearchServerException;
+			if (e == null)
+				return null;
+			return new ElasticsearchServerError
+			{
+				Status = e.Status,
+				Error = e.Message,
+				ExceptionType = e.ExceptionType
+			};
+		}
+
 		public ElasticInferrer _infer;
 		
 		protected IConnectionSettingsValues Settings
diff --git a/src/Nest/Domain/Responses/MultiSearchResponse.cs b/src/Nest/Domain/Responses/MultiSearchResponse.cs
@@ -21,12 +21,17 @@ public MultiSearchResponse()
 
 		public IEnumerable<SearchResponse<T>> GetResponses<T>() where T : class
 		{
+			foreach (var r in this._Responses.Values.OfType<IResponseWithRequestInformation>())
+				r.RequestInformation = this.ConnectionStatus;
 			return this._Responses.Values.OfType<SearchResponse<T>>();
 		}
 		public SearchResponse<T> GetResponse<T>(string name) where T : class
 		{
 			object response = null;
 			this._Responses.TryGetValue(name, out response);
+			var r = response as IResponseWithRequestInformation;
+			if (r != null)
+				r.RequestInformation = this.ConnectionStatus;
 			return response as SearchResponse<T>;
 		}
 	}
diff --git a/src/Nest/ElasticClient-MultiGet.cs b/src/Nest/ElasticClient-MultiGet.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Elasticsearch.Net;
@@ -8,6 +9,8 @@
 
 namespace Nest
 {
+	using MultiGetConverter = Func<IElasticsearchResponse, Stream, MultiGetResponse>;
+	
 	public partial class ElasticClient
 	{
 		/// <inheritdoc />
@@ -16,9 +19,10 @@ public IMultiGetResponse MultiGet(Func<MultiGetDescriptor, MultiGetDescriptor> m
 			multiGetSelector.ThrowIfNull("multiGetSelector");
 			var descriptor = multiGetSelector(new MultiGetDescriptor(_connectionSettings));
 			var converter = CreateCovariantMultiGetConverter(descriptor);
+			var customCreator = new MultiGetConverter((r, s) => this.DeserializeMultiGetResponse(r, s, converter));
 			return this.Dispatch<MultiGetDescriptor, MultiGetRequestParameters, MultiGetResponse>(
 				descriptor,
-				(p, d) => this.RawDispatch.MgetDispatch<MultiGetResponse>(p.DeserializationState(converter), d)
+				(p, d) => this.RawDispatch.MgetDispatch<MultiGetResponse>(p.DeserializationState(customCreator), d)
 			);
 		}
 
@@ -28,12 +32,16 @@ public Task<IMultiGetResponse> MultiGetAsync(Func<MultiGetDescriptor, MultiGetDe
 			multiGetSelector.ThrowIfNull("multiGetSelector");
 			var descriptor = multiGetSelector(new MultiGetDescriptor(_connectionSettings));
 			var converter = CreateCovariantMultiGetConverter(descriptor);
+			var customCreator = new MultiGetConverter((r, s) => this.DeserializeMultiGetResponse(r, s, converter));
 			return this.DispatchAsync<MultiGetDescriptor, MultiGetRequestParameters, MultiGetResponse, IMultiGetResponse>(
 				descriptor,
-				(p, d) => this.RawDispatch.MgetDispatchAsync<MultiGetResponse>(p.DeserializationState(converter), d)
+				(p, d) => this.RawDispatch.MgetDispatchAsync<MultiGetResponse>(p.DeserializationState(customCreator), d)
 			);
 		}
-
+		private MultiGetResponse DeserializeMultiGetResponse(IElasticsearchResponse response, Stream stream, JsonConverter converter)
+		{
+			return this.Serializer.DeserializeInternal<MultiGetResponse>(stream, converter);
+		}
 		private JsonConverter CreateCovariantMultiGetConverter(MultiGetDescriptor descriptor)
 		{
 			var multiGetHitConverter = new MultiGetHitConverter(descriptor);
diff --git a/src/Nest/ElasticClient-MultiSearch.cs b/src/Nest/ElasticClient-MultiSearch.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,6 +10,8 @@
 
 namespace Nest
 {
+	using MultiSearchCreator = Func<IElasticsearchResponse, Stream, MultiSearchResponse>;
+
 	public partial class ElasticClient
 	{
 		/// <inheritdoc />
@@ -18,9 +21,10 @@ public IMultiSearchResponse MultiSearch(Func<MultiSearchDescriptor, MultiSearchD
 				multiSearchSelector,
 				(p, d) =>
 				{
-					string json = Serializer.SerializeMultiSearch(d);
-					JsonConverter converter = CreateMultiSearchConverter(d);
-					return this.RawDispatch.MsearchDispatch<MultiSearchResponse>(p.DeserializationState(converter), json);
+					var json = Serializer.SerializeMultiSearch(d);
+					var converter = CreateMultiSearchConverter(d);
+					var creator = new MultiSearchCreator((r, s) => this.DeserializeMultiSearchHit(r, s, converter));
+					return this.RawDispatch.MsearchDispatch<MultiSearchResponse>(p.DeserializationState(creator), json);
 				}
 			);
 		}
@@ -33,13 +37,17 @@ public Task<IMultiSearchResponse> MultiSearchAsync(
 				multiSearchSelector,
 				(p, d) =>
 				{
-					string json = Serializer.SerializeMultiSearch(d);
-					JsonConverter converter = CreateMultiSearchConverter(d);
-					return this.RawDispatch.MsearchDispatchAsync<MultiSearchResponse>(p.DeserializationState(converter), json);
+					var json = Serializer.SerializeMultiSearch(d);
+					var converter = CreateMultiSearchConverter(d);
+					var creator = new MultiSearchCreator((r, s) => this.DeserializeMultiSearchHit(r, s, converter));
+					return this.RawDispatch.MsearchDispatchAsync<MultiSearchResponse>(p.DeserializationState(creator), json);
 				}
 			);
 		}
-
+		private MultiSearchResponse DeserializeMultiSearchHit(IElasticsearchResponse response, Stream stream, JsonConverter converter)
+		{
+			return this.Serializer.DeserializeInternal<MultiSearchResponse>(stream, converter);
+		}
 		private JsonConverter CreateMultiSearchConverter(MultiSearchDescriptor descriptor)
 		{
 			var multiSearchConverter = new MultiSearchConverter(_connectionSettings, descriptor);
diff --git a/src/Nest/ElasticClient.cs b/src/Nest/ElasticClient.cs
@@ -95,7 +95,7 @@ D descriptor
 		{
 			var config = descriptor.RequestConfiguration as IRequestConfiguration;
 			var statusCodeAllowed = config != null && config.AllowedStatusCodes.HasAny(i => i == c.HttpStatusCode);
-
+			
 			if (c.Success || statusCodeAllowed)
 			{
 				c.Response.IsValid = true;
@@ -106,6 +106,13 @@ D descriptor
 		}
 
 
+		private static R CreateValidInstance<R>(IElasticsearchResponse response) where R : BaseResponse
+		{
+			var r = (R)typeof(R).CreateInstance();
+			((IResponseWithRequestInformation)r).RequestInformation = response;
+			r.IsValid = true;
+			return r;
+		}
 		private static R CreateInvalidInstance<R>(IElasticsearchResponse response) where R : BaseResponse
 		{
 			var r = (R)typeof(R).CreateInstance();
diff --git a/src/Nest/Resolvers/Converters/MultiSearchConverter.cs b/src/Nest/Resolvers/Converters/MultiSearchConverter.cs
@@ -78,7 +78,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 				if (realConverter == null)
 					return new MultiSearchResponse { IsValid = false };
 
-				return realConverter.ReadJson(reader, objectType, existingValue, serializer);
+				var mr = realConverter.ReadJson(reader, objectType, existingValue, serializer) as MultiSearchResponse;
+				return mr;
 			}
 
 
@@ -139,9 +140,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 					}
 				}
 				generic.Invoke(null, new object[] { m, serializer, response._Responses, this._settings });
-				
 			}
-
+			
 			return response;
 		}
 
diff --git a/src/Nest/Resolvers/ElasticContractResolver.cs b/src/Nest/Resolvers/ElasticContractResolver.cs
@@ -63,7 +63,7 @@ protected override JsonContract CreateContract(Type objectType)
 
 			if (typeof(IHit<object>).IsAssignableFrom(objectType))
 				contract.Converter = new DefaultHitConverter();
-			
+
 			if (objectType == typeof(MultiGetResponse))
 				contract.Converter = new MultiGetHitConverter();
 
diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs
@@ -31,7 +31,6 @@ public void GetMultiSimple()
 
 			objects.Should().NotBeNull().And.HaveCount(2);
 
-
 			var person = result.Source<Person>(NestTestData.People[1].Id);
 			person.Should().NotBeNull();
 			person.FirstName.Should().NotBeNullOrEmpty();
diff --git a/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs b/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs
@@ -1,4 +1,5 @@
 ﻿using Elasticsearch.Net;
+using FluentAssertions;
 using Nest.Tests.MockData.Domain;
 using NUnit.Framework;
 
@@ -41,9 +42,12 @@ public void CloseAndSearchAndOpenIndex()
 			Assert.IsNotNull(results.ConnectionStatus);
 			var statusCode = results.ConnectionStatus.HttpStatusCode;
 			Assert.AreEqual(statusCode, 403);
-			var result = results.ConnectionStatus.ResponseRaw.Utf8String();
-			Assert.True(result.Contains("ClusterBlockException"));
-			Assert.True(result.Contains("index closed"));
+
+			var error = results.GetServerException();
+			error.Should().NotBeNull();
+			error.ExceptionType.Should().Be("ClusterBlockException");
+			error.Error.Should().Contain("index closed");
+
 			r = this._client.OpenIndex(ElasticsearchConfiguration.DefaultIndex);
 			Assert.True(r.Acknowledged);
 			Assert.True(r.IsValid);
diff --git a/src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs b/src/Tests/Nest.Tests.Integration/Reproduce/ReproduceConnectionStallsTests.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using Nest.Tests.MockData;
 using Nest.Tests.MockData.Domain;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using System.Diagnostics;
 using FluentAssertions;
@@ -42,6 +43,7 @@ public ReproduceConnectionStallsTests()
 
 
 		[Test]
+		[Ignore]
 		public void SearchShouldNotHaveBlips()
 		{
 			//Search once so that caches are sure to exist.
diff --git a/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs b/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs
@@ -24,8 +24,8 @@ public void MatchAll()
 			);
 			Assert.NotNull(results);
 			Assert.True(results.IsValid);
-			Assert.NotNull(results.Documents);
-			Assert.GreaterOrEqual(results.Documents.Count(), 10);
+			Assert.NotNull(results.FieldSelections);
+			Assert.GreaterOrEqual(results.FieldSelections.Count(), 10);
 
 		}
 		[Test]
@@ -60,8 +60,8 @@ public void TestTermQuery()
 			);
 			Assert.NotNull(results);
 			Assert.True(results.IsValid);
-			Assert.NotNull(results.Documents);
-			Assert.GreaterOrEqual(results.Documents.Count(), 1);
+			Assert.NotNull(results.FieldSelections);
+			Assert.GreaterOrEqual(results.FieldSelections.Count(), 1);
 		}
 		[Test]
 		public void TestWildcardQuery()
@@ -78,8 +78,8 @@ public void TestWildcardQuery()
 			);
 			Assert.NotNull(results);
 			Assert.True(results.IsValid);
-			Assert.NotNull(results.Documents);
-			Assert.GreaterOrEqual(results.Documents.Count(), 1);
+			Assert.NotNull(results.FieldSelections);
+			Assert.GreaterOrEqual(results.FieldSelections.Count(), 1);
 		}
 		[Test]
 		public void TestWildcardQueryBoostAndRewrite()
@@ -96,8 +96,8 @@ public void TestWildcardQueryBoostAndRewrite()
 			);
 			Assert.NotNull(results);
 			Assert.True(results.IsValid);
-			Assert.NotNull(results.Documents);
-			Assert.GreaterOrEqual(results.Documents.Count(), 1);
+			Assert.NotNull(results.FieldSelections);
+			Assert.GreaterOrEqual(results.FieldSelections.Count(), 1);
 		}
 		[Test]
 		public void TestPrefixQuery()
@@ -114,8 +114,8 @@ public void TestPrefixQuery()
 			);
 			Assert.NotNull(results);
 			Assert.True(results.IsValid);
-			Assert.NotNull(results.Documents);
-			Assert.GreaterOrEqual(results.Documents.Count(), 1);
+			Assert.NotNull(results.FieldSelections);
+			Assert.GreaterOrEqual(results.FieldSelections.Count(), 1);
 		}
 		[Test]
 		public void TestTermFacet()
diff --git a/src/Tests/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs b/src/Tests/Nest.Tests.Integration/Search/Scroll/ScrollTests.cs
diff --git a/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeScanTests.cs b/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeScanTests.cs
diff --git a/src/Tests/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs b/src/Tests/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ internal static ElasticsearchResponse<DynamicDictionary> Wrap(ElasticsearchRespo`
`40`	`40`
`41`	`41`	`public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse from, TTo to)`
`42`	`42`	`{`
`43`		`- return new ElasticsearchResponse<TTo>(from.Settings)`
	`43`	`+ var response = new ElasticsearchResponse<TTo>(from.Settings)`
`44`	`44`	`{`
`45`	`45`	`OriginalException = from.OriginalException,`
`46`	`46`	`HttpStatusCode = from.HttpStatusCode,`
`@@ -52,8 +52,11 @@ public static ElasticsearchResponse<TTo> CloneFrom<TTo>(IElasticsearchResponse f`
`52`	`52`	`Serializer = from.Settings.Serializer,`
`53`	`53`	`Settings = from.Settings,`
`54`	`54`	`Success = from.Success`
`55`		`-`
`56`	`55`	`};`
	`56`	`+ var tt = to as IResponseWithRequestInformation;`
	`57`	`+ if (tt != null)`
	`58`	`+ tt.RequestInformation = response;`
	`59`	`+ return response;`
`57`	`60`	`}`
`58`	`61`
`59`	`62`	`private static ElasticsearchResponse<DynamicDictionary> ToDynamicResponse(ElasticsearchResponse<Dictionary<string, object>> response)`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using System.IO;`
`3`	`4`	`using System.Linq;`
`4`	`5`	`using System.Text;`
`5`	`6`	`using Elasticsearch.Net.Connection;`
`@@ -36,9 +37,9 @@ public T RequestConfiguration(Func<RequestConfiguration, RequestConfiguration> s`
`36`	`37`	`return (T)this;`
`37`	`38`	`}`
`38`	`39`
`39`		`- public T DeserializationState(object deserializationState)`
	`40`	`+ public T DeserializationState(object customObjectCreator)`
`40`	`41`	`{`
`41`		`- _DeserializationState = deserializationState;`
	`42`	`+ _DeserializationState = customObjectCreator;`
`42`	`43`	`return (T)this;`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,15 @@`
`13`	`13`	`namespace Nest`
`14`	`14`	`{`
`15`	`15`	`[DescriptorFor("Exists")]`
`16`		`- public partial class IndexDescriptor<T> : DocumentPathDescriptorBase<IndexDescriptor<T>, T, IndexRequestParameters>`
	`16`	`+ public partial class IndexDescriptor<T> : DocumentOptionalPathDescriptorBase<IndexDescriptor<T>, T, IndexRequestParameters>`
`17`	`17`	`, IPathInfo<IndexRequestParameters>`
`18`	`18`	`where T : class`
`19`	`19`	`{`
`20`	`20`	`ElasticsearchPathInfo<IndexRequestParameters> IPathInfo<IndexRequestParameters>.ToPathInfo(IConnectionSettingsValues settings)`
`21`	`21`	`{`
`22`	`22`	`var pathInfo = base.ToPathInfo(settings, this._QueryString);`
	`23`	`+ pathInfo.Index.ThrowIfNull("index");`
	`24`	`+ pathInfo.Type.ThrowIfNull("type");`
`23`	`25`	`pathInfo.HttpMethod = this._Id.IsNullOrEmpty() ? PathInfoHttpMethod.POST : PathInfoHttpMethod.PUT;`
`24`	`26`	`return pathInfo;`
`25`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-using Elasticsearch.Net;`
	`1`	`+using System;`
	`2`	`+using System.IO;`
	`3`	`+using Elasticsearch.Net;`
`2`	`4`
`3`	`5`	`namespace Nest`
`4`	`6`	`{`
`@@ -27,9 +29,9 @@ public ElasticsearchPathInfo()`
`27`	`29`	`this.RequestParameters = new T();`
`28`	`30`	`}`
`29`	`31`
`30`		`- public ElasticsearchPathInfo<T> DeserializationState(object deserializationState)`
	`32`	`+ public ElasticsearchPathInfo<T> DeserializationState(object customObjectCreation)`
`31`	`33`	`{`
`32`		`- this.RequestParameters.DeserializationState(deserializationState);`
	`34`	`+ this.RequestParameters.DeserializationState(customObjectCreation);`
`33`	`35`	`return this;`
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,17 @@ public MultiSearchResponse()`
`21`	`21`
`22`	`22`	`public IEnumerable<SearchResponse<T>> GetResponses<T>() where T : class`
`23`	`23`	`{`
	`24`	`+ foreach (var r in this._Responses.Values.OfType<IResponseWithRequestInformation>())`
	`25`	`+ r.RequestInformation = this.ConnectionStatus;`
`24`	`26`	`return this._Responses.Values.OfType<SearchResponse<T>>();`
`25`	`27`	`}`
`26`	`28`	`public SearchResponse<T> GetResponse<T>(string name) where T : class`
`27`	`29`	`{`
`28`	`30`	`object response = null;`
`29`	`31`	`this._Responses.TryGetValue(name, out response);`
	`32`	`+ var r = response as IResponseWithRequestInformation;`
	`33`	`+ if (r != null)`
	`34`	`+ r.RequestInformation = this.ConnectionStatus;`
`30`	`35`	`return response as SearchResponse<T>;`
`31`	`36`	`}`
`32`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ D descriptor`
`95`	`95`	`{`
`96`	`96`	`var config = descriptor.RequestConfiguration as IRequestConfiguration;`
`97`	`97`	`var statusCodeAllowed = config != null && config.AllowedStatusCodes.HasAny(i => i == c.HttpStatusCode);`
`98`		`-`
	`98`	`+`
`99`	`99`	`if (c.Success \|\| statusCodeAllowed)`
`100`	`100`	`{`
`101`	`101`	`c.Response.IsValid = true;`
`@@ -106,6 +106,13 @@ D descriptor`
`106`	`106`	`}`
`107`	`107`
`108`	`108`
	`109`	`+ private static R CreateValidInstance<R>(IElasticsearchResponse response) where R : BaseResponse`
	`110`	`+ {`
	`111`	`+ var r = (R)typeof(R).CreateInstance();`
	`112`	`+ ((IResponseWithRequestInformation)r).RequestInformation = response;`
	`113`	`+ r.IsValid = true;`
	`114`	`+ return r;`
	`115`	`+ }`
`109`	`116`	`private static R CreateInvalidInstance<R>(IElasticsearchResponse response) where R : BaseResponse`
`110`	`117`	`{`
`111`	`118`	`var r = (R)typeof(R).CreateInstance();`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`78`	`78`	`if (realConverter == null)`
`79`	`79`	`return new MultiSearchResponse { IsValid = false };`
`80`	`80`
`81`		`- return realConverter.ReadJson(reader, objectType, existingValue, serializer);`
	`81`	`+ var mr = realConverter.ReadJson(reader, objectType, existingValue, serializer) as MultiSearchResponse;`
	`82`	`+ return mr;`
`82`	`83`	`}`
`83`	`84`
`84`	`85`
`@@ -139,9 +140,8 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist`
`139`	`140`	`}`
`140`	`141`	`}`
`141`	`142`	`generic.Invoke(null, new object[] { m, serializer, response._Responses, this._settings });`
`142`		`-`
`143`	`143`	`}`
`144`		`-`
	`144`	`+`
`145`	`145`	`return response;`
`146`	`146`	`}`
`147`	`147`