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

Author: Mpdreamz

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)

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()

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;
 		}
 	}

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;
 		}
 	}

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

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;
 		}
 

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>

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));
     }
   }
 }

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;
 		}
 	}

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)
 			{