Fix #2195 change Query on PhraseSuggestCollate to ITemplateQuery

Author: gmarz

src/Nest/Search/Suggesters/PhraseSuggester/PhraseSuggestCollate.cs

@@ -9,31 +9,28 @@ namespace Nest
 	public interface IPhraseSuggestCollate
 	{
 		[JsonProperty(PropertyName = "query")]
-		IScript Query { get; set; }
+		ITemplateQuery Query { get; set; }
 
 		[JsonProperty(PropertyName = "prune")]
 		bool? Prune { get; set; }
 	}
 
 	public class PhraseSuggestCollate : IPhraseSuggestCollate
 	{
-		public IScript Query { get; set; }
-
+		public ITemplateQuery Query { get; set; }
 
 		public bool? Prune { get; set; }
 	}
 
 	public class PhraseSuggestCollateDescriptor<T> : DescriptorBase<PhraseSuggestCollateDescriptor<T>, IPhraseSuggestCollate>, IPhraseSuggestCollate
 		where T : class
 	{
-		IScript IPhraseSuggestCollate.Query { get; set; }
+		ITemplateQuery IPhraseSuggestCollate.Query { get; set; }
 
 		bool? IPhraseSuggestCollate.Prune { get; set; }
 
-		public PhraseSuggestCollateDescriptor<T> Query(string script) => Assign(a => a.Query = (InlineScript)script);
-
-		public PhraseSuggestCollateDescriptor<T> Query(Func<ScriptDescriptor, IScript> scriptSelector) =>
-			Assign(a => a.Query = scriptSelector?.Invoke(new ScriptDescriptor()));
+		public PhraseSuggestCollateDescriptor<T> Query(Func<TemplateQueryDescriptor<T>, ITemplateQuery> selector) =>
+			Assign(a => a.Query = selector?.Invoke(new TemplateQueryDescriptor<T>()));
 
 		public PhraseSuggestCollateDescriptor<T> Prune(bool? prune = true) => Assign(a => a.Prune = prune);
 	}

src/Tests/Search/Request/SuggestUsageTests.cs

@@ -188,8 +188,9 @@ public SuggestUsageTests(ReadOnlyCluster cluster, EndpointUsage usage) : base(cl
 						{
 							Collate = new PhraseSuggestCollate
 							{
-								Query = new InlineScript("{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}")
+								Query = new TemplateQuery
 								{
+									Inline = "{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}",
 									Params = new Dictionary<string, object>
 									{
 										{ "field_name", "title" }

src/Tests/Search/Suggesters/SuggestApiTests.cs

@@ -196,8 +196,9 @@ protected override LazyResponses ClientUsage() => Calls(
 						{
 							Collate = new PhraseSuggestCollate
 							{
-								Query = new InlineScript("{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}")
+								Query = new TemplateQuery
 								{
+									Inline = "{ \"match\": { \"{{field_name}}\": \"{{suggestion}}\" }}",
 									Params = new Dictionary<string, object>
 									{
 										{ "field_name", "title" }