run code gen

Mpdreamz · russcam · commit 023f0e82c21d · 2019-03-20T22:54:38.000+10:00
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs
@@ -6,7 +6,10 @@ namespace ApiGenerator.Domain
 {
 	public class ApiQueryParameters
 	{
-		private static readonly string[] FieldsParams = { "fields", "_source_include", "_source_exclude" };
+		private static readonly string[] FieldsParams =
+		{
+			"fields", "_source_include", "_source_exclude", "_source_includes", "_source_excludes",
+		};
 
 		public string ClsArgumentName => ClsName.ToCamelCase();
 
diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs
@@ -50,7 +50,7 @@ public static Dictionary<string, ApiQueryParameters> Patch(
 				//make sure source_enabled takes a boolean only
 				if (preferredName == "source_enabled") kv.Value.Type = "boolean";
 
-				patchedParams.Add(preferredName, kv.Value);
+				patchedParams[preferredName] = kv.Value;
 			}
 
 			return patchedParams;
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/SearchOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/SearchOverrides.cs
@@ -17,6 +17,8 @@ public class SearchOverrides : EndpointOverridesBase
 			"_source",
 			"_source_include",
 			"_source_exclude",
+			"_source_includes",
+			"_source_excludes",
 			"track_scores",
 			"terminate_after",
 		};
diff --git a/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/UpdateOverrides.cs b/src/CodeGeneration/ApiGenerator/Overrides/Endpoints/UpdateOverrides.cs
@@ -7,7 +7,9 @@ public class UpdateOverrides : EndpointOverridesBase
 	{
 		public override IEnumerable<string> SkipQueryStringParams => new[]
 		{
-			"fields", "_source_include", "_source_exclude"
+			"fields",
+			"_source_include", "_source_exclude",
+			"_source_includes", "_source_excludes"
 		};
 	}
 }
diff --git a/src/Elasticsearch.Net/Domain/Enums.Generated.cs b/src/Elasticsearch.Net/Domain/Enums.Generated.cs
@@ -210,8 +210,9 @@ [Flags]public enum NodesUsageMetric
 	[Flags]public enum WatcherStatsMetric
 	{
 		[EnumMember(Value = "queued_watches")] QueuedWatches = 1 << 0,
-		[EnumMember(Value = "pending_watches")] PendingWatches = 1 << 1,
-		[EnumMember(Value = "_all")] All = 1 << 2
+		[EnumMember(Value = "current_watches")] CurrentWatches = 1 << 1,
+		[EnumMember(Value = "pending_watches")] PendingWatches = 1 << 2,
+		[EnumMember(Value = "_all")] All = 1 << 3
 	}
 	public static class KnownEnums
 	{
@@ -534,6 +535,7 @@ public static string GetStringValue(this WatcherStatsMetric enumValue)
 			if ((enumValue & WatcherStatsMetric.All) != 0) return "_all";
 			var list = new List<string>();
 			if ((enumValue & WatcherStatsMetric.QueuedWatches) != 0) list.Add("queued_watches");
+			if ((enumValue & WatcherStatsMetric.CurrentWatches) != 0) list.Add("current_watches");
 			if ((enumValue & WatcherStatsMetric.PendingWatches) != 0) list.Add("pending_watches");
 			return string.Join(",", list);
 		}
diff --git a/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs b/src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs
diff --git a/src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs b/src/Elasticsearch.Net/ElasticLowLevelClient.Generated.cs
@@ -2190,20 +2190,20 @@ public TResponse NodesInfo<TResponse>(string node_id, string metric, NodesInfoRe
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public Task<TResponse> NodesInfoAsync<TResponse>(string node_id, string metric, NodesInfoRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
 			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(GET, Url($"_nodes/{node_id.NotNull("node_id")}/{metric.NotNull("metric")}"), ctx, null, _params(requestParameters));
-		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public TResponse NodesReloadSecureSettingsForAll<TResponse>(ReloadSecureSettingsRequestParameters requestParameters = null)
 			where TResponse : class, IElasticsearchResponse, new() => this.DoRequest<TResponse>(POST, Url($"_nodes/reload_secure_settings"), null, _params(requestParameters));
-		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public Task<TResponse> NodesReloadSecureSettingsForAllAsync<TResponse>(ReloadSecureSettingsRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
 			where TResponse : class, IElasticsearchResponse, new() => this.DoRequestAsync<TResponse>(POST, Url($"_nodes/reload_secure_settings"), ctx, null, _params(requestParameters));
-		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="node_id">A comma-separated list of node IDs to span the reload/reinit call. Should stay empty because reloading usually involves all cluster nodes.</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public TResponse NodesReloadSecureSettings<TResponse>(string node_id, ReloadSecureSettingsRequestParameters requestParameters = null)
 			where TResponse : class, IElasticsearchResponse, new() => this.DoRequest<TResponse>(POST, Url($"_nodes/{node_id.NotNull("node_id")}/reload_secure_settings"), null, _params(requestParameters));
-		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="node_id">A comma-separated list of node IDs to span the reload/reinit call. Should stay empty because reloading usually involves all cluster nodes.</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		public Task<TResponse> NodesReloadSecureSettingsAsync<TResponse>(string node_id, ReloadSecureSettingsRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken))
diff --git a/src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs b/src/Elasticsearch.Net/IElasticLowLevelClient.Generated.cs
@@ -1772,17 +1772,17 @@ public partial interface IElasticLowLevelClient
 		///<param name="metric">A comma-separated list of metrics you wish returned. Leave empty to return all.</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		Task<TResponse> NodesInfoAsync<TResponse>(string node_id, string metric, NodesInfoRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
-		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		TResponse NodesReloadSecureSettingsForAll<TResponse>(ReloadSecureSettingsRequestParameters requestParameters = null) where TResponse : class, IElasticsearchResponse, new();
-		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		Task<TResponse> NodesReloadSecureSettingsForAllAsync<TResponse>(ReloadSecureSettingsRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
-		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="node_id">A comma-separated list of node IDs to span the reload/reinit call. Should stay empty because reloading usually involves all cluster nodes.</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		TResponse NodesReloadSecureSettings<TResponse>(string node_id, ReloadSecureSettingsRequestParameters requestParameters = null) where TResponse : class, IElasticsearchResponse, new();
-		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.5/secure-settings.html#reloadable-secure-settings</para></summary>
+		///<summary>POST on /_nodes/{node_id}/reload_secure_settings <para>https://www.elastic.co/guide/en/elasticsearch/reference/6.x/secure-settings.html#reloadable-secure-settings</para></summary>
 		///<param name="node_id">A comma-separated list of node IDs to span the reload/reinit call. Should stay empty because reloading usually involves all cluster nodes.</param>
 		///<param name="requestParameters">A func that allows you to describe the querystring parameters &amp; request specific connection settings.</param>
 		Task<TResponse> NodesReloadSecureSettingsAsync<TResponse>(string node_id, ReloadSecureSettingsRequestParameters requestParameters = null, CancellationToken ctx = default(CancellationToken)) where TResponse : class, IElasticsearchResponse, new();
diff --git a/src/Nest/_Generated/_Descriptors.generated.cs b/src/Nest/_Generated/_Descriptors.generated.cs
diff --git a/src/Nest/_Generated/_Requests.generated.cs b/src/Nest/_Generated/_Requests.generated.cs

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,10 @@ namespace ApiGenerator.Domain`
`6`	`6`	`{`
`7`	`7`	`public class ApiQueryParameters`
`8`	`8`	`{`
`9`		`- private static readonly string[] FieldsParams = { "fields", "_source_include", "_source_exclude" };`
	`9`	`+ private static readonly string[] FieldsParams =`
	`10`	`+ {`
	`11`	`+ "fields", "_source_include", "_source_exclude", "_source_includes", "_source_excludes",`
	`12`	`+ };`
`10`	`13`
`11`	`14`	`public string ClsArgumentName => ClsName.ToCamelCase();`
`12`	`15`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public static Dictionary<string, ApiQueryParameters> Patch(`
`50`	`50`	`//make sure source_enabled takes a boolean only`
`51`	`51`	`if (preferredName == "source_enabled") kv.Value.Type = "boolean";`
`52`	`52`
`53`		`- patchedParams.Add(preferredName, kv.Value);`
	`53`	`+ patchedParams[preferredName] = kv.Value;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return patchedParams;`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,9 @@ public class UpdateOverrides : EndpointOverridesBase`
`7`	`7`	`{`
`8`	`8`	`public override IEnumerable<string> SkipQueryStringParams => new[]`
`9`	`9`	`{`
`10`		`- "fields", "_source_include", "_source_exclude"`
	`10`	`+ "fields",`
	`11`	`+ "_source_include", "_source_exclude",`
	`12`	`+ "_source_includes", "_source_excludes"`
`11`	`13`	`};`
`12`	`14`	`}`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -210,8 +210,9 @@ [Flags]public enum NodesUsageMetric`
`210`	`210`	`[Flags]public enum WatcherStatsMetric`
`211`	`211`	`{`
`212`	`212`	`[EnumMember(Value = "queued_watches")] QueuedWatches = 1 << 0,`
`213`		`- [EnumMember(Value = "pending_watches")] PendingWatches = 1 << 1,`
`214`		`- [EnumMember(Value = "_all")] All = 1 << 2`
	`213`	`+ [EnumMember(Value = "current_watches")] CurrentWatches = 1 << 1,`
	`214`	`+ [EnumMember(Value = "pending_watches")] PendingWatches = 1 << 2,`
	`215`	`+ [EnumMember(Value = "_all")] All = 1 << 3`
`215`	`216`	`}`
`216`	`217`	`public static class KnownEnums`
`217`	`218`	`{`
`@@ -534,6 +535,7 @@ public static string GetStringValue(this WatcherStatsMetric enumValue)`
`534`	`535`	`if ((enumValue & WatcherStatsMetric.All) != 0) return "_all";`
`535`	`536`	`var list = new List<string>();`
`536`	`537`	`if ((enumValue & WatcherStatsMetric.QueuedWatches) != 0) list.Add("queued_watches");`
	`538`	`+ if ((enumValue & WatcherStatsMetric.CurrentWatches) != 0) list.Add("current_watches");`
`537`	`539`	`if ((enumValue & WatcherStatsMetric.PendingWatches) != 0) list.Add("pending_watches");`
`538`	`540`	`return string.Join(",", list);`
`539`	`541`	`}`