Skip to content

Commit c180def

Browse files
nik9000nik9000
committed
[CAT] Default verbose to false
Closes #13156
1 parent 0c71328 commit c180def

File tree

28 files changed

+39
-86
lines changed

28 files changed

+39
-86
lines changed

‎core/src/main/java/org/elasticsearch/rest/action/support/RestTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static RestResponse buildXContentBuilder(Table table, RestChannel channel
6868

6969
public static RestResponse buildTextPlainResponse(Table table, RestChannel channel) throws IOException {
7070
RestRequest request = channel.request();
71-
boolean verbose = request.paramAsBoolean("v", true);
71+
boolean verbose = request.paramAsBoolean("v", false);
7272

7373
List<DisplayHeader> headers = buildDisplayHeaders(table, request);
7474
int[] width = buildWidths(table, request, verbose, headers);

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.aliases.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"v": {
3333
"type": "boolean",
3434
"description": "Verbose mode. Display column headers",
35-
"default": true
35+
"default": false
3636
}
3737
}
3838
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.allocation.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"v": {
3838
"type": "boolean",
3939
"description": "Verbose mode. Display column headers",
40-
"default": true
40+
"default": false
4141
}
4242
}
4343
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.count.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"v": {
3333
"type": "boolean",
3434
"description": "Verbose mode. Display column headers",
35-
"default": true
35+
"default": false
3636
}
3737
}
3838
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.fielddata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"v": {
3838
"type": "boolean",
3939
"description": "Verbose mode. Display column headers",
40-
"default": true
40+
"default": false
4141
},
4242
"fields": {
4343
"type": "list",

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.health.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"v": {
3434
"type": "boolean",
3535
"description": "Verbose mode. Display column headers",
36-
"default": true
36+
"default": false
3737
}
3838
}
3939
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.indices.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"v": {
4343
"type": "boolean",
4444
"description": "Verbose mode. Display column headers",
45-
"default": true
45+
"default": false
4646
}
4747
}
4848
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.master.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"v": {
2929
"type": "boolean",
3030
"description": "Verbose mode. Display column headers",
31-
"default": true
31+
"default": false
3232
}
3333
}
3434
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodeattrs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"v": {
2929
"type": "boolean",
3030
"description": "Verbose mode. Display column headers",
31-
"default": true
31+
"default": false
3232
}
3333
}
3434
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.nodes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"v": {
2929
"type": "boolean",
3030
"description": "Verbose mode. Display column headers",
31-
"default": true
31+
"default": false
3232
}
3333
}
3434
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.pending_tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"v": {
2929
"type": "boolean",
3030
"description": "Verbose mode. Display column headers",
31-
"default": true
31+
"default": false
3232
}
3333
}
3434
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.plugins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"v": {
2727
"type": "boolean",
2828
"description": "Verbose mode. Display column headers",
29-
"default": true
29+
"default": false
3030
}
3131
}
3232
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.recovery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"v": {
3434
"type": "boolean",
3535
"description": "Verbose mode. Display column headers",
36-
"default": true
36+
"default": false
3737
}
3838
}
3939
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.segments.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"v": {
2525
"type": "boolean",
2626
"description": "Verbose mode. Display column headers",
27-
"default": true
27+
"default": false
2828
}
2929
}
3030
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.shards.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"v": {
3333
"type": "boolean",
3434
"description": "Verbose mode. Display column headers",
35-
"default": true
35+
"default": false
3636
}
3737
}
3838
},

‎rest-api-spec/src/main/resources/rest-api-spec/api/cat.thread_pool.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"v": {
2929
"type": "boolean",
3030
"description": "Verbose mode. Display column headers",
31-
"default": true
31+
"default": false
3232
},
3333
"full_id": {
3434
"type": "boolean",

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.aliases/10_basic.yaml

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"Empty cluster":
1818

1919
- do:
20-
cat.aliases:
21-
v: false
20+
cat.aliases: {}
2221

2322
- match:
2423
$body: |
@@ -38,8 +37,7 @@
3837
name: test_alias
3938

4039
- do:
41-
cat.aliases:
42-
v: false
40+
cat.aliases: {}
4341

4442
- match:
4543
$body: |
@@ -75,8 +73,7 @@
7573
term:
7674
foo: bar
7775
- do:
78-
cat.aliases:
79-
v: false
76+
cat.aliases: {}
8077

8178
- match:
8279
$body: |
@@ -108,22 +105,19 @@
108105
- do:
109106
cat.aliases:
110107
name: test_1
111-
v: false
112108

113109
- match:
114110
$body: /^test_1 .+ \n$/
115111

116112
- do:
117113
cat.aliases:
118-
v: false
119114
name: test_2
120115

121116
- match:
122117
$body: /^test_2 .+ \n$/
123118

124119
- do:
125120
cat.aliases:
126-
v: false
127121
name: test_*
128122

129123
- match:
@@ -178,8 +172,7 @@
178172

179173
- do:
180174
cat.aliases:
181-
v: false
182-
h: [index, alias]
175+
h: [index, alias]
183176

184177
- match:
185178
$body: /^ test \s+ test_1 \s+ $/
@@ -195,9 +188,3 @@
195188
index \s+ alias \s+ \n
196189
test \s+ test_1 \s+ \n
197190
$/
198-
199-
200-
201-
202-
203-

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.allocation/10_basic.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
- do:
44
cat.allocation:
55
help: true
6-
v: false
76

87
- match:
98
$body: |
@@ -21,8 +20,7 @@
2120
"Empty cluster":
2221

2322
- do:
24-
cat.allocation:
25-
v: false
23+
cat.allocation: {}
2624

2725
- match:
2826
$body: |
@@ -51,8 +49,7 @@
5149
wait_for_status: yellow
5250

5351
- do:
54-
cat.allocation:
55-
v: false
52+
cat.allocation: {}
5653

5754
- match:
5855
$body: |
@@ -82,7 +79,6 @@
8279
- do:
8380
cat.allocation:
8481
node_id: _master
85-
v: false
8682

8783
- match:
8884
$body: |
@@ -102,7 +98,6 @@
10298
- do:
10399
cat.allocation:
104100
node_id: non_existent
105-
v: false
106101

107102
- match:
108103
$body: |
@@ -116,7 +111,6 @@
116111
- do:
117112
cat.allocation:
118113
node_id: "*"
119-
v: false
120114

121115
- match:
122116
$body: |
@@ -215,7 +209,6 @@
215209
- do:
216210
cat.allocation:
217211
bytes: g
218-
v: false
219212

220213
- match:
221214
$body: |
@@ -231,4 +224,3 @@
231224
\n
232225
)+
233226
$/
234-

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.count/10_basic.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
"Test cat count output":
1515

1616
- do:
17-
cat.count:
18-
v: false
17+
cat.count: {}
1918

2019
- match:
2120
$body: |
@@ -31,8 +30,7 @@
3130
refresh: true
3231

3332
- do:
34-
cat.count:
35-
v: false
33+
cat.count: {}
3634

3735
- match:
3836
$body: |
@@ -50,7 +48,6 @@
5048
- do:
5149
cat.count:
5250
h: count
53-
v: false
5451

5552
- match:
5653
$body: |
@@ -61,7 +58,6 @@
6158
- do:
6259
cat.count:
6360
index: index1
64-
v: false
6561

6662
- match:
6763
$body: |
@@ -77,4 +73,3 @@
7773
$body: |
7874
/^ epoch \s+ timestamp \s+ count \s+ \n
7975
\d+ \s+ \d{2}:\d{2}:\d{2} \s+ \d+ \s+ \n $/
80-

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.fielddata/10_basic.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"Test cat fielddata output":
1818

1919
- do:
20-
cat.fielddata:
21-
v: false
20+
cat.fielddata: {}
2221

2322
- do:
2423
index:

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.health/10_basic.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
"Empty cluster":
2929

3030
- do:
31-
cat.health:
32-
v: false
31+
cat.health: {}
3332

3433
- match:
3534
$body: |

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.indices/10_basic.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"Test cat indices output":
33

44
- do:
5-
cat.indices:
6-
v: false
5+
cat.indices: {}
76

87
- match:
98
$body: |
@@ -20,8 +19,7 @@
2019
cluster.health:
2120
wait_for_status: yellow
2221
- do:
23-
cat.indices:
24-
v: false
22+
cat.indices: {}
2523

2624
- match:
2725
$body: |

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodeattrs/10_basic.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
reason: "Waiting for #12558"
77

88
- do:
9-
cat.nodeattrs:
10-
v: false
9+
cat.nodeattrs: {}
1110

1211
- match:
1312
$body: |

‎rest-api-spec/src/main/resources/rest-api-spec/test/cat.nodes/10_basic.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
"Test cat nodes output":
33

44
- do:
5-
cat.nodes:
6-
v: false
5+
cat.nodes: {}
76

87
- match:
98
$body: |

0 commit comments

Comments
 (0)