fixed renamed querystring parameters not using the original querystring param name in the request, SourceEnabled was typed technically correct but not practically, added a way to deprecate requestparams and added EnableSource instead

Author: Mpdreamz

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/ApiGenerator.cs

@@ -10,6 +10,7 @@
 using CodeGeneration.LowLevelClient.Overrides.Allow404;
 using CodeGeneration.LowLevelClient.Overrides.Descriptors;
 using CsQuery;
+using CsQuery.ExtensionMethods.Internal;
 using Newtonsoft.Json;
 using Xipton.Razor;
 
@@ -189,22 +190,37 @@ public static void PatchMethod(CsharpMethod method)
 					if (!renameList.ContainsKey(kv.Key))
 						renameList[kv.Key] = kv.Value;
 
+				var patchedParams = new Dictionary<string, ApiQueryParameters>();
 				foreach (var kv in method.Url.Params)
 				{
+					if (kv.Value.OriginalQueryStringParamName.IsNullOrEmpty())
+						kv.Value.OriginalQueryStringParamName = kv.Key;
 					if (skipList.Contains(kv.Key))
-					{
-						method.Url.Params.Remove(kv.Key);
 						continue;
-					}
 
 					string newName;
 					if (!renameList.TryGetValue(kv.Key, out newName))
+					{
+						patchedParams.Add(kv.Key, kv.Value);
 						continue;
+					}
+					
+					patchedParams.Add(newName, kv.Value);
 
-					method.Url.Params.Remove(kv.Key);
-					method.Url.Params.Add(newName, kv.Value);
-
+					if (newName == "source_enabled")
+					{
+						kv.Value.DeprecatedInFavorOf = "EnableSource";
+						patchedParams.Add("enable_source", new ApiQueryParameters
+						{
+							Description = kv.Value.Description,
+							Options = kv.Value.Options,
+							Type = "boolean",
+							OriginalQueryStringParamName = "_source"
+						});
+					}
 				}
+
+				method.Url.Params = patchedParams;
 			}
 			// ReSharper disable once EmptyGeneralCatchClause
 			catch

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/Domain/ApiQueryParameters.cs

@@ -5,6 +5,8 @@ namespace CodeGeneration.LowLevelClient.Domain
 {
 	public class ApiQueryParameters
 	{
+		public string OriginalQueryStringParamName { get; set; }
+		public string DeprecatedInFavorOf { get; set; }
 		public string Type { get; set; }
 		public string Description { get; set; }
 		public IEnumerable<string> Options { get; set; }

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/Views/RequestParameters.Generated.cshtml

@@ -47,7 +47,7 @@ namespace Elasticsearch.Net
 		public @method.QueryStringParamName @(mm.ToPascalCase())(@kv.Value.CsharpType(mm) @mm)
 		{
 			this._@(mm) = @Raw(setter);
-			this.AddQueryString("@mm", this._@mm);
+			this.AddQueryString("@kv.Value.OriginalQueryStringParamName", this._@mm);
 			return this;
 		}
 		</text>

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/Views/_Descriptors.Generated.cshtml

@@ -43,6 +43,10 @@ namespace Nest
 			var fieldMethod = (mml.Contains("fields") || mml.Contains("sourceinclude") || mml.Contains("sourceexclude") ) && t.Contains("string");
 		<text>
 		///<summary>@kv.Value.Description</summary>
+		@if(!string.IsNullOrWhiteSpace(kv.Value.DeprecatedInFavorOf))
+		{
+		<text>[Obsolete("Scheduled to be removed in 2.0, use @kv.Value.DeprecatedInFavorOf instead")]</text>
+		}
 		public @Raw(type) @(mm)(@t @kv.Key@tSuffix)
 		{
 			this.Request.RequestParameters.@(m)(@kv.Key);

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/Views/_Requests.Generated.cshtml

@@ -39,7 +39,7 @@ namespace Nest
 			{
 	@foreach (KeyValuePair<string, ApiQueryParameters> kv in method.Url.Params)
 	{
-		  var original = kv.Key;
+		  var original = kv.Value.OriginalQueryStringParamName;
 		  var cased = kv.Key.ToPascalCase();
 		  var mm = (cased != "Type" && cased != "Index" && cased != "Script") ? cased : cased + "QueryString";
 		  var fieldType = kv.Value.CsharpType(kv.Key).Replace("params", "");
@@ -54,6 +54,10 @@ namespace Nest
 		  }
 		<text>
 		///<summary>@kv.Value.Description</summary>
+		@if(!string.IsNullOrWhiteSpace(kv.Value.DeprecatedInFavorOf))
+		{
+		<text>[Obsolete("Scheduled to be removed in 2.0, use @kv.Value.DeprecatedInFavorOf instead")]</text>
+		}
 		public @Raw(fieldType) @(mm) 
 		{ 
 			get { return this.Request.RequestParameters.GetQueryStringValue@(Raw("<" + fieldType + ">"))("@original"); } 

Diff for: src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs

@@ -1876,7 +1876,17 @@ public ExplainRequestParameters Source(string source)
 		public ExplainRequestParameters SourceEnabled(params string[] source_enabled)
 		{
 			this._source_enabled = source_enabled;
-			this.AddQueryString("source_enabled", this._source_enabled);
+			this.AddQueryString("_source", this._source_enabled);
+			return this;
+		}
+		
+		
+		internal bool _enable_source { get; set; }
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public ExplainRequestParameters EnableSource(bool enable_source)
+		{
+			this._enable_source = enable_source;
+			this.AddQueryString("_source", this._enable_source);
 			return this;
 		}
 
@@ -1886,7 +1896,7 @@ public ExplainRequestParameters SourceEnabled(params string[] source_enabled)
 		public ExplainRequestParameters SourceExclude(params string[] source_exclude)
 		{
 			this._source_exclude = source_exclude.Select(f=>(object)f);
-			this.AddQueryString("source_exclude", this._source_exclude);
+			this.AddQueryString("_source_exclude", this._source_exclude);
 			return this;
 		}
 
@@ -1896,7 +1906,7 @@ public ExplainRequestParameters SourceExclude(params string[] source_exclude)
 		public ExplainRequestParameters SourceInclude(params string[] source_include)
 		{
 			this._source_include = source_include.Select(f=>(object)f);
-			this.AddQueryString("source_include", this._source_include);
+			this.AddQueryString("_source_include", this._source_include);
 			return this;
 		}
 
@@ -1976,7 +1986,17 @@ public GetRequestParameters Routing(string routing)
 		public GetRequestParameters SourceEnabled(params string[] source_enabled)
 		{
 			this._source_enabled = source_enabled;
-			this.AddQueryString("source_enabled", this._source_enabled);
+			this.AddQueryString("_source", this._source_enabled);
+			return this;
+		}
+		
+		
+		internal bool _enable_source { get; set; }
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public GetRequestParameters EnableSource(bool enable_source)
+		{
+			this._enable_source = enable_source;
+			this.AddQueryString("_source", this._enable_source);
 			return this;
 		}
 
@@ -1986,7 +2006,7 @@ public GetRequestParameters SourceEnabled(params string[] source_enabled)
 		public GetRequestParameters SourceExclude(params string[] source_exclude)
 		{
 			this._source_exclude = source_exclude.Select(f=>(object)f);
-			this.AddQueryString("source_exclude", this._source_exclude);
+			this.AddQueryString("_source_exclude", this._source_exclude);
 			return this;
 		}
 
@@ -1996,7 +2016,7 @@ public GetRequestParameters SourceExclude(params string[] source_exclude)
 		public GetRequestParameters SourceInclude(params string[] source_include)
 		{
 			this._source_include = source_include.Select(f=>(object)f);
-			this.AddQueryString("source_include", this._source_include);
+			this.AddQueryString("_source_include", this._source_include);
 			return this;
 		}
 
@@ -2086,7 +2106,17 @@ public SourceRequestParameters Routing(string routing)
 		public SourceRequestParameters SourceEnabled(params string[] source_enabled)
 		{
 			this._source_enabled = source_enabled;
-			this.AddQueryString("source_enabled", this._source_enabled);
+			this.AddQueryString("_source", this._source_enabled);
+			return this;
+		}
+		
+		
+		internal bool _enable_source { get; set; }
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public SourceRequestParameters EnableSource(bool enable_source)
+		{
+			this._enable_source = enable_source;
+			this.AddQueryString("_source", this._enable_source);
 			return this;
 		}
 
@@ -2096,7 +2126,7 @@ public SourceRequestParameters SourceEnabled(params string[] source_enabled)
 		public SourceRequestParameters SourceExclude(params string[] source_exclude)
 		{
 			this._source_exclude = source_exclude.Select(f=>(object)f);
-			this.AddQueryString("source_exclude", this._source_exclude);
+			this.AddQueryString("_source_exclude", this._source_exclude);
 			return this;
 		}
 
@@ -2106,7 +2136,7 @@ public SourceRequestParameters SourceExclude(params string[] source_exclude)
 		public SourceRequestParameters SourceInclude(params string[] source_include)
 		{
 			this._source_include = source_include.Select(f=>(object)f);
-			this.AddQueryString("source_include", this._source_include);
+			this.AddQueryString("_source_include", this._source_include);
 			return this;
 		}
 
@@ -4166,7 +4196,17 @@ public MultiGetRequestParameters Refresh(bool refresh)
 		public MultiGetRequestParameters SourceEnabled(params string[] source_enabled)
 		{
 			this._source_enabled = source_enabled;
-			this.AddQueryString("source_enabled", this._source_enabled);
+			this.AddQueryString("_source", this._source_enabled);
+			return this;
+		}
+		
+		
+		internal bool _enable_source { get; set; }
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public MultiGetRequestParameters EnableSource(bool enable_source)
+		{
+			this._enable_source = enable_source;
+			this.AddQueryString("_source", this._enable_source);
 			return this;
 		}
 
@@ -4176,7 +4216,7 @@ public MultiGetRequestParameters SourceEnabled(params string[] source_enabled)
 		public MultiGetRequestParameters SourceExclude(params string[] source_exclude)
 		{
 			this._source_exclude = source_exclude.Select(f=>(object)f);
-			this.AddQueryString("source_exclude", this._source_exclude);
+			this.AddQueryString("_source_exclude", this._source_exclude);
 			return this;
 		}
 
@@ -4186,7 +4226,7 @@ public MultiGetRequestParameters SourceExclude(params string[] source_exclude)
 		public MultiGetRequestParameters SourceInclude(params string[] source_include)
 		{
 			this._source_include = source_include.Select(f=>(object)f);
-			this.AddQueryString("source_include", this._source_include);
+			this.AddQueryString("_source_include", this._source_include);
 			return this;
 		}
 
@@ -4596,7 +4636,7 @@ public NodesHotThreadsRequestParameters Threads(long threads)
 		public NodesHotThreadsRequestParameters ThreadType(ThreadType thread_type)
 		{
 			this._thread_type = thread_type;
-			this.AddQueryString("thread_type", this._thread_type);
+			this.AddQueryString("type", this._thread_type);
 			return this;
 		}
 

Diff for: src/Nest/DSL/_Descriptors.generated.cs

@@ -1778,13 +1778,22 @@ public ExplainDescriptor<T> Source(string source)
 
 
 		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		[Obsolete("Scheduled to be removed in 2.0, use EnableSource instead")]
 		public ExplainDescriptor<T> SourceEnabled(params string[] source_enabled)
 		{
 			this.Request.RequestParameters.SourceEnabled(source_enabled);
 			return this;
 		}
 
 
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public ExplainDescriptor<T> EnableSource(bool enable_source = true)
+		{
+			this.Request.RequestParameters.EnableSource(enable_source);
+			return this;
+		}
+		
+
 		///<summary>A list of fields to exclude from the returned _source field</summary>
 		public ExplainDescriptor<T> SourceExclude(params string[] source_exclude)
 		{
@@ -1896,13 +1905,22 @@ public GetDescriptor<T> Routing(string routing)
 
 
 		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		[Obsolete("Scheduled to be removed in 2.0, use EnableSource instead")]
 		public GetDescriptor<T> SourceEnabled(params string[] source_enabled)
 		{
 			this.Request.RequestParameters.SourceEnabled(source_enabled);
 			return this;
 		}
 
 
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public GetDescriptor<T> EnableSource(bool enable_source = true)
+		{
+			this.Request.RequestParameters.EnableSource(enable_source);
+			return this;
+		}
+		
+
 		///<summary>A list of fields to exclude from the returned _source field</summary>
 		public GetDescriptor<T> SourceExclude(params string[] source_exclude)
 		{
@@ -2011,13 +2029,22 @@ public SourceDescriptor<T> Routing(string routing)
 
 
 		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		[Obsolete("Scheduled to be removed in 2.0, use EnableSource instead")]
 		public SourceDescriptor<T> SourceEnabled(params string[] source_enabled)
 		{
 			this.Request.RequestParameters.SourceEnabled(source_enabled);
 			return this;
 		}
 
 
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public SourceDescriptor<T> EnableSource(bool enable_source = true)
+		{
+			this.Request.RequestParameters.EnableSource(enable_source);
+			return this;
+		}
+		
+
 		///<summary>A list of fields to exclude from the returned _source field</summary>
 		public SourceDescriptor<T> SourceExclude(params string[] source_exclude)
 		{
@@ -3998,13 +4025,22 @@ public MultiGetDescriptor Refresh(bool refresh = true)
 
 
 		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		[Obsolete("Scheduled to be removed in 2.0, use EnableSource instead")]
 		public MultiGetDescriptor SourceEnabled(params string[] source_enabled)
 		{
 			this.Request.RequestParameters.SourceEnabled(source_enabled);
 			return this;
 		}
 
 
+		///<summary>True or false to return the _source field or not, or a list of fields to return</summary>
+		public MultiGetDescriptor EnableSource(bool enable_source = true)
+		{
+			this.Request.RequestParameters.EnableSource(enable_source);
+			return this;
+		}
+		
+
 		///<summary>A list of fields to exclude from the returned _source field</summary>
 		public MultiGetDescriptor SourceExclude(params string[] source_exclude)
 		{