Search overload that accepts SearchDescriptor<T>

Author: Moran

src/Nest/ElasticClient-Search.cs

@@ -2,16 +2,16 @@
 using Nest.FactoryDsl;
 using System.Diagnostics;
 
-namespace Nest
-{
-	public partial class ElasticClient
+namespace Nest
+{
+	public partial class ElasticClient
 	{
 
 		/// <summary>
 		/// Search using dynamic as its return type.
 		/// </summary>
 		public IQueryResponse<dynamic> Search(
-			SearchBuilder searchBuilder, 
+			SearchBuilder searchBuilder,
 			string index = null,
 			string type = null,
 			string routing = null,
@@ -58,62 +58,53 @@ public IQueryResponse<T> Search<T>(SearchBuilder searchBuilder,
 			ConnectionStatus status = this.Connection.PostSync(path, query);
 			var r = this.ToParsedResponse<QueryResponse<T>>(status);
 			return r;
-		}
-
-
-		/// <summary>
-		/// Search using dynamic as its return type.
-		/// </summary>
-		public IQueryResponse<dynamic> Search(Func<SearchDescriptor<dynamic>, SearchDescriptor<dynamic>> searcher)
-		{
-			var search = new SearchDescriptor<dynamic>();
+		}
+
+
+		/// <summary>
+		/// Search using dynamic as its return type.
+		/// </summary>
+		public IQueryResponse<dynamic> Search(Func<SearchDescriptor<dynamic>, SearchDescriptor<dynamic>> searcher)
+		{
+			var search = new SearchDescriptor<dynamic>();
 			var descriptor = searcher(search);
-			var path = this.PathResolver.GetSearchPathForDynamic(descriptor);
-			var query = this.Serialize(descriptor);
-
-			ConnectionStatus status = this.Connection.PostSync(path, query);
-			var r = this.ToParsedResponse<QueryResponse<dynamic>>(status);
-			return r;
-		}
-		/// <summary>
-		/// Search using T as the return type
-		/// </summary>
-		public IQueryResponse<T> Search<T>(Func<SearchDescriptor<T>, SearchDescriptor<T>> searcher) where T : class
+			var path = this.PathResolver.GetSearchPathForDynamic(descriptor);
+			var query = this.Serialize(descriptor);
+
+			ConnectionStatus status = this.Connection.PostSync(path, query);
+			var r = this.ToParsedResponse<QueryResponse<dynamic>>(status);
+			return r;
+		}
+
+		/// <summary>
+		/// Search using T as the return type
+		/// </summary>
+		public IQueryResponse<T> Search<T>(Func<SearchDescriptor<T>, SearchDescriptor<T>> searcher) where T : class
 		{
-      var sw2 = new Stopwatch(); sw2.Start();
-      var sw = new Stopwatch();
-      sw.Start();
-			var search = new SearchDescriptor<T>();
+			var search = new SearchDescriptor<T>();
 			var descriptor = searcher(search);
-      var xx = sw.Elapsed;
-      sw.Restart();
+			return Search(descriptor);
+		}
+
+		public IQueryResponse<T> Search<T>(SearchDescriptor<T> descriptor) where T : class
+		{
 			var query = this.Serialize(descriptor);
-      var xY = sw.Elapsed;
-      sw.Restart();
 			var path = this.PathResolver.GetSearchPathForTyped(descriptor);
-      var xxx = sw.Elapsed;
-      sw.Restart();
+			var status = this.Connection.PostSync(path, query);
+			return this.ToParsedResponse<QueryResponse<T>>(status);
+		}
+
+		/// <summary>
+		/// Search using T as the return type, string based.
+		/// </summary>
+		[Obsolete("Deprecated but will never be removed. Found a bug in the DSL? https://github.com/Mpdreamz/NEST/issues")]
+		public IQueryResponse<T> SearchRaw<T>(string query) where T : class
+		{
+			var descriptor = new SearchDescriptor<T>();
+			var path = this.PathResolver.GetSearchPathForTyped(descriptor);
 			ConnectionStatus status = this.Connection.PostSync(path, query);
-      var xxxx = sw.Elapsed;
-      sw.Restart();
 			var r = this.ToParsedResponse<QueryResponse<T>>(status);
-      var xxxxx = sw.Elapsed;
-      sw.Restart();
-      sw2.Stop();
-      var total = sw2.Elapsed;
-			return r;
-		}
-		/// <summary>
-		/// Search using T as the return type, string based.
-		/// </summary>
-		[Obsolete("Deprecated but will never be removed. Found a bug in the DSL? https://github.com/Mpdreamz/NEST/issues")]
-		public IQueryResponse<T> SearchRaw<T>(string query) where T : class
-		{
-			var descriptor = new SearchDescriptor<T>();
-			var path = this.PathResolver.GetSearchPathForTyped(descriptor);
-			ConnectionStatus status = this.Connection.PostSync(path, query);
-			var r = this.ToParsedResponse<QueryResponse<T>>(status);
-			return r;
-		}
-	}
+			return r;
+		}
+	}
 }

src/Nest/IElasticClient.cs

@@ -242,5 +242,6 @@ IQueryResponse<T> Search<T>(SearchBuilder searchBuilder,
     ISettingsOperationResponse UpdateSettings(IndexSettings settings);
     ISettingsOperationResponse UpdateSettings(string index, IndexSettings settings);
     IElasticSearchVersionInfo VersionInfo { get; }
+	  IQueryResponse<T> Search<T>(SearchDescriptor<T> descriptor) where T : class;
   }
 }