diff --git a/src/CodeGeneration/ApiGenerator/ApiGenerator.cs b/src/CodeGeneration/ApiGenerator/ApiGenerator.cs index 7acc2376cdd..7a7211a1c40 100644 --- a/src/CodeGeneration/ApiGenerator/ApiGenerator.cs +++ b/src/CodeGeneration/ApiGenerator/ApiGenerator.cs @@ -143,7 +143,7 @@ private static Dictionary CreateCommonApiQueryParame var json = File.ReadAllText(jsonFile); var jobject = JObject.Parse(json); var commonParameters = jobject.Property("params").Value.ToObject>(); - return ApiQueryParametersPatcher.Patch(commonParameters, null, checkCommon: false); + return ApiQueryParametersPatcher.Patch(null, commonParameters, null, checkCommon: false); } private static string CreateMethodName(string apiEndpointKey) diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs index 5661462949e..0c42791b900 100644 --- a/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs +++ b/src/CodeGeneration/ApiGenerator/Domain/ApiEndpoint.cs @@ -262,7 +262,7 @@ private void PatchEndpoint() private void PatchRequestParameters(IEndpointOverrides overrides) { - var newParams = ApiQueryParametersPatcher.Patch(this.Url.Params, overrides); + var newParams = ApiQueryParametersPatcher.Patch(this.Url.Path, this.Url.Params, overrides); this.Url.Params = newParams; } diff --git a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs index d5651e29023..e97f4fc1989 100644 --- a/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs +++ b/src/CodeGeneration/ApiGenerator/Domain/ApiQueryParametersPatcher.cs @@ -10,6 +10,7 @@ public static class ApiQueryParametersPatcher { public static Dictionary Patch( + string urlPath, IDictionary source, IEndpointOverrides overrides, bool checkCommon = true) @@ -25,7 +26,7 @@ public static Dictionary Patch( var obsoleteLookup = CreateObsoleteLookup(globalOverrides, overrides, declaredKeys); var patchedParams = new Dictionary(); - var name = overrides?.GetType().Name ?? "unkown"; + var name = overrides?.GetType().Name ?? urlPath ?? "unknown"; foreach (var kv in source) { var queryStringKey = kv.Key; diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cluster.put_settings.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cluster.put_settings.json index 393d1350dd3..5fcf0310283 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cluster.put_settings.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/cluster.put_settings.json @@ -22,7 +22,8 @@ } }, "body": { - "description": "The settings to be updated. Can be either `transient` or `persistent` (survives cluster restart)." + "description": "The settings to be updated. Can be either `transient` or `persistent` (survives cluster restart).", + "required" : true } } } diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json index 31c9d51f673..9b4e09a174a 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/create.json @@ -44,14 +44,6 @@ "type" : "time", "description" : "Explicit operation timeout" }, - "timestamp": { - "type" : "time", - "description" : "Explicit timestamp for the document" - }, - "ttl": { - "type" : "time", - "description" : "Expiration time for the document" - }, "version" : { "type" : "number", "description" : "Explicit version number for concurrency control" diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json index 814a53c1141..a58598b3bb3 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/index.json @@ -49,14 +49,6 @@ "type" : "time", "description" : "Explicit operation timeout" }, - "timestamp": { - "type" : "time", - "description" : "Explicit timestamp for the document" - }, - "ttl": { - "type" : "time", - "description" : "Expiration time for the document" - }, "version" : { "type" : "number", "description" : "Explicit version number for concurrency control" diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.exists_alias.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.exists_alias.json index 8891aebd223..aea20b2b634 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.exists_alias.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.exists_alias.json @@ -12,6 +12,7 @@ }, "name": { "type" : "list", + "required" : true, "description" : "A comma-separated list of alias names to return" } }, diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.open.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.open.json index 879ce5a2b9d..86c39988e18 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.open.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/indices.open.json @@ -34,6 +34,10 @@ "options" : ["open","closed","none","all"], "default" : "closed", "description" : "Whether to expand wildcard expression to concrete indices that are open, closed or both." + }, + "wait_for_active_shards": { + "type" : "string", + "description" : "Sets the number of active shards to wait for before the operation returns." } } }, diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch.json index 090c429fd82..6be493a5c18 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/msearch.json @@ -31,7 +31,7 @@ }, "pre_filter_shard_size" : { "type" : "number", - "description" : "A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on it's rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint.", + "description" : "A threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on it's rewrite method ie. if date filters are mandatory to match but the shard bounds and the query are disjoint.", "default" : 128 } } diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/reindex_rethrottle.json b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/reindex_rethrottle.json index 4bba41d37d5..4004409ab68 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/reindex_rethrottle.json +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/reindex_rethrottle.json @@ -8,6 +8,7 @@ "parts": { "task_id": { "type": "string", + "required" : true, "description": "The task id to rethrottle" } }, diff --git a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html index 41b5e64dfc8..66506e6e63b 100644 --- a/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html +++ b/src/CodeGeneration/ApiGenerator/RestSpecification/Core/root.html @@ -8,41 +8,53 @@ + + + + + + + - - + + - + - elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api at v6.0.0-alpha1 · elastic/elasticsearch · GitHub + elasticsearch/rest-api-spec/src/main/resources/rest-api-spec/api at 6.1 · elastic/elasticsearch · GitHub + - + - + + + - - + + + - - + + + @@ -53,26 +65,27 @@ - + - + + - + - + - + + - - + - + @@ -80,20 +93,21 @@ - + + + -
- Skip to content + Skip to content
@@ -102,36 +116,52 @@ -