we now deal with enum types properly when to stringing them

Author: Mpdreamz

src/Nest.Tests.Integration/ConnectionTests.cs

@@ -114,5 +114,14 @@ public void ConnectUsingRawClient()
 
 			StringAssert.EndsWith(":9200/?hello=world&pretty=true", resultWithQueryString.RequestUrl);
 		}
+
+		[Test]
+		public void ConnectUsingRawClientComplexCall()
+		{
+			var result = this._client.Raw.ClusterHealthGet(s=>s.Level(LevelOptions.Indices).Local(true));
+			Assert.IsTrue(result.Success);
+			StringAssert.EndsWith(":9200/_cluster/health?level=indices&local=true&pretty=true", result.RequestUrl);
+
+		}
 	}
 }

src/Nest/Enums/Enums.Generated.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
+using System.Runtime.Serialization;
 
 ///This file contains all the typed enums that the client rest api spec exposes.
 ///This file is automatically generated from https://github.com/elasticsearch/elasticsearch-rest-api-spec
@@ -15,195 +16,195 @@ namespace Nest
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum ConsistencyOptions 
 	{
-		[JsonProperty("one")]
+		[EnumMember(Value = "one")]
 		One,
-		[JsonProperty("quorum")]
+		[EnumMember(Value = "quorum")]
 		Quorum,
-		[JsonProperty("all")]
+		[EnumMember(Value = "all")]
 		All
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum ReplicationOptions 
 	{
-		[JsonProperty("sync")]
+		[EnumMember(Value = "sync")]
 		Sync,
-		[JsonProperty("async")]
+		[EnumMember(Value = "async")]
 		Async
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum LevelOptions 
 	{
-		[JsonProperty("cluster")]
+		[EnumMember(Value = "cluster")]
 		Cluster,
-		[JsonProperty("indices")]
+		[EnumMember(Value = "indices")]
 		Indices,
-		[JsonProperty("shards")]
+		[EnumMember(Value = "shards")]
 		Shards
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum WaitForStatusOptions 
 	{
-		[JsonProperty("green")]
+		[EnumMember(Value = "green")]
 		Green,
-		[JsonProperty("yellow")]
+		[EnumMember(Value = "yellow")]
 		Yellow,
-		[JsonProperty("red")]
+		[EnumMember(Value = "red")]
 		Red
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum TypeOptions 
 	{
-		[JsonProperty("cpu")]
+		[EnumMember(Value = "cpu")]
 		Cpu,
-		[JsonProperty("wait")]
+		[EnumMember(Value = "wait")]
 		Wait,
-		[JsonProperty("block")]
+		[EnumMember(Value = "block")]
 		Block
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum IgnoreIndicesOptions 
 	{
-		[JsonProperty("none")]
+		[EnumMember(Value = "none")]
 		None,
-		[JsonProperty("missing")]
+		[EnumMember(Value = "missing")]
 		Missing
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum VersionTypeOptions 
 	{
-		[JsonProperty("internal")]
+		[EnumMember(Value = "internal")]
 		Internal,
-		[JsonProperty("external")]
+		[EnumMember(Value = "external")]
 		External
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum DefaultOperatorOptions 
 	{
-		[JsonProperty("AND")]
+		[EnumMember(Value = "AND")]
 		And,
-		[JsonProperty("OR")]
+		[EnumMember(Value = "OR")]
 		Or
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum OpTypeOptions 
 	{
-		[JsonProperty("index")]
+		[EnumMember(Value = "index")]
 		Index,
-		[JsonProperty("create")]
+		[EnumMember(Value = "create")]
 		Create
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum FormatOptions 
 	{
-		[JsonProperty("detailed")]
+		[EnumMember(Value = "detailed")]
 		Detailed,
-		[JsonProperty("text")]
+		[EnumMember(Value = "text")]
 		Text
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum SearchTypeOptions 
 	{
-		[JsonProperty("query_then_fetch")]
+		[EnumMember(Value = "query_then_fetch")]
 		QueryThenFetch,
-		[JsonProperty("query_and_fetch")]
+		[EnumMember(Value = "query_and_fetch")]
 		QueryAndFetch,
-		[JsonProperty("dfs_query_then_fetch")]
+		[EnumMember(Value = "dfs_query_then_fetch")]
 		DfsQueryThenFetch,
-		[JsonProperty("dfs_query_and_fetch")]
+		[EnumMember(Value = "dfs_query_and_fetch")]
 		DfsQueryAndFetch,
-		[JsonProperty("count")]
+		[EnumMember(Value = "count")]
 		Count,
-		[JsonProperty("scan")]
+		[EnumMember(Value = "scan")]
 		Scan
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum SuggestModeOptions 
 	{
-		[JsonProperty("missing")]
+		[EnumMember(Value = "missing")]
 		Missing,
-		[JsonProperty("popular")]
+		[EnumMember(Value = "popular")]
 		Popular,
-		[JsonProperty("always")]
+		[EnumMember(Value = "always")]
 		Always
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum MetricFamilyOptions 
 	{
-		[JsonProperty("all")]
+		[EnumMember(Value = "all")]
 		All,
-		[JsonProperty("fs")]
+		[EnumMember(Value = "fs")]
 		Fs,
-		[JsonProperty("http")]
+		[EnumMember(Value = "http")]
 		Http,
-		[JsonProperty("indices")]
+		[EnumMember(Value = "indices")]
 		Indices,
-		[JsonProperty("jvm")]
+		[EnumMember(Value = "jvm")]
 		Jvm,
-		[JsonProperty("network")]
+		[EnumMember(Value = "network")]
 		Network,
-		[JsonProperty("os")]
+		[EnumMember(Value = "os")]
 		Os,
-		[JsonProperty("process")]
+		[EnumMember(Value = "process")]
 		Process,
-		[JsonProperty("thread_pool")]
+		[EnumMember(Value = "thread_pool")]
 		ThreadPool,
-		[JsonProperty("transport")]
+		[EnumMember(Value = "transport")]
 		Transport
 	}
 
 
 	[JsonConverter(typeof(StringEnumConverter))]
 	public enum MetricOptions 
 	{
-		[JsonProperty("completion")]
+		[EnumMember(Value = "completion")]
 		Completion,
-		[JsonProperty("docs")]
+		[EnumMember(Value = "docs")]
 		Docs,
-		[JsonProperty("fielddata")]
+		[EnumMember(Value = "fielddata")]
 		Fielddata,
-		[JsonProperty("filter_cache")]
+		[EnumMember(Value = "filter_cache")]
 		FilterCache,
-		[JsonProperty("flush")]
+		[EnumMember(Value = "flush")]
 		Flush,
-		[JsonProperty("get")]
+		[EnumMember(Value = "get")]
 		Get,
-		[JsonProperty("id_cache")]
+		[EnumMember(Value = "id_cache")]
 		IdCache,
-		[JsonProperty("indexing")]
+		[EnumMember(Value = "indexing")]
 		Indexing,
-		[JsonProperty("merges")]
+		[EnumMember(Value = "merges")]
 		Merges,
-		[JsonProperty("refresh")]
+		[EnumMember(Value = "refresh")]
 		Refresh,
-		[JsonProperty("search")]
+		[EnumMember(Value = "search")]
 		Search,
-		[JsonProperty("store")]
+		[EnumMember(Value = "store")]
 		Store,
-		[JsonProperty("warmer")]
+		[EnumMember(Value = "warmer")]
 		Warmer
 	}