Modifications to SearchTemplate() to better align with the api endpoint

Author: gmarz

src/Nest/DSL/SearchTemplateDescriptor.cs

@@ -53,12 +53,14 @@ public interface ISearchTemplateRequest
 
 		Type ClrType { get; }
 
-		[JsonProperty(PropertyName = "sort")]
-		[JsonConverter(typeof(SortCollectionConverter))]
-		IList<KeyValuePair<PropertyPathMarker, ISort>> Sort { get; set; }
-
 		[JsonProperty(PropertyName = "template")]
-		SearchTemplate Template { get; set; }
+		string Template { get; set; }
+
+		[JsonProperty("file")]
+		string File { get; set; }
+
+		[JsonProperty("id")]
+		string Id { get; set; }
 
 		Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 	}
@@ -68,11 +70,12 @@ public interface ISearchTemplateRequest<T> : ISearchTemplateRequest { }
 	public partial class SearchTemplateRequest 
 		: QueryPathBase<SearchTemplateRequestParameters>, ISearchTemplateRequest
 	{
-		public SearchTemplate Template { get; set; }
+		public string Template { get; set; }
+		public string File { get; set; }
+		public string Id { get; set; }
 		public IDictionary<string, object> Params { get; set; }
 		private Type _clrType { get; set; }
 		Type ISearchTemplateRequest.ClrType { get { return _clrType; } }
-		public IList<KeyValuePair<PropertyPathMarker, ISort>> Sort { get; set; }
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 
 		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<SearchTemplateRequestParameters> pathInfo)
@@ -85,10 +88,11 @@ public partial class SearchTemplateRequest<T>
 		: QueryPathBase<SearchTemplateRequestParameters, T>, ISearchTemplateRequest
 		where T : class
 	{
-		public SearchTemplate Template { get; set; }
+		public string Template { get; set; }
+		public string File { get; set; }
+		public string Id { get; set; }
 		public IDictionary<string, object> Params { get; set; }
 		public Type ClrType { get { return typeof(T); } }
-		public IList<KeyValuePair<PropertyPathMarker, ISort>> Sort { get; set; }
 		public Func<dynamic, Hit<dynamic>, Type> TypeSelector { get; set; }
 
 		protected override void UpdatePathInfo(IConnectionSettingsValues settings, ElasticsearchPathInfo<SearchTemplateRequestParameters> pathInfo)
@@ -110,19 +114,31 @@ public partial class SearchTemplateDescriptor<T>
 		/// </summary>
 		internal bool _Strict { get; set; }
 
-		SearchTemplate ISearchTemplateRequest.Template { get; set; }
+		string ISearchTemplateRequest.Template { get; set; }
 
-		IDictionary<string, object> ISearchTemplateRequest.Params { get; set; }
+		string ISearchTemplateRequest.File { get; set; }
 
-		IList<KeyValuePair<PropertyPathMarker, ISort>> ISearchTemplateRequest.Sort { get; set; }
+		string ISearchTemplateRequest.Id { get; set; }
+
+		IDictionary<string, object> ISearchTemplateRequest.Params { get; set; }
 
 		Func<dynamic, Hit<dynamic>, Type> ISearchTemplateRequest.TypeSelector { get; set; }
 
-		public SearchTemplateDescriptor<T> Template(Func<TemplateDescriptor, TemplateDescriptor> templateSelector)
+		public SearchTemplateDescriptor<T> Template(string template)
+		{
+			this.Self.Template = template;
+			return this;
+		}
+
+		public SearchTemplateDescriptor<T> File(string file)
+		{
+			this.Self.File = file;
+			return this;
+		}
+
+		public SearchTemplateDescriptor<T> Id(string id)
 		{
-			templateSelector.ThrowIfNull("templateSelector");
-			var descriptor = templateSelector(new TemplateDescriptor());
-			this.Self.Template = descriptor.Template;
+			this.Self.Id = id;
 			return this;
 		}
 
@@ -140,21 +156,6 @@ public SearchTemplateDescriptor<T> Params(Func<FluentDictionary<string, object>,
 			return this;
 		}
 
-		/// <summary>
-		/// <para>Sort() allows you to fully describe your sort unlike the SortAscending and SortDescending aliases.
-		/// </para>
-		/// </summary>
-		public SearchTemplateDescriptor<T> Sort(Func<SortFieldDescriptor<T>, IFieldSort> sortSelector)
-		{
-			if (Self.Sort == null)
-				Self.Sort = new List<KeyValuePair<PropertyPathMarker, ISort>>();
-
-			sortSelector.ThrowIfNull("sortSelector");
-			var descriptor = sortSelector(new SortFieldDescriptor<T>());
-			Self.Sort.Add(new KeyValuePair<PropertyPathMarker, ISort>(descriptor.Field, descriptor));
-			return this;
-		}
-
 		public SearchTemplateDescriptor<T> ConcreteTypeSelector(Func<dynamic, Hit<dynamic>, Type> typeSelector)
 		{
 			Self.TypeSelector = typeSelector;
@@ -166,43 +167,4 @@ protected override void UpdatePathInfo(IConnectionSettingsValues settings, Elast
 			SearchTemplatePathInfo.Update(pathInfo);
 		}
 	}
-
-	[JsonObject]
-	public class SearchTemplate
-	{
-		[JsonProperty("file")]
-		public string File { get; set; }
-
-		[JsonProperty("id")]
-		public string Id { get; set; }
-
-		[JsonProperty("query")]
-		public IQueryContainer Query { get; set; }
-	}
-
-	public class TemplateDescriptor
-	{
-		public SearchTemplate Template = new SearchTemplate();
-
-		public TemplateDescriptor File(string file)
-		{
-			Template.File = file;
-			return this;
-		}
-
-		public TemplateDescriptor Id(string id)
-		{
-			Template.Id = id;
-			return this;
-		}
-
-		public TemplateDescriptor Query<T>(Func<QueryDescriptor<T>, QueryContainer> query) where T : class
-		{
-			query.ThrowIfNull("query");
-			var q = new QueryDescriptor<T>();
-			((IQueryContainer)q).IsStrict = true;
-			Template.Query = query(q);
-			return this;
-		}
-	}
 }

src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

@@ -232,6 +232,7 @@
     <Compile Include="Search\QueryResponseMapperTests.cs" />
     <Compile Include="Search\ScriptFields\ScriptFieldsTest.cs" />
     <Compile Include="Search\Scroll\ScrollTests.cs" />
+    <Compile Include="Search\Template\SearchTemplateTests.cs" />
     <Compile Include="Search\SearchTypeTests\SearchTypeScanTests.cs" />
     <Compile Include="Search\SearchTypeTests\SearchTypeCountTests.cs" />
     <Compile Include="Search\SearchTypeTests\SearchTypeTests.cs" />

src/Tests/Nest.Tests.Integration/Search/Template/SearchTemplateTests.cs

@@ -0,0 +1,36 @@
+using FluentAssertions;
+using Nest.Tests.MockData.Domain;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Nest.Tests.Integration.Search.Template
+{
+	[TestFixture]
+	public class SearchTemplateTests : IntegrationTests
+	{
+		[Test]
+		public void SearchTemplateByQuery()
+		{
+			var template = "{\"from\": \"{{my_from}}\",\"size\": \"{{my_size}}\",\"query\": { \"match\": {\"{{my_field}}\": {\"query\": \"{{my_value}}\" }}}}";
+
+			var result = this.Client.SearchTemplate<ElasticsearchProject>(s => s
+				.Template(template)
+				.Params(p => p
+					.Add("my_from", 0)
+					.Add("my_size", 5)
+					.Add("my_field", "name")
+					.Add("my_value", "em-elasticsearch")
+				)
+			);
+
+			result.IsValid.Should().BeTrue();
+			result.Hits.Count().Should().BeGreaterThan(0);
+		}
+	}
+}
+

src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj

@@ -505,7 +505,6 @@
     <Compile Include="Search\Suggest\PhraseSuggestTests.cs" />
     <Compile Include="Search\Suggest\TermSuggestTests.cs" />
     <Compile Include="Settings\UsePrettyResponseTests.cs" />
-    <Compile Include="Template\TemplateSpikeTests.cs" />
     <Compile Include="TestElasticClient.cs" />
     <Compile Include="Core\Update\UpdateTests.cs" />
   </ItemGroup>