Removed separate deserialization of BaseResponse's through ToParsedResponse, everything flows to Deserialize noticed after writing PR notes for #349

Mpdreamz · Mpdreamz · commit 6831d2db774b · 2013-09-21T00:30:23.000+02:00
diff --git a/src/Nest.Tests.Integration/IntegrationTests.cs b/src/Nest.Tests.Integration/IntegrationTests.cs
@@ -36,7 +36,7 @@ protected IQueryResponse<T> SearchRaw<T>(string query) where T : class
 			var index = this._client.GetIndexNameFor<T>();
 			var typeName = this._client.GetTypeNameFor<T>();
 			var connectionStatus = this._client.Raw.SearchPost(index, typeName, query);
-			return connectionStatus.ToParsedResponse<QueryResponse<T>>();
+			return connectionStatus.Deserialize<QueryResponse<T>>();
 		} 
 
 		public void DoFilterTest(Func<FilterDescriptor<ElasticSearchProject>, Nest.BaseFilter> filter, ElasticSearchProject project, bool queryMustHaveResults)
diff --git a/src/Nest/Domain/Connection/ConnectionStatus.cs b/src/Nest/Domain/Connection/ConnectionStatus.cs
@@ -61,9 +61,11 @@ public ConnectionStatus(IConnectionSettings settings, string result) : this(sett
 		/// Returns a response of type R based on the connection status by trying parsing status.Result into R
 		/// </summary>
 		/// <returns></returns>
-		public virtual R ToParsedResponse<R>(bool allow404 = false, IEnumerable<JsonConverter> extraConverters = null) where R : BaseResponse
+		public virtual T Deserialize<T>(IEnumerable<JsonConverter> extraConverters = null, bool allow404 = false) where T : class
 		{
-			return this._elasticSerializer.ToParsedResponse<R>(this, allow404, extraConverters);
+      if (typeof(BaseResponse).IsAssignableFrom(typeof(T)))
+			  return this._elasticSerializer.Deserialize<T>(this, extraConverters, allow404);
+			return this._elasticSerializer.Deserialize<T>(this.Result, extraConverters, allow404);
 		}
 
 		public override string ToString()
diff --git a/src/Nest/ElasticClient-Aliases.cs b/src/Nest/ElasticClient-Aliases.cs
@@ -202,7 +202,7 @@ private IndicesOperationResponse _Alias(string query)
 			query = _aliasBody.F(query);
 			var status = this.Connection.PostSync(path, query);
 
-			var r = this.ToParsedResponse<IndicesOperationResponse>(status);
+			var r = this.Deserialize<IndicesOperationResponse>(status);
 			return r;
 		}
 	}
diff --git a/src/Nest/ElasticClient-Analyze.cs b/src/Nest/ElasticClient-Analyze.cs
@@ -64,7 +64,7 @@ private AnalyzeResponse _Analyze(AnalyzeParams analyzeParams, string text)
             }
 
 			var status = this.Connection.GetSync(path);
-			var r = this.ToParsedResponse<AnalyzeResponse>(status);
+			var r = this.Deserialize<AnalyzeResponse>(status);
 			return r;
 		}
 	}
diff --git a/src/Nest/ElasticClient-Bulk.cs b/src/Nest/ElasticClient-Bulk.cs
@@ -66,7 +66,7 @@ public IBulkResponse Bulk(BulkDescriptor bulkDescriptor)
 				path = bulkDescriptor._FixedIndex + "/" + path;
 			}
 			var status = this.Connection.PostSync(path, json);
-			return this.ToParsedResponse<BulkResponse>(status);
+			return this.Deserialize<BulkResponse>(status);
 		}
 		
 		internal string GenerateBulkIndexCommand<T>(IEnumerable<T> objects) where T : class
diff --git a/src/Nest/ElasticClient-Count.cs b/src/Nest/ElasticClient-Count.cs
@@ -127,7 +127,7 @@ public ICountResponse Count<T>(IEnumerable<string> indices, IEnumerable<string>
 		private CountResponse _Count(string path, string query)
 		{
 			var status = this.Connection.PostSync(path, query);
-			var r = this.ToParsedResponse<CountResponse>(status);
+			var r = this.Deserialize<CountResponse>(status);
 			return r;
 		}
 
diff --git a/src/Nest/ElasticClient-CreateIndex.cs b/src/Nest/ElasticClient-CreateIndex.cs
@@ -18,7 +18,7 @@ public IIndicesOperationResponse CreateIndex(string index, IndexSettings setting
 			string data = this.Serialize(settings);
 			string path = this.PathResolver.CreateIndexPath(index);
 			var status = this.Connection.PostSync(path, data);
-			return this.ToParsedResponse<IndicesOperationResponse>(status);
+			return this.Deserialize<IndicesOperationResponse>(status);
 		}
 		
 		/// <summary>
diff --git a/src/Nest/ElasticClient-Delete.cs b/src/Nest/ElasticClient-Delete.cs
@@ -119,41 +119,41 @@ private IDeleteResponse _deleteToPath(string path)
     {
       path.ThrowIfNull("path");
       var status = this.Connection.DeleteSync(path);
-      return this.ToParsedResponse<DeleteResponse>(status);
+      return this.Deserialize<DeleteResponse>(status);
     }
 
     private IDeleteResponse _deleteToPath(string path, string data)
     {
       path.ThrowIfNull("path");
       var status = this.Connection.DeleteSync(path, data);
-      return this.ToParsedResponse<DeleteResponse>(status);
+      return this.Deserialize<DeleteResponse>(status);
     }
 
     private IBulkResponse _deleteToBulkPath(string path, string data)
     {
       path.ThrowIfNull("path");
       var status = this.Connection.PostSync(path, data);
-      return this.ToParsedResponse<BulkResponse>(status);
+      return this.Deserialize<BulkResponse>(status);
     }
 
     private Task<IDeleteResponse> _deleteToPathAsync(string path)
     {
       path.ThrowIfNull("path");
       var task = this.Connection.Delete(path);
-      return task.ContinueWith<IDeleteResponse>(t => this.ToParsedResponse<DeleteResponse>(t.Result));
+      return task.ContinueWith<IDeleteResponse>(t => this.Deserialize<DeleteResponse>(t.Result));
     }
 
     private Task<IDeleteResponse> _deleteToPathAsync(string path, string data)
     {
       path.ThrowIfNull("path");
       var task = this.Connection.Delete(path, data);
-      return task.ContinueWith<IDeleteResponse>(t => this.ToParsedResponse<DeleteResponse>(t.Result));
+      return task.ContinueWith<IDeleteResponse>(t => this.Deserialize<DeleteResponse>(t.Result));
     }
     private Task<IBulkResponse> _deleteToBulkPathAsync(string path, string data)
     {
       path.ThrowIfNull("path");
       var task = this.Connection.Post(path, data);
-      return task.ContinueWith<IBulkResponse>(t => this.ToParsedResponse<BulkResponse>(t.Result));
+      return task.ContinueWith<IBulkResponse>(t => this.Deserialize<BulkResponse>(t.Result));
     }
   }
 }
diff --git a/src/Nest/ElasticClient-Flush.cs b/src/Nest/ElasticClient-Flush.cs
@@ -52,7 +52,7 @@ public IIndicesOperationResponse Flush(IEnumerable<string> indices, bool refresh
 		private IndicesOperationResponse _Flush(string path)
 		{
 			var status = this.Connection.PostSync(path, "");
-			var r = this.ToParsedResponse<IndicesOperationResponse>(status);
+			var r = this.Deserialize<IndicesOperationResponse>(status);
 			return r;
 		}
 	}
diff --git a/src/Nest/ElasticClient-GetFull.cs b/src/Nest/ElasticClient-GetFull.cs
@@ -68,7 +68,7 @@ public IGetResponse<T> GetFull<T>(Action<GetDescriptor<T>> getSelector) where T
 		private IGetResponse<T> _GetFull<T>(string path) where T : class
 		{
 			var response = this.Connection.GetSync(path);
-			var getResponse = this.ToParsedResponse<GetResponse<T>>(response);
+			var getResponse = this.Deserialize<GetResponse<T>>(response);
 
 			if (response.Result != null)
 			{
diff --git a/src/Nest/ElasticClient-Health.cs b/src/Nest/ElasticClient-Health.cs
@@ -64,7 +64,7 @@ private HealthResponse _Health(string path, HealthParams healthParams)
 		        path += "&wait_for_relocating_shards=" + healthParams.WaitForRelocatingShards;
 
 			var status = this.Connection.GetSync(path);
-		    var r = this.ToParsedResponse<HealthResponse>(status);
+		    var r = this.Deserialize<HealthResponse>(status);
 			return r;
 		}
 	}
diff --git a/src/Nest/ElasticClient-Index.cs b/src/Nest/ElasticClient-Index.cs
@@ -423,26 +423,26 @@ private IIndexResponse _indexToPath<T>(T @object, string path) where T : class
 			string json = this.Serializer.Serialize(@object, Formatting.Indented);
 
 			var status = this.Connection.PostSync(path, json);
-			return this.ToParsedResponse<IndexResponse>(status);
+			return this.Deserialize<IndexResponse>(status);
 		}
 
 		private Task<IIndexResponse> _indexAsyncToPath<T>(T @object, string path) where T : class
 		{
 			string json = this.Serializer.Serialize(@object, Formatting.None);
 			var postTask = this.Connection.Post(path, json);
-			return postTask.ContinueWith<IIndexResponse>(t => this.ToParsedResponse<IndexResponse>(t.Result));
+			return postTask.ContinueWith<IIndexResponse>(t => this.Deserialize<IndexResponse>(t.Result));
 		}
 
 		private IBulkResponse _indexManyToPath(string path, string json)
 		{
 			var status = this.Connection.PostSync(path, json);
-			return this.ToParsedResponse<BulkResponse>(status);
+			return this.Deserialize<BulkResponse>(status);
 		}
 
 		private Task<IBulkResponse> _indexManyAsyncToPath(string path, string json)
 		{
 			var postTask = this.Connection.Post(path, json);
-			return postTask.ContinueWith<IBulkResponse>(t => this.ToParsedResponse<BulkResponse>(t.Result));
+			return postTask.ContinueWith<IBulkResponse>(t => this.Deserialize<BulkResponse>(t.Result));
 		}
 	}
 }
diff --git a/src/Nest/ElasticClient-MappingDelete.cs b/src/Nest/ElasticClient-MappingDelete.cs
@@ -32,7 +32,7 @@ public IIndicesResponse DeleteMapping<T>(string index, string type) where T : cl
             string path = this.PathResolver.CreateIndexTypePath(index, type);
             
 			ConnectionStatus status = this.Connection.DeleteSync(path);
-	        return this.ToParsedResponse<IndicesResponse>(status, allow404: true);
+	        return this.Deserialize<IndicesResponse>(status, allow404: true);
         }
 
         /// <summary>
diff --git a/src/Nest/ElasticClient-MappingIndex.cs b/src/Nest/ElasticClient-MappingIndex.cs
@@ -118,7 +118,7 @@ public IIndicesResponse DeleteIndex(string index)
 			string path = this.PathResolver.CreateIndexPath(index);
 
 			var status = this.Connection.DeleteSync(path);
-			var r = this.ToParsedResponse<IndicesResponse>(status);
+			var r = this.Deserialize<IndicesResponse>(status);
 			return r;
 		}
 
diff --git a/src/Nest/ElasticClient-MappingType.cs b/src/Nest/ElasticClient-MappingType.cs
@@ -128,7 +128,7 @@ public IIndicesResponse Map(RootObjectMapping typeMapping, string index, string
 				path += "?ignore_conflicts=true";
 			ConnectionStatus status = this.Connection.PutSync(path, map);
 
-			var r = this.ToParsedResponse<IndicesResponse>(status);
+			var r = this.Deserialize<IndicesResponse>(status);
 			return r;
         }
        
diff --git a/src/Nest/ElasticClient-MoreLikeThis.cs b/src/Nest/ElasticClient-MoreLikeThis.cs
@@ -26,7 +26,7 @@ public IQueryResponse<T> MoreLikeThis<T>(Func<MoreLikeThisDescriptor<T>, MoreLik
 				var search = this.Serialize(descriptor._Search);
 				status = this.Connection.PostSync(path, search);
 			}
-			return this.ToParsedResponse<QueryResponse<T>>(status, extraConverters: new List<JsonConverter>
+			return this.Deserialize<QueryResponse<T>>(status, extraConverters: new List<JsonConverter>
 			{
 				new ConcreteTypeConverter(typeof (T), (d, h) => typeof (T))
 			});
diff --git a/src/Nest/ElasticClient-MultiGet.cs b/src/Nest/ElasticClient-MultiGet.cs
@@ -71,7 +71,7 @@ public MultiGetResponse MultiGetFull(Action<MultiGetDescriptor> multiGetSelector
 			var response = _multiGetUsingDescriptor(multiGetSelector, out descriptor);
 
 			var multiGetHitConverter = new MultiGetHitConverter(descriptor);
-			var multiGetResponse = this.ToParsedResponse<MultiGetResponse>(response, extraConverters: new List<JsonConverter> { multiGetHitConverter });
+			var multiGetResponse = this.Deserialize<MultiGetResponse>(response, extraConverters: new List<JsonConverter> { multiGetHitConverter });
 
 			return multiGetResponse;
 		}
diff --git a/src/Nest/ElasticClient-MultiSearch.cs b/src/Nest/ElasticClient-MultiSearch.cs
@@ -63,7 +63,7 @@ public MultiSearchResponse MultiSearch(MultiSearchDescriptor multiSearchDescript
 			var status = this.Connection.PostSync(path, json);
 
 			var multiSearchConverter = new MultiSearchConverter(this._connectionSettings, multiSearchDescriptor);
-			var multiSearchResponse = this.ToParsedResponse<MultiSearchResponse>(status, 
+			var multiSearchResponse = this.Deserialize<MultiSearchResponse>(status, 
 				extraConverters: new List<JsonConverter> 
 				{ 
 					multiSearchConverter
diff --git a/src/Nest/ElasticClient-Nodes.cs b/src/Nest/ElasticClient-Nodes.cs
@@ -53,7 +53,7 @@ private NodeInfoResponse _NodeInfo(string path, NodesInfo nodesInfo)
                 path += "?" + string.Join("&", options);
             }
             var status = this.Connection.GetSync(path);
-            var r = this.ToParsedResponse<NodeInfoResponse>(status);
+            var r = this.Deserialize<NodeInfoResponse>(status);
             return r;
         }
 
@@ -105,7 +105,7 @@ private NodeStatsResponse _NodeStats(string path, NodeInfoStats nodeInfoStats)
                 path += "?" + string.Join("&", options);
             }
             var status = this.Connection.GetSync(path);
-            var r = this.ToParsedResponse<NodeStatsResponse>(status);
+            var r = this.Deserialize<NodeStatsResponse>(status);
             return r;
         }
 	}
diff --git a/src/Nest/ElasticClient-OpenClose.cs b/src/Nest/ElasticClient-OpenClose.cs
@@ -41,7 +41,7 @@ public IIndicesOperationResponse CloseIndex<T>() where T : class
 		private IndicesOperationResponse _OpenClose(string path)
 		{
 			var status = this.Connection.PostSync(path, "");
-			var r = this.ToParsedResponse<IndicesOperationResponse>(status);
+			var r = this.Deserialize<IndicesOperationResponse>(status);
 			return r;
 		}
 
diff --git a/src/Nest/ElasticClient-Optimize.cs b/src/Nest/ElasticClient-Optimize.cs
@@ -82,7 +82,7 @@ private IndicesOperationResponse _Optimize(string path, OptimizeParams optimizeP
 				path += "&wait_for_merge=" + optimizeParameters.WaitForMerge.ToString().ToLower();
 			}
 			var status = this.Connection.PostSync(path, "");
-			var r = this.ToParsedResponse<IndicesOperationResponse>(status);
+			var r = this.Deserialize<IndicesOperationResponse>(status);
 			return r;
 		}
 
diff --git a/src/Nest/ElasticClient-Percolate.cs b/src/Nest/ElasticClient-Percolate.cs
@@ -28,7 +28,7 @@ public IUnregisterPercolateResponse UnregisterPercolator(string index, string na
 		private UnregisterPercolateResponse _UnregisterPercolator(string path)
 		{
 			var status = this.Connection.DeleteSync(path);
-			var r = this.ToParsedResponse<UnregisterPercolateResponse>(status, allow404: true);
+			var r = this.Deserialize<UnregisterPercolateResponse>(status, allow404: true);
 			return r;
 		}
 
@@ -37,7 +37,7 @@ public IRegisterPercolateResponse RegisterPercolator<T>(
 		{
 			var pathAndData = this._registerPercolator(percolatorSelector);
 			var status = this.Connection.PutSync(pathAndData.Path, pathAndData.Data);
-			var r = this.ToParsedResponse<RegisterPercolateResponse>(status);
+			var r = this.Deserialize<RegisterPercolateResponse>(status);
 			return r;
 		}
 
@@ -48,7 +48,7 @@ public Task<IRegisterPercolateResponse> RegisterPercolatorAsync<T>(
 			var pathAndData = this._registerPercolator(percolatorSelector);
 			return this.Connection.Put(pathAndData.Path, pathAndData.Data).ContinueWith(c =>
 			{
-				var r = this.ToParsedResponse<RegisterPercolateResponse>(c.Result);
+				var r = this.Deserialize<RegisterPercolateResponse>(c.Result);
 				return (IRegisterPercolateResponse)r;
 			});
 			
@@ -73,7 +73,7 @@ public IPercolateResponse Percolate<T>(
 		{
 			var pathAndData = this._percolate(percolateSelector);
 			var status = this.Connection.PostSync(pathAndData.Path, pathAndData.Data);
-			var r = this.ToParsedResponse<PercolateResponse>(status);
+			var r = this.Deserialize<PercolateResponse>(status);
 			return r;
 		}
 
@@ -85,7 +85,7 @@ public Task<IPercolateResponse> PercolateAsync<T>(
 			var pathAndData = this._percolate(percolateSelector);
 			var status = this.Connection.Post(pathAndData.Path, pathAndData.Data).ContinueWith(c =>
 			{
-				var r = this.ToParsedResponse<PercolateResponse>(c.Result);
+				var r = this.Deserialize<PercolateResponse>(c.Result);
 				return (IPercolateResponse)r;
 			});
 			return status;
diff --git a/src/Nest/ElasticClient-Refresh.cs b/src/Nest/ElasticClient-Refresh.cs
@@ -42,7 +42,7 @@ public IIndicesShardResponse Refresh<T>() where T : class
 		private IndicesShardResponse _Refresh(string path)
 		{
 			var status = this.Connection.GetSync(path);
-			var r = this.ToParsedResponse<IndicesShardResponse>(status);
+			var r = this.Deserialize<IndicesShardResponse>(status);
 			return r;
 		}
 
diff --git a/src/Nest/ElasticClient-Scroll.cs b/src/Nest/ElasticClient-Scroll.cs
@@ -24,7 +24,7 @@ public IQueryResponse<T> Scroll<T>(string scrollTime, string scrollId) where T :
 			var path = "_search/scroll?scroll={0}".F(scrollTime);
 
 			ConnectionStatus status = this.Connection.PostSync(path, scrollId);
-			var r = this.ToParsedResponse<QueryResponse<T>>(status
+			var r = this.Deserialize<QueryResponse<T>>(status
 				, extraConverters: new[] { new ConcreteTypeConverter(typeof(T), (d, h) => typeof(T)) }	
 			);
 			return r;
diff --git a/src/Nest/ElasticClient-Search.cs b/src/Nest/ElasticClient-Search.cs
@@ -173,8 +173,8 @@ private IQueryResponse<TResult> GetParsedResponse<T, TResult>(ConnectionStatus s
 
             
 	        if (descriptor._ConcreteTypeSelector == null)
-		        return this.ToParsedResponse<QueryResponse<TResult>>(status);
-            return this.ToParsedResponse<QueryResponse<TResult>>(
+		        return this.Deserialize<QueryResponse<TResult>>(status);
+            return this.Deserialize<QueryResponse<TResult>>(
                 status,
 
 				extraConverters: new[]
diff --git a/src/Nest/ElasticClient-Segments.cs b/src/Nest/ElasticClient-Segments.cs
@@ -29,7 +29,7 @@ public ISegmentsResponse Segments(IEnumerable<string> indices)
 		private SegmentsResponse _Segments(string path)
 		{
 			var status = this.Connection.GetSync(path);
-			var r = this.ToParsedResponse<SegmentsResponse>(status);
+			var r = this.Deserialize<SegmentsResponse>(status);
 			return r;
 		}
 	}
diff --git a/src/Nest/ElasticClient-Snapshot.cs b/src/Nest/ElasticClient-Snapshot.cs
@@ -41,7 +41,7 @@ public IIndicesShardResponse Snapshot(IEnumerable<string> indices)
 		private IndicesShardResponse _Snapshot(string path)
 		{
 			var status = this.Connection.PostSync(path, "");
-			var r = this.ToParsedResponse<IndicesShardResponse>(status);
+			var r = this.Deserialize<IndicesShardResponse>(status);
 			return r;
 		}
 
diff --git a/src/Nest/ElasticClient-State.cs b/src/Nest/ElasticClient-State.cs
@@ -30,7 +30,7 @@ public IClusterStateResponse ClusterState(ClusterStateInfo stateInfo, IEnumerabl
             path += "?" + string.Join("&", options);
 
             var status = this.Connection.GetSync(path);
-            var r = this.ToParsedResponse<ClusterStateResponse>(status);
+            var r = this.Deserialize<ClusterStateResponse>(status);
             return r;
         }
     }
diff --git a/src/Nest/ElasticClient-Statics.cs b/src/Nest/ElasticClient-Statics.cs
@@ -17,10 +17,7 @@ private string Serialize(object @object)
 			return this.Serializer.Serialize(@object);
 		}
 
-		private T Deserialize<T>(string value, IEnumerable<JsonConverter> extraConverters = null)
-		{
-			return this.Serializer.Deserialize<T>(value, extraConverters);
-		}
+		
 
 		public string GetTypeNameFor<T>()
 		{
@@ -42,9 +39,9 @@ public string GetIndexNameFor(Type type)
 			return this.IndexNameResolver.GetIndexForType(type);
 		}
 
-		protected virtual R ToParsedResponse<R>(ConnectionStatus status, bool allow404 = false, IEnumerable<JsonConverter> extraConverters = null) where R : BaseResponse
+		protected virtual T Deserialize<T>(object value,IEnumerable<JsonConverter> extraConverters = null, bool allow404 = false) where T : class
 		{
-			return this.Serializer.ToParsedResponse<R>(status, allow404, extraConverters);
+			return this.Serializer.Deserialize<T>(value, extraConverters, allow404);
 		}
 
 		private string ResolveTypeName(TypeNameMarker typeNameMarker, string defaultIndexName = null)
diff --git a/src/Nest/ElasticClient-Stats.cs b/src/Nest/ElasticClient-Stats.cs
diff --git a/src/Nest/ElasticClient-Template.cs b/src/Nest/ElasticClient-Template.cs
diff --git a/src/Nest/ElasticClient-Update.cs b/src/Nest/ElasticClient-Update.cs
diff --git a/src/Nest/ElasticClient-Validate.cs b/src/Nest/ElasticClient-Validate.cs
diff --git a/src/Nest/ElasticClient-Warmers.cs b/src/Nest/ElasticClient-Warmers.cs
diff --git a/src/Nest/ElasticClient.cs b/src/Nest/ElasticClient.cs
diff --git a/src/Nest/ElasticSerializer.cs b/src/Nest/ElasticSerializer.cs

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected IQueryResponse<T> SearchRaw<T>(string query) where T : class`
`36`	`36`	`var index = this._client.GetIndexNameFor<T>();`
`37`	`37`	`var typeName = this._client.GetTypeNameFor<T>();`
`38`	`38`	`var connectionStatus = this._client.Raw.SearchPost(index, typeName, query);`
`39`		`- return connectionStatus.ToParsedResponse<QueryResponse<T>>();`
	`39`	`+ return connectionStatus.Deserialize<QueryResponse<T>>();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public void DoFilterTest(Func<FilterDescriptor<ElasticSearchProject>, Nest.BaseFilter> filter, ElasticSearchProject project, bool queryMustHaveResults)`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,11 @@ public ConnectionStatus(IConnectionSettings settings, string result) : this(sett`
`61`	`61`	`/// Returns a response of type R based on the connection status by trying parsing status.Result into R`
`62`	`62`	`/// </summary>`
`63`	`63`	`/// <returns></returns>`
`64`		`- public virtual R ToParsedResponse<R>(bool allow404 = false, IEnumerable<JsonConverter> extraConverters = null) where R : BaseResponse`
	`64`	`+ public virtual T Deserialize<T>(IEnumerable<JsonConverter> extraConverters = null, bool allow404 = false) where T : class`
`65`	`65`	`{`
`66`		`- return this._elasticSerializer.ToParsedResponse<R>(this, allow404, extraConverters);`
	`66`	`+ if (typeof(BaseResponse).IsAssignableFrom(typeof(T)))`
	`67`	`+ return this._elasticSerializer.Deserialize<T>(this, extraConverters, allow404);`
	`68`	`+ return this._elasticSerializer.Deserialize<T>(this.Result, extraConverters, allow404);`
`67`	`69`	`}`
`68`	`70`
`69`	`71`	`public override string ToString()`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private IndicesOperationResponse _Alias(string query)`
`202`	`202`	`query = _aliasBody.F(query);`
`203`	`203`	`var status = this.Connection.PostSync(path, query);`
`204`	`204`
`205`		`- var r = this.ToParsedResponse<IndicesOperationResponse>(status);`
	`205`	`+ var r = this.Deserialize<IndicesOperationResponse>(status);`
`206`	`206`	`return r;`
`207`	`207`	`}`
`208`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ private AnalyzeResponse _Analyze(AnalyzeParams analyzeParams, string text)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`var status = this.Connection.GetSync(path);`
`67`		`- var r = this.ToParsedResponse<AnalyzeResponse>(status);`
	`67`	`+ var r = this.Deserialize<AnalyzeResponse>(status);`
`68`	`68`	`return r;`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public IBulkResponse Bulk(BulkDescriptor bulkDescriptor)`
`66`	`66`	`path = bulkDescriptor._FixedIndex + "/" + path;`
`67`	`67`	`}`
`68`	`68`	`var status = this.Connection.PostSync(path, json);`
`69`		`- return this.ToParsedResponse<BulkResponse>(status);`
	`69`	`+ return this.Deserialize<BulkResponse>(status);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`internal string GenerateBulkIndexCommand<T>(IEnumerable<T> objects) where T : class`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public ICountResponse Count<T>(IEnumerable<string> indices, IEnumerable<string>`
`127`	`127`	`private CountResponse _Count(string path, string query)`
`128`	`128`	`{`
`129`	`129`	`var status = this.Connection.PostSync(path, query);`
`130`		`- var r = this.ToParsedResponse<CountResponse>(status);`
	`130`	`+ var r = this.Deserialize<CountResponse>(status);`
`131`	`131`	`return r;`
`132`	`132`	`}`
`133`	`133`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public IIndicesOperationResponse CreateIndex(string index, IndexSettings setting`
`18`	`18`	`string data = this.Serialize(settings);`
`19`	`19`	`string path = this.PathResolver.CreateIndexPath(index);`
`20`	`20`	`var status = this.Connection.PostSync(path, data);`
`21`		`- return this.ToParsedResponse<IndicesOperationResponse>(status);`
	`21`	`+ return this.Deserialize<IndicesOperationResponse>(status);`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -119,41 +119,41 @@ private IDeleteResponse _deleteToPath(string path)`
`119`	`119`	`{`
`120`	`120`	`path.ThrowIfNull("path");`
`121`	`121`	`var status = this.Connection.DeleteSync(path);`
`122`		`- return this.ToParsedResponse<DeleteResponse>(status);`
	`122`	`+ return this.Deserialize<DeleteResponse>(status);`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`private IDeleteResponse _deleteToPath(string path, string data)`
`126`	`126`	`{`
`127`	`127`	`path.ThrowIfNull("path");`
`128`	`128`	`var status = this.Connection.DeleteSync(path, data);`
`129`		`- return this.ToParsedResponse<DeleteResponse>(status);`
	`129`	`+ return this.Deserialize<DeleteResponse>(status);`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`private IBulkResponse _deleteToBulkPath(string path, string data)`
`133`	`133`	`{`
`134`	`134`	`path.ThrowIfNull("path");`
`135`	`135`	`var status = this.Connection.PostSync(path, data);`
`136`		`- return this.ToParsedResponse<BulkResponse>(status);`
	`136`	`+ return this.Deserialize<BulkResponse>(status);`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`private Task<IDeleteResponse> _deleteToPathAsync(string path)`
`140`	`140`	`{`
`141`	`141`	`path.ThrowIfNull("path");`
`142`	`142`	`var task = this.Connection.Delete(path);`
`143`		`- return task.ContinueWith<IDeleteResponse>(t => this.ToParsedResponse<DeleteResponse>(t.Result));`
	`143`	`+ return task.ContinueWith<IDeleteResponse>(t => this.Deserialize<DeleteResponse>(t.Result));`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`private Task<IDeleteResponse> _deleteToPathAsync(string path, string data)`
`147`	`147`	`{`
`148`	`148`	`path.ThrowIfNull("path");`
`149`	`149`	`var task = this.Connection.Delete(path, data);`
`150`		`- return task.ContinueWith<IDeleteResponse>(t => this.ToParsedResponse<DeleteResponse>(t.Result));`
	`150`	`+ return task.ContinueWith<IDeleteResponse>(t => this.Deserialize<DeleteResponse>(t.Result));`
`151`	`151`	`}`
`152`	`152`	`private Task<IBulkResponse> _deleteToBulkPathAsync(string path, string data)`
`153`	`153`	`{`
`154`	`154`	`path.ThrowIfNull("path");`
`155`	`155`	`var task = this.Connection.Post(path, data);`
`156`		`- return task.ContinueWith<IBulkResponse>(t => this.ToParsedResponse<BulkResponse>(t.Result));`
	`156`	`+ return task.ContinueWith<IBulkResponse>(t => this.Deserialize<BulkResponse>(t.Result));`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public IIndicesOperationResponse Flush(IEnumerable<string> indices, bool refresh`
`52`	`52`	`private IndicesOperationResponse _Flush(string path)`
`53`	`53`	`{`
`54`	`54`	`var status = this.Connection.PostSync(path, "");`
`55`		`- var r = this.ToParsedResponse<IndicesOperationResponse>(status);`
	`55`	`+ var r = this.Deserialize<IndicesOperationResponse>(status);`
`56`	`56`	`return r;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public IGetResponse<T> GetFull<T>(Action<GetDescriptor<T>> getSelector) where T`
`68`	`68`	`private IGetResponse<T> _GetFull<T>(string path) where T : class`
`69`	`69`	`{`
`70`	`70`	`var response = this.Connection.GetSync(path);`
`71`		`- var getResponse = this.ToParsedResponse<GetResponse<T>>(response);`
	`71`	`+ var getResponse = this.Deserialize<GetResponse<T>>(response);`
`72`	`72`
`73`	`73`	`if (response.Result != null)`
`74`	`74`	`{`