Skip to content

Commit 0073007

Browse files
MpdreamzMpdreamz
committed
reran codegen against master and added BulkInvalidVersionApiTests from 5.x fix #2396 
1 parent 0939d44 commit 0073007

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+8717
-8269
lines changed

‎src/CodeGeneration/ApiGenerator/Domain/ApiUrlPart.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public string ClrTypeName
4949
case "username":
5050
case "usernames":
5151
case "realm":
52-
case "realms":
52+
case "realms":
53+
case "thread_pool_patterns":
5354
case "alias":
5455
case "name":
5556
return this.Type == "string" ? "Name" : "Names";

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.aliases.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
"description": "Return help information",
3434
"default": false
3535
},
36+
"s": {
37+
"type": "list",
38+
"description" : "Comma-separated list of column names or column aliases to sort by"
39+
},
3640
"v": {
3741
"type": "boolean",
3842
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.allocation.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
"description": "Return help information",
3939
"default": false
4040
},
41+
"s": {
42+
"type": "list",
43+
"description" : "Comma-separated list of column names or column aliases to sort by"
44+
},
4145
"v": {
4246
"type": "boolean",
4347
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.count.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
"description": "Return help information",
3434
"default": false
3535
},
36+
"s": {
37+
"type": "list",
38+
"description" : "Comma-separated list of column names or column aliases to sort by"
39+
},
3640
"v": {
3741
"type": "boolean",
3842
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.fielddata.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@
3838
"description": "Return help information",
3939
"default": false
4040
},
41+
"s": {
42+
"type": "list",
43+
"description" : "Comma-separated list of column names or column aliases to sort by"
44+
},
4145
"v": {
4246
"type": "boolean",
4347
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.health.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
"description": "Return help information",
3030
"default": false
3131
},
32+
"s": {
33+
"type": "list",
34+
"description" : "Comma-separated list of column names or column aliases to sort by"
35+
},
3236
"ts": {
3337
"type": "boolean",
3438
"description": "Set to false to disable timestamping",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.help.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
"type": "boolean",
1313
"description": "Return help information",
1414
"default": false
15+
},
16+
"s": {
17+
"type": "list",
18+
"description" : "Comma-separated list of column names or column aliases to sort by"
1519
}
1620
}
1721
},

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@
4949
"description": "Set to true to return stats only for primary shards",
5050
"default": false
5151
},
52+
"s": {
53+
"type": "list",
54+
"description" : "Comma-separated list of column names or column aliases to sort by"
55+
},
5256
"v": {
5357
"type": "boolean",
5458
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.master.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
"description": "Return help information",
3030
"default": false
3131
},
32+
"s": {
33+
"type": "list",
34+
"description" : "Comma-separated list of column names or column aliases to sort by"
35+
},
3236
"v": {
3337
"type": "boolean",
3438
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.nodeattrs.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
"description": "Return help information",
3030
"default": false
3131
},
32+
"s": {
33+
"type": "list",
34+
"description" : "Comma-separated list of column names or column aliases to sort by"
35+
},
3236
"v": {
3337
"type": "boolean",
3438
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.nodes.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
"type" : "string",
1313
"description" : "a short version of the Accept header, e.g. json, yaml"
1414
},
15+
"full_id": {
16+
"type" : "boolean",
17+
"description" : "Return the full node ID instead of the shortened version (default: false)"
18+
},
1519
"local": {
1620
"type" : "boolean",
1721
"description" : "Return local information, do not retrieve the state from master node (default: false)"
@@ -29,6 +33,10 @@
2933
"description": "Return help information",
3034
"default": false
3135
},
36+
"s": {
37+
"type": "list",
38+
"description" : "Comma-separated list of column names or column aliases to sort by"
39+
},
3240
"v": {
3341
"type": "boolean",
3442
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.pending_tasks.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@
2929
"description": "Return help information",
3030
"default": false
3131
},
32+
"s": {
33+
"type": "list",
34+
"description" : "Comma-separated list of column names or column aliases to sort by"
35+
},
3236
"v": {
3337
"type": "boolean",
3438
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.plugins.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@
2727
"description": "Return help information",
2828
"default": false
2929
},
30+
"s": {
31+
"type": "list",
32+
"description" : "Comma-separated list of column names or column aliases to sort by"
33+
},
3034
"v": {
3135
"type": "boolean",
3236
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.recovery.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
"description": "Return help information",
3535
"default": false
3636
},
37+
"s": {
38+
"type": "list",
39+
"description" : "Comma-separated list of column names or column aliases to sort by"
40+
},
3741
"v": {
3842
"type": "boolean",
3943
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.repositories.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
"description": "Return help information",
3131
"default": false
3232
},
33+
"s": {
34+
"type": "list",
35+
"description" : "Comma-separated list of column names or column aliases to sort by"
36+
},
3337
"v": {
3438
"type": "boolean",
3539
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.segments.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
"description": "Return help information",
2626
"default": false
2727
},
28+
"s": {
29+
"type": "list",
30+
"description" : "Comma-separated list of column names or column aliases to sort by"
31+
},
2832
"v": {
2933
"type": "boolean",
3034
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.shards.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
"description": "Return help information",
3434
"default": false
3535
},
36+
"s": {
37+
"type": "list",
38+
"description" : "Comma-separated list of column names or column aliases to sort by"
39+
},
3640
"v": {
3741
"type": "boolean",
3842
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.snapshots.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
"documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-snapshots.html",
44
"methods": ["GET"],
55
"url": {
6-
"path": "/_cat/snapshots/{repository}",
7-
"paths": ["/_cat/snapshots/{repository}"],
6+
"path": "/_cat/snapshots",
7+
"paths": [
8+
"/_cat/snapshots",
9+
"/_cat/snapshots/{repository}"],
810
"parts": {
911
"repository": {
1012
"type" : "list",
@@ -35,6 +37,10 @@
3537
"description": "Return help information",
3638
"default": false
3739
},
40+
"s": {
41+
"type": "list",
42+
"description" : "Comma-separated list of column names or column aliases to sort by"
43+
},
3844
"v": {
3945
"type": "boolean",
4046
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.tasks.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
"description": "Return help information",
4242
"default": false
4343
},
44+
"s": {
45+
"type": "list",
46+
"description" : "Comma-separated list of column names or column aliases to sort by"
47+
},
4448
"v": {
4549
"type": "boolean",
4650
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.templates.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
"description": "Return help information",
3434
"default": false
3535
},
36+
"s": {
37+
"type": "list",
38+
"description" : "Comma-separated list of column names or column aliases to sort by"
39+
},
3640
"v": {
3741
"type": "boolean",
3842
"description": "Verbose mode. Display column headers",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.thread_pool.json

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
"methods": ["GET"],
55
"url": {
66
"path": "/_cat/thread_pool",
7-
"paths": ["/_cat/thread_pool","/_cat/thread_pool/{thread_pools}"],
7+
"paths": ["/_cat/thread_pool","/_cat/thread_pool/{thread_pool_patterns}"],
88
"parts": {
9+
"thread_pool_patterns": {
10+
"type": "list",
11+
"description": "A comma-separated list of regular-expressions to filter the thread pools in the output"
12+
}
913
},
1014
"params": {
1115
"format": {
@@ -34,14 +38,14 @@
3438
"description": "Return help information",
3539
"default": false
3640
},
41+
"s": {
42+
"type": "list",
43+
"description" : "Comma-separated list of column names or column aliases to sort by"
44+
},
3745
"v": {
3846
"type": "boolean",
3947
"description": "Verbose mode. Display column headers",
4048
"default": false
41-
},
42-
"thread_pool_patterns": {
43-
"type": "list",
44-
"description": "A comma-separated list of regular-expressions to filter the thread pools in the output"
4549
}
4650
}
4751
},

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/cluster.health.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"wait_for_events": {
4242
"type" : "enum",
4343
"options" : ["immediate", "urgent", "high", "normal", "low", "languid"],
44-
"description" : "Wait until all currently queued events with the given priorty are processed"
44+
"description" : "Wait until all currently queued events with the given priority are processed"
4545
},
4646
"wait_for_no_relocating_shards": {
4747
"type" : "boolean",

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/count.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@
6767
"lenient": {
6868
"type" : "boolean",
6969
"description" : "Specify whether format-based query failures (such as providing text to a numeric field) should be ignored"
70-
},
71-
"lowercase_expanded_terms": {
72-
"type" : "boolean",
73-
"description" : "Specify whether query terms should be lowercased"
7470
}
7571
}
7672
},

‎src/CodeGeneration/ApiGenerator/RestSpecification/Core/delete_by_query.json

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,6 @@
3636
"type" : "string",
3737
"description" : "The field to use as default where no field prefix is given in the query string"
3838
},
39-
"explain": {
40-
"type" : "boolean",
41-
"description" : "Specify whether to return detailed information about score computation as part of a hit"
42-
},
43-
"stored_fields": {
44-
"type" : "list",
45-
"description" : "A comma-separated list of stored fields to return as part of a hit"
46-
},
47-
"docvalue_fields": {
48-
"type" : "list",
49-
"description" : "A comma-separated list of fields to return as the docvalue representation of a field for each hit"
50-
},
5139
"from": {
5240
"type" : "number",
5341
"description" : "Starting offset (default: 0)"
@@ -77,10 +65,6 @@
7765
"type" : "boolean",
7866
"description" : "Specify whether format-based query failures (such as providing text to a numeric field) should be ignored"
7967
},
80-
"lowercase_expanded_terms": {
81-
"type" : "boolean",
82-
"description" : "Specify whether query terms should be lowercased"
83-
},
8468
"preference": {
8569
"type" : "string",
8670
"description" : "Specify the node or shard the operation should be performed on (default: random)"
@@ -94,7 +78,7 @@
9478
"description" : "A comma-separated list of specific routing values"
9579
},
9680
"scroll": {
97-
"type" : "duration",
81+
"type" : "time",
9882
"description" : "Specify how long a consistent view of the index should be maintained for scrolled search"
9983
},
10084
"search_type": {
@@ -134,32 +118,6 @@
134118
"type" : "list",
135119
"description" : "Specific 'tag' of the request for logging and statistical purposes"
136120
},
137-
"suggest_field": {
138-
"type" : "string",
139-
"description" : "Specify which field to use for suggestions"
140-
},
141-
"suggest_mode": {
142-
"type" : "enum",
143-
"options" : ["missing", "popular", "always"],
144-
"default" : "missing",
145-
"description" : "Specify suggest mode"
146-
},
147-
"suggest_size": {
148-
"type" : "number",
149-
"description" : "How many suggestions to return in response"
150-
},
151-
"suggest_text": {
152-
"type" : "text",
153-
"description" : "The source text for which the suggestions should be returned"
154-
},
155-
"timeout": {
156-
"type" : "time",
157-
"description" : "Explicit operation timeout"
158-
},
159-
"track_scores": {
160-
"type" : "boolean",
161-
"description": "Whether to calculate and return scores even if they are not used for sorting"
162-
},
163121
"version": {
164122
"type" : "boolean",
165123
"description" : "Specify whether to return document version as part of a hit"
@@ -182,7 +140,7 @@
182140
"description" : "Sets the number of shard copies that must be active before proceeding with the delete by query operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)"
183141
},
184142
"scroll_size": {
185-
"type": "integer",
143+
"type": "number",
186144
"defaut_value": 100,
187145
"description": "Size on the scroll request powering the update_by_query"
188146
},
@@ -192,9 +150,14 @@
192150
"description" : "Should the request should block until the delete-by-query is complete."
193151
},
194152
"requests_per_second": {
195-
"type": "float",
153+
"type": "number",
196154
"default": 0,
197-
"description": "The throttle for this request in sub-requests per second. -1 means set no throttle."
155+
"description": "The throttle for this request in sub-requests per second. -1 means no throttle."
156+
},
157+
"slices": {
158+
"type": "integer",
159+
"default": 1,
160+
"description": "The number of slices this task should be divided into. Defaults to 1 meaning the task isn't sliced into subtasks."
198161
}
199162
}
200163
},

0 commit comments

Comments
 (0)