Fix _suggest serialization and add integration tests

Author: gmarz

src/Nest/Search/Suggesters/BaseSuggest.cs

@@ -31,8 +31,8 @@ public abstract class SuggesterBase : ISuggester
 	}
 
 	[JsonObject(MemberSerialization = MemberSerialization.OptIn)]
-	public abstract class SuggesterBaseDescriptor<TDescriptor, TInterface, T> : DescriptorBase<TDescriptor, TInterface>, ISuggester
-		where TDescriptor : SuggesterBaseDescriptor<TDescriptor, TInterface, T>, TInterface, ISuggester
+	public abstract class SuggestDescriptorBase<TDescriptor, TInterface, T> : DescriptorBase<TDescriptor, TInterface>, ISuggester
+		where TDescriptor : SuggestDescriptorBase<TDescriptor, TInterface, T>, TInterface, ISuggester
 		where TInterface : class, ISuggester
 	{
 		string ISuggester.Text { get; set; }

src/Nest/Search/Suggesters/CompletionSuggester/CompletionSuggester.cs

@@ -21,7 +21,7 @@ public class CompletionSuggester : SuggesterBase, ICompletionSuggester
 		public IDictionary<string, object> Context { get; set; }
 	}
 
-	public class CompletionSuggesterDescriptor<T> : SuggesterBaseDescriptor<CompletionSuggesterDescriptor<T>, ICompletionSuggester, T>, ICompletionSuggester 
+	public class CompletionSuggesterDescriptor<T> : SuggestDescriptorBase<CompletionSuggesterDescriptor<T>, ICompletionSuggester, T>, ICompletionSuggester 
 		where T : class
 	{
 		IFuzzySuggester ICompletionSuggester.Fuzzy { get; set; }

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

@@ -46,7 +46,7 @@ public class PhraseSuggester : SuggesterBase, IPhraseSuggester
 		public IPhraseSuggestCollate Collate { get; set; }
 	}
 
-	public class PhraseSuggesterDescriptor<T> : SuggesterBaseDescriptor<PhraseSuggesterDescriptor<T>, IPhraseSuggester, T>, IPhraseSuggester
+	public class PhraseSuggesterDescriptor<T> : SuggestDescriptorBase<PhraseSuggesterDescriptor<T>, IPhraseSuggester, T>, IPhraseSuggester
 		where T : class
 	{
 		int? IPhraseSuggester.GramSize { get; set; }

src/Nest/Search/Suggesters/Suggest/SuggestRequest.cs

@@ -8,72 +8,53 @@ namespace Nest
 	public partial interface ISuggestRequest 
 	{
 		string GlobalText { get; set; }
-		IDictionary<string, ISuggester> Suggest { get; set; }
+		ISuggestContainer Suggest { get; set; }
 	}
 
 	public partial class SuggestRequest 
 	{
 		public string GlobalText { get; set; }
-		public IDictionary<string, ISuggester> Suggest { get; set; }
+		public ISuggestContainer Suggest { get; set; }
 	}
 
 	[DescriptorFor("Suggest")]
 	public partial class SuggestDescriptor<T> where T : class
 	{
 		string ISuggestRequest.GlobalText { get; set; }
-		IDictionary<string, ISuggester> ISuggestRequest.Suggest { get; set; } = new Dictionary<string, ISuggester>();
+		ISuggestContainer ISuggestRequest.Suggest { get; set; } = new SuggestContainer();
 
 		/// <summary>
 		/// To avoid repetition of the suggest text, it is possible to define a global text.
 		/// </summary>
-		public SuggestDescriptor<T> GlobalText(string globalSuggestText)
-		{
-			Self.GlobalText = globalSuggestText;
-			return this;
-		}
+		public SuggestDescriptor<T> GlobalText(string globalText) => Assign(a => a.GlobalText = globalText);
 
 		/// <summary>
 		/// The term suggester suggests terms based on edit distance. The provided suggest text is analyzed before terms are suggested. 
 		/// The suggested terms are provided per analyzed suggest text token. The term suggester doesn’t take the query into account that is part of request.
 		/// </summary>
-		public SuggestDescriptor<T> Term(string name, Func<TermSuggesterDescriptor<T>, TermSuggesterDescriptor<T>> suggest)
-		{
-			name.ThrowIfNullOrEmpty(nameof(name));
-			suggest.ThrowIfNull(nameof(suggest));
-			var desc = new TermSuggesterDescriptor<T>();
-			var item = suggest(desc);
-			Self.Suggest.Add(name, item);
-			return this;
-		}
+		public SuggestDescriptor<T> Term(string name, Func<TermSuggesterDescriptor<T>, ITermSuggester> suggest) =>
+			AssignToBucket(name, suggest?.Invoke(new TermSuggesterDescriptor<T>()), (b, s) => b.Term = s);  
 
 		/// <summary>
 		/// The phrase suggester adds additional logic on top of the term suggester to select entire corrected phrases 
 		/// instead of individual tokens weighted based on ngram-langugage models. 
 		/// </summary>
-		public SuggestDescriptor<T> Phrase(string name, Func<PhraseSuggesterDescriptor<T>, PhraseSuggesterDescriptor<T>> suggest)
-		{
-			name.ThrowIfNullOrEmpty(nameof(name));
-			suggest.ThrowIfNull(nameof(suggest));
-
-			var desc = new PhraseSuggesterDescriptor<T>();
-			var item = suggest(desc);
-			Self.Suggest.Add(name, item);
-			return this;
-		}
+		public SuggestDescriptor<T> Phrase(string name, Func<PhraseSuggesterDescriptor<T>, IPhraseSuggester> suggest) =>
+			AssignToBucket(name, suggest?.Invoke(new PhraseSuggesterDescriptor<T>()), (b, s) => b.Phrase = s);  
 
 		/// <summary>
 		/// The completion suggester is a so-called prefix suggester. 
 		/// It does not do spell correction like the term or phrase suggesters but allows basic auto-complete functionality.
 		/// </summary>
-		public SuggestDescriptor<T> Completion(string name, Func<CompletionSuggesterDescriptor<T>, CompletionSuggesterDescriptor<T>> suggest)
-		{
-			name.ThrowIfNullOrEmpty(nameof(name));
-			suggest.ThrowIfNull(nameof(suggest));
+		public SuggestDescriptor<T> Completion(string name, Func<CompletionSuggesterDescriptor<T>, ICompletionSuggester> suggest) =>
+			AssignToBucket(name, suggest?.Invoke(new CompletionSuggesterDescriptor<T>()), (b, s) => b.Completion = s);  
 
-			var desc = new CompletionSuggesterDescriptor<T>();
-			var item = suggest(desc);
-			Self.Suggest.Add(name, item);
-			return this;
+		private SuggestDescriptor<T> AssignToBucket<TSuggester>(string name, TSuggester suggester, Action<SuggestBucket, TSuggester> assign)
+			where TSuggester : ISuggester
+		{
+			var bucket = new SuggestBucket { Text = suggester.Text };
+			assign(bucket, suggester);
+			return Assign(a => a.Suggest.Add(name, bucket));
 		}
 	}
 }

src/Nest/Search/Suggesters/Suggest/SuggestRequestJsonConverter.cs

@@ -7,22 +7,21 @@ namespace Nest
 {
 	internal class SuggestRequestJsonConverter : JsonConverter
 	{
-		public override bool CanRead => true;
+		public override bool CanRead => false;
 		public override bool CanWrite => true;
 		public override bool CanConvert(Type objectType) => true;
 
 		public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
 		{
-			var searchRequest = serializer.Deserialize<SearchRequest>(reader);
-			return new PutWarmerRequest("unknown name because its not on the body when deserializing") { Search = searchRequest };
+			throw new NotSupportedException();
 		}
 
 		public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
 		{
 			var suggestRequest = value as ISuggestRequest;
 			if (suggestRequest == null) return;
 
-			var dict = new Dictionary<string, object>();
+			writer.WriteStartObject();
 			if (!suggestRequest.GlobalText.IsNullOrEmpty())
 			{
 				writer.WritePropertyName("text");
@@ -33,23 +32,11 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
 			{
 				foreach (var kv in suggestRequest.Suggest)
 				{
-					var item = kv.Value;
-					var bucket = new SuggestBucket() { Text = item.Text };
-
-					var completion = item as ICompletionSuggester;
-					if (completion != null) bucket.Completion = completion;
-
-					var phrase = item as IPhraseSuggester;
-					if (phrase != null) bucket.Phrase = phrase;
-
-					var term = item as ITermSuggester;
-					if (term != null) bucket.Term = term;
-
 					writer.WritePropertyName(kv.Key);
-					serializer.Serialize(writer, bucket);
-					dict.Add(kv.Key, bucket);
+					serializer.Serialize(writer, kv.Value);
 				}
 			}
+			writer.WriteEndObject();
 		}
 	}
 }

src/Nest/Search/Suggesters/SuggestBucket.cs

@@ -8,10 +8,13 @@ public interface ISuggestBucket
 	{
 		[JsonProperty("text")]
 		string Text { get; set; }
+
 		[JsonProperty("term")]
 		ITermSuggester Term { get; set; }
+
 		[JsonProperty("phrase")]
 		IPhraseSuggester Phrase { get; set; }
+
 		[JsonProperty("completion")]
 		ICompletionSuggester Completion { get; set; }
 	}

src/Nest/Search/Suggesters/TermSuggester/TermSuggester.cs

@@ -42,7 +42,8 @@ public class TermSuggester : SuggesterBase, ITermSuggester
 		public decimal? MaxTermFrequency { get; set; }
 	}
 
-	public class TermSuggesterDescriptor<T> : SuggesterBaseDescriptor<TermSuggesterDescriptor<T>, ITermSuggester, T>, ITermSuggester 
+	public class TermSuggesterDescriptor<T> 
+		: SuggestDescriptorBase<TermSuggesterDescriptor<T>, ITermSuggester, T>, ITermSuggester 
 		where T : class
 	{
 		int? ITermSuggester.PrefixLen { get; set; }