#fix #645 when using Elasticsearc.Net in conjuction with NEST response classes .ConnectionStatus was null causing .Infer to be null as well breaking several lookups in places where a lambda would be used to describe a propertypath (facets/aggs/others)

Mpdreamz · Mpdreamz · commit c881b0a6c908 · 2014-05-07T16:42:29.000+02:00
diff --git a/src/Elasticsearch.Net/Connection/Transport.cs b/src/Elasticsearch.Net/Connection/Transport.cs
@@ -161,6 +161,9 @@ public ElasticsearchResponse<T> DoRequest<T>(string method, string path, object
 				var requestState = new TransportRequestState<T>(tracer, method, path, postData, requestParameters);
 
 				var result = this.DoRequest<T>(requestState);
+				var objectNeedsResponseRef = result.Response as IResponseWithRequestInformation;
+				if (objectNeedsResponseRef != null)
+					objectNeedsResponseRef.RequestInformation = result;
 				tracer.SetResult(result);
 				return result;
 			}
@@ -292,7 +295,12 @@ public Task<ElasticsearchResponse<T>> DoRequestAsync<T>(string method, string pa
 						if (t.Exception != null)
 							tcs.SetException(t.Exception.Flatten());
 						else
+						{
+							var objectNeedsResponseRef = t.Result.Response as IResponseWithRequestInformation;
+							if (objectNeedsResponseRef != null)
+								objectNeedsResponseRef.RequestInformation = t.Result;
 							tcs.SetResult(t.Result);
+						}
 
 						requestState.Tracer.SetResult(t.Result);
 						return tcs.Task;
diff --git a/src/Elasticsearch.Net/Domain/ElasticsearchResponse.cs b/src/Elasticsearch.Net/Domain/ElasticsearchResponse.cs
@@ -2,7 +2,6 @@
 using System.CodeDom;
 using System.Collections.Generic;
 using System.Configuration;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -20,26 +19,6 @@ namespace Elasticsearch.Net
 {
 	//TODO document and possibly rename some of the properties
 
-	public interface IElasticsearchResponse
-	{
-		bool Success { get; }
-		bool SuccessOrKnownError { get; }
-		IConnectionConfigurationValues Settings { get; }
-		Exception OriginalException { get; }
-		string RequestMethod { get; }
-		string RequestUrl { get; }
-		[DebuggerDisplay("{Request != null ? System.Text.Encoding.UTF8.GetString(Request) : null,nq}")]
-		byte[] Request { get; }
-		int? HttpStatusCode { get; }
-		int NumberOfRetries { get; }
-
-		/// <summary>
-		/// The raw byte response, only set when IncludeRawResponse() is set on Connection configuration
-		/// </summary>
-		[DebuggerDisplay("{ResponseRaw != null ? System.Text.Encoding.UTF8.GetString(ResponseRaw) : null,nq}")]
-		byte[] ResponseRaw { get; }
-	}
-
 	public static class ElasticsearchResponse
 	{
 		internal static Task<ElasticsearchResponse<DynamicDictionary>> WrapAsync(Task<ElasticsearchResponse<Dictionary<string, object>>> responseTask)
diff --git a/src/Elasticsearch.Net/Domain/IElasticsearchResponse.cs b/src/Elasticsearch.Net/Domain/IElasticsearchResponse.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Diagnostics;
+using Elasticsearch.Net.Connection;
+
+namespace Elasticsearch.Net
+{
+	public interface IElasticsearchResponse
+	{
+		bool Success { get; }
+		bool SuccessOrKnownError { get; }
+		IConnectionConfigurationValues Settings { get; }
+		Exception OriginalException { get; }
+		string RequestMethod { get; }
+		string RequestUrl { get; }
+		[DebuggerDisplay("{Request != null ? System.Text.Encoding.UTF8.GetString(Request) : null,nq}")]
+		byte[] Request { get; }
+		int? HttpStatusCode { get; }
+		int NumberOfRetries { get; }
+
+		/// <summary>
+		/// The raw byte response, only set when IncludeRawResponse() is set on Connection configuration
+		/// </summary>
+		[DebuggerDisplay("{ResponseRaw != null ? System.Text.Encoding.UTF8.GetString(ResponseRaw) : null,nq}")]
+		byte[] ResponseRaw { get; }
+	}
+
+	public interface IResponseWithRequestInformation
+	{
+		IElasticsearchResponse RequestInformation { get; set; }
+	}
+}
diff --git a/src/Elasticsearch.Net/Elasticsearch.Net.csproj b/src/Elasticsearch.Net/Elasticsearch.Net.csproj
@@ -52,6 +52,7 @@
     <Compile Include="Connection\IRequestConnectionConfiguration.cs" />
     <Compile Include="Connection\TransportRequestState.cs" />
     <Compile Include="Domain\BaseRequestParameters.cs" />
+    <Compile Include="Domain\IElasticsearchResponse.cs" />
     <Compile Include="Domain\IHideObjectMembers.cs" />
     <Compile Include="Domain\IRequestParameters.cs" />
     <Compile Include="Domain\VoidResponse.cs" />
diff --git a/src/Nest/Domain/Responses/BaseResponse.cs b/src/Nest/Domain/Responses/BaseResponse.cs
@@ -6,7 +6,7 @@
 
 namespace Nest
 {
-	public interface IResponse
+	public interface IResponse : IResponseWithRequestInformation
 	{
 		bool IsValid { get; }
 		IElasticsearchResponse ConnectionStatus { get; }
@@ -20,7 +20,11 @@ public BaseResponse()
 			this.IsValid = true;
 		}
 		public virtual bool IsValid { get; internal set; }
-		public IElasticsearchResponse ConnectionStatus { get; internal set; }
+		
+		IElasticsearchResponse IResponseWithRequestInformation.RequestInformation { get; set; }
+
+		public IElasticsearchResponse ConnectionStatus { get { return ((IResponseWithRequestInformation)this).RequestInformation;  } }
+		
 		public ElasticInferrer _infer;
 		
 		protected IConnectionSettingsValues Settings
@@ -50,5 +54,6 @@ public ElasticInferrer Infer
 				return this._infer;
 			}
 		}
+
 	}
 }
diff --git a/src/Nest/Domain/Responses/GetMappingResponse.cs b/src/Nest/Domain/Responses/GetMappingResponse.cs
@@ -24,7 +24,6 @@ public GetMappingResponse()
 
 		internal GetMappingResponse(IElasticsearchResponse status, GetRootObjectMappingWrapping dict)
 		{
-			this.ConnectionStatus = status;
 			this.IsValid = status.Success && dict != null && dict.Count > 0;
 			if (!this.IsValid) return;
 			var firstNode = dict.First();
diff --git a/src/Nest/Domain/Responses/IndexExistsResponse.cs b/src/Nest/Domain/Responses/IndexExistsResponse.cs
@@ -14,7 +14,6 @@ public class ExistsResponse : BaseResponse, IExistsResponse
 	{
 		internal ExistsResponse(IElasticsearchResponse connectionStatus)
 		{
-			this.ConnectionStatus = connectionStatus;
 			this.IsValid =connectionStatus.Success || connectionStatus.HttpStatusCode == 404;
 			this.Exists = connectionStatus.Success & connectionStatus.HttpStatusCode == 200;
 		}
diff --git a/src/Nest/ElasticClient-Aliases.cs b/src/Nest/ElasticClient-Aliases.cs
@@ -56,7 +56,7 @@ public Task<IGetAliasesResponse> GetAliasesAsync(Func<GetAliasesDescriptor, GetA
 		private GetAliasesResponse DeserializeGetAliasesResponse(IElasticsearchResponse connectionStatus, Stream stream)
 		{
 			if (!connectionStatus.Success)
-				return new GetAliasesResponse() {ConnectionStatus = connectionStatus, IsValid = false};
+				return new GetAliasesResponse() { IsValid = false};
 
 			var dict = this.Serializer.Deserialize<CrazyAliasesResponse>(stream);
 
@@ -83,7 +83,6 @@ private GetAliasesResponse DeserializeGetAliasesResponse(IElasticsearchResponse
 
 			return new GetAliasesResponse()
 			{
-				ConnectionStatus = connectionStatus,
 				IsValid = true,
 				Indices = d
 			};
diff --git a/src/Nest/ElasticClient-Search.cs b/src/Nest/ElasticClient-Search.cs
@@ -31,7 +31,6 @@ public ISearchResponse<TResult> Search<T, TResult>(Func<SearchDescriptor<T>, Sea
 				));
 
 			var status = this.RawDispatch.SearchDispatch<SearchResponse<TResult>>(pathInfo, descriptor);
-			status.Response.ConnectionStatus = status;
 			return status.Success ? status.Response : CreateInvalidInstance<SearchResponse<TResult>>(status);
 		}
 
@@ -68,12 +67,9 @@ public Task<ISearchResponse<TResult>> SearchAsync<T, TResult>(
 				.DeserializationState(deserializationState);
 
 			return this.RawDispatch.SearchDispatchAsync<SearchResponse<TResult>>(pathInfo, descriptor)
-				.ContinueWith<ISearchResponse<TResult>>(t => {
-					t.Result.Response.ConnectionStatus = t.Result;
-					return t.Result.Success
-						? t.Result.Response
-						: CreateInvalidInstance<SearchResponse<TResult>>(t.Result);
-			});
+				.ContinueWith<ISearchResponse<TResult>>(t => t.Result.Success
+					? t.Result.Response
+					: CreateInvalidInstance<SearchResponse<TResult>>(t.Result));
 		}
 
 		private JsonConverter CreateCovariantSearchSelector<T, TResult>(SearchDescriptor<T> originalSearchDescriptor)
diff --git a/src/Nest/ElasticClient-Template.cs b/src/Nest/ElasticClient-Template.cs
@@ -89,15 +89,14 @@ private TemplateResponse DeserializeTemplateResponse(
 			IElasticsearchResponse response,
 			Stream stream)
 		{
-			if (!response.Success) return new TemplateResponse {ConnectionStatus = response, IsValid = false};
+			if (!response.Success) return new TemplateResponse {IsValid = false};
 
 			var dict = this.Serializer.Deserialize<Dictionary<string, TemplateMapping>>(stream);
 			if (dict.Count == 0)
 				throw new DslException("Could not deserialize TemplateMapping");
 
 			return new TemplateResponse
 			{
-				ConnectionStatus = response,
 				IsValid = true,
 				Name = dict.First().Key,
 				TemplateMapping = dict.First().Value
diff --git a/src/Nest/ElasticClient-Warmers.cs b/src/Nest/ElasticClient-Warmers.cs
@@ -85,7 +85,7 @@ public Task<IIndicesOperationResponse> DeleteWarmerAsync(string name,
 		private WarmerResponse DeserializeWarmerResponse(IElasticsearchResponse connectionStatus, Stream stream)
 		{
 			if (!connectionStatus.Success)
-				return new WarmerResponse {ConnectionStatus = connectionStatus, IsValid = false};
+				return new WarmerResponse { IsValid = false};
 
 			var dict = this.Serializer.Deserialize<CrazyWarmerResponse>(stream);
 			var indices = new Dictionary<string, Dictionary<string, WarmerMapping>>();
@@ -104,7 +104,6 @@ private WarmerResponse DeserializeWarmerResponse(IElasticsearchResponse connecti
 
 			return new WarmerResponse
 			{
-				ConnectionStatus = connectionStatus,
 				IsValid = true,
 				Indices = indices
 			};
diff --git a/src/Nest/ElasticClient.cs b/src/Nest/ElasticClient.cs
@@ -101,7 +101,6 @@ D descriptor
 			if (c.Success || statusCodeAllowed)
 			{
 				c.Response.IsValid = true;
-				c.Response.ConnectionStatus = c;
 				return c.Response;
 			}
 			var badResponse = CreateInvalidInstance<R>(c);
@@ -112,7 +111,7 @@ D descriptor
 		private static R CreateInvalidInstance<R>(IElasticsearchResponse response) where R : BaseResponse
 		{
 			var r = (R)typeof(R).CreateInstance();
-			r.ConnectionStatus = response;
+			((IResponseWithRequestInformation)r).RequestInformation = response;
 			r.IsValid = false;
 			return r;
 		}
diff --git a/src/Tests/Nest.Tests.Integration/Facet/BaseFacetTestFixture.cs b/src/Tests/Nest.Tests.Integration/Facet/BaseFacetTestFixture.cs
@@ -6,20 +6,20 @@
 namespace Nest.Tests.Integration.Facet
 {
 	public class BaseFacetTestFixture : IntegrationTests
-    {
-        protected string _LookFor = NestTestData.Data.First().Followers.First().LastName;
+	{
+		protected string _LookFor = NestTestData.Data.First().Followers.First().LastName;
 
-        protected void TestDefaultAssertions(ISearchResponse<ElasticsearchProject> queryResponse)
-        {
-            Assert.True(queryResponse.IsValid, "response is not valid");
-            Assert.NotNull(queryResponse.ConnectionStatus, "connection status is null");
-            Assert.Null(queryResponse.ConnectionStatus.OriginalException, "exception should not be set");
-            Assert.True(queryResponse.Total > 0, "Query yielded no results as indicated by total returned from ES");
-            Assert.True(queryResponse.Documents.Any(), "documents.any() is false");
-            Assert.True(queryResponse.Documents.Count() > 0, "documents.count is 0");
-            Assert.True(queryResponse.Shards.Total > 0, "did not hit any shard");
-            Assert.True(queryResponse.Shards.Successful == queryResponse.Shards.Total, "Not all the shards were hit succesfully");
-            Assert.True(queryResponse.Shards.Failed == 0, "shards failed is not null");
-        }
-    }
+		protected void TestDefaultAssertions(ISearchResponse<ElasticsearchProject> queryResponse)
+		{
+			Assert.True(queryResponse.IsValid, "response is not valid");
+			Assert.NotNull(queryResponse.ConnectionStatus, "connection status is null");
+			Assert.Null(queryResponse.ConnectionStatus.OriginalException, "exception should not be set");
+			Assert.True(queryResponse.Total > 0, "Query yielded no results as indicated by total returned from ES");
+			Assert.True(queryResponse.Documents.Any(), "documents.any() is false");
+			Assert.True(queryResponse.Documents.Count() > 0, "documents.count is 0");
+			Assert.True(queryResponse.Shards.Total > 0, "did not hit any shard");
+			Assert.True(queryResponse.Shards.Successful == queryResponse.Shards.Total, "Not all the shards were hit succesfully");
+			Assert.True(queryResponse.Shards.Failed == 0, "shards failed is not null");
+		}
+	}
 }
diff --git a/src/Tests/Nest.Tests.Integration/Facet/HistogramFacetResponseTests.cs b/src/Tests/Nest.Tests.Integration/Facet/HistogramFacetResponseTests.cs
@@ -32,20 +32,29 @@ public void SimpleHistogramFacet()
 				}"
 			);
 
-		    var facet = queryResults.Facets["loc"];
 			this.TestDefaultAssertions(queryResults);
-			
-            Assert.IsInstanceOf<HistogramFacet>(facet);
 
-		    var hf = (HistogramFacet) facet;
+			var facet = queryResults.Facets["loc"];
+			Assert.IsInstanceOf<HistogramFacet>(facet);
+			var hf = (HistogramFacet)facet;
+			Assert.Greater(hf.Items.Count(), 0);
 
-            Assert.Greater(hf.Items.Count(), 0);
+			foreach (var entry in hf.Items)
+			{
+				Assert.Greater(entry.Count, 0);
+				Assert.Greater(entry.Key, 0);
+			}
+			
+			facet = queryResults.Facet<HistogramFacet>(p=>p.LOC);
+			Assert.IsInstanceOf<HistogramFacet>(facet);
+			hf = (HistogramFacet)facet;
+			Assert.Greater(hf.Items.Count(), 0);
 
-		    foreach (var entry in hf.Items)
-		    {
-		        Assert.Greater(entry.Count, 0);
-                Assert.Greater(entry.Key, 0);
-		    }
+			foreach (var entry in hf.Items)
+			{
+				Assert.Greater(entry.Count, 0);
+				Assert.Greater(entry.Key, 0);
+			}
 		}
 		[Test]
 		public void DateHistogramFacet()
@@ -68,33 +77,33 @@ public void DateHistogramFacet()
 				}"
 			);
 
-            var facet = queryResults.Facets["dob"];
-            this.TestDefaultAssertions(queryResults);
+			var facet = queryResults.Facets["dob"];
+			this.TestDefaultAssertions(queryResults);
 
-            Assert.IsInstanceOf<DateHistogramFacet>(facet);
+			Assert.IsInstanceOf<DateHistogramFacet>(facet);
 
-            var dhf = (DateHistogramFacet)facet;
+			var dhf = (DateHistogramFacet)facet;
 
-            Assert.Greater(dhf.Items.Count(), 0);
+			Assert.Greater(dhf.Items.Count(), 0);
 
-            foreach (var entry in dhf.Items)
-            {
-                Assert.Greater(entry.Count, 0);
-                Assert.Greater(entry.Time, DateTime.MinValue);
-            }
+			foreach (var entry in dhf.Items)
+			{
+				Assert.Greater(entry.Count, 0);
+				Assert.Greater(entry.Time, DateTime.MinValue);
+			}
 		}
 		[Test]
 		public void DateHistogramFacetCleanSyntax()
 		{
-			var queryResults = this._client.Search<ElasticsearchProject>(s=>s
+			var queryResults = this._client.Search<ElasticsearchProject>(s => s
 				.MatchAll()
-				.FacetDateHistogram(f=>f
-					.OnField(ff=>ff.Followers.First().DateOfBirth)
+				.FacetDateHistogram(f => f
+					.OnField(ff => ff.Followers.First().DateOfBirth)
 					.Interval(DateInterval.Day)
 				)
 			);
-				
-			var facet = queryResults.Facet<DateHistogramFacet>(f=>f.Followers.First().DateOfBirth);
+
+			var facet = queryResults.Facet<DateHistogramFacet>(f => f.Followers.First().DateOfBirth);
 			this.TestDefaultAssertions(queryResults);
 
 			Assert.IsInstanceOf<DateHistogramFacet>(facet);
diff --git a/src/Tests/Nest.Tests.Integration/IntegrationTests.cs b/src/Tests/Nest.Tests.Integration/IntegrationTests.cs
@@ -31,7 +31,7 @@ protected ISearchResponse<T> SearchRaw<T>(string query) where T : class
 			var typeName = this._client.Infer.TypeName<T>();
 
 			var connectionStatus = this._client.Raw.Search<SearchResponse<T>>(index, typeName, query);
-			var serializer = connectionStatus.Serializer as INestSerializer; 
+			var serializer = connectionStatus.Serializer as INestSerializer;
 			return connectionStatus.Response;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace Nest`
`8`	`8`	`{`
`9`		`- public interface IResponse`
	`9`	`+ public interface IResponse : IResponseWithRequestInformation`
`10`	`10`	`{`
`11`	`11`	`bool IsValid { get; }`
`12`	`12`	`IElasticsearchResponse ConnectionStatus { get; }`
`@@ -20,7 +20,11 @@ public BaseResponse()`
`20`	`20`	`this.IsValid = true;`
`21`	`21`	`}`
`22`	`22`	`public virtual bool IsValid { get; internal set; }`
`23`		`- public IElasticsearchResponse ConnectionStatus { get; internal set; }`
	`23`	`+`
	`24`	`+ IElasticsearchResponse IResponseWithRequestInformation.RequestInformation { get; set; }`
	`25`	`+`
	`26`	`+ public IElasticsearchResponse ConnectionStatus { get { return ((IResponseWithRequestInformation)this).RequestInformation; } }`
	`27`	`+`
`24`	`28`	`public ElasticInferrer _infer;`
`25`	`29`
`26`	`30`	`protected IConnectionSettingsValues Settings`
`@@ -50,5 +54,6 @@ public ElasticInferrer Infer`
`50`	`54`	`return this._infer;`
`51`	`55`	`}`
`52`	`56`	`}`
	`57`	`+`
`53`	`58`	`}`
`54`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ public GetMappingResponse()`
`24`	`24`
`25`	`25`	`internal GetMappingResponse(IElasticsearchResponse status, GetRootObjectMappingWrapping dict)`
`26`	`26`	`{`
`27`		`- this.ConnectionStatus = status;`
`28`	`27`	`this.IsValid = status.Success && dict != null && dict.Count > 0;`
`29`	`28`	`if (!this.IsValid) return;`
`30`	`29`	`var firstNode = dict.First();`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ public class ExistsResponse : BaseResponse, IExistsResponse`
`14`	`14`	`{`
`15`	`15`	`internal ExistsResponse(IElasticsearchResponse connectionStatus)`
`16`	`16`	`{`
`17`		`- this.ConnectionStatus = connectionStatus;`
`18`	`17`	`this.IsValid =connectionStatus.Success \|\| connectionStatus.HttpStatusCode == 404;`
`19`	`18`	`this.Exists = connectionStatus.Success & connectionStatus.HttpStatusCode == 200;`
`20`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public Task<IGetAliasesResponse> GetAliasesAsync(Func<GetAliasesDescriptor, GetA`
`56`	`56`	`private GetAliasesResponse DeserializeGetAliasesResponse(IElasticsearchResponse connectionStatus, Stream stream)`
`57`	`57`	`{`
`58`	`58`	`if (!connectionStatus.Success)`
`59`		`- return new GetAliasesResponse() {ConnectionStatus = connectionStatus, IsValid = false};`
	`59`	`+ return new GetAliasesResponse() { IsValid = false};`
`60`	`60`
`61`	`61`	`var dict = this.Serializer.Deserialize<CrazyAliasesResponse>(stream);`
`62`	`62`
`@@ -83,7 +83,6 @@ private GetAliasesResponse DeserializeGetAliasesResponse(IElasticsearchResponse`
`83`	`83`
`84`	`84`	`return new GetAliasesResponse()`
`85`	`85`	`{`
`86`		`- ConnectionStatus = connectionStatus,`
`87`	`86`	`IsValid = true,`
`88`	`87`	`Indices = d`
`89`	`88`	`};`