Skip to content

Commit 1eee7f3

Browse files
committed
dont case node names and index names
1 parent 5c760d1 commit 1eee7f3

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

modules/elasticsearch/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,12 @@ public XContentBuilder array(XContentBuilderString name, Object... values) throw
161161
return this;
162162
}
163163

164+
public XContentBuilder startArray(String name, FieldCaseConversion conversion) throws IOException {
165+
field(name, conversion);
166+
startArray();
167+
return this;
168+
}
169+
164170
public XContentBuilder startArray(String name) throws IOException {
165171
field(name);
166172
startArray();

modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class RestNodesInfoAction extends BaseRestHandler {
6565

6666
builder.startObject("nodes");
6767
for (NodeInfo nodeInfo : result) {
68-
builder.startObject(nodeInfo.node().id());
68+
builder.startObject(nodeInfo.node().id(), XContentBuilder.FieldCaseConversion.NONE);
6969

7070
builder.field("name", nodeInfo.node().name());
7171
builder.field("transport_address", nodeInfo.node().address().toString());

modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/node/stats/RestNodesStatsAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class RestNodesStatsAction extends BaseRestHandler {
5757

5858
builder.startObject("nodes");
5959
for (NodeStats nodeStats : result) {
60-
builder.startObject(nodeStats.node().id());
60+
builder.startObject(nodeStats.node().id(), XContentBuilder.FieldCaseConversion.NONE);
6161

6262
builder.field("name", nodeStats.node().name());
6363

modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public class RestClusterStateAction extends BaseRestHandler {
117117
if (!clusterStateRequest.filterNodes()) {
118118
builder.startObject("nodes");
119119
for (DiscoveryNode node : state.nodes()) {
120-
builder.startObject(node.id());
120+
builder.startObject(node.id(), XContentBuilder.FieldCaseConversion.NONE);
121121
builder.field("name", node.name());
122122
builder.field("transport_address", node.address().toString());
123123

@@ -138,7 +138,7 @@ public class RestClusterStateAction extends BaseRestHandler {
138138

139139
builder.startObject("indices");
140140
for (IndexMetaData indexMetaData : state.metaData()) {
141-
builder.startObject(indexMetaData.index());
141+
builder.startObject(indexMetaData.index(), XContentBuilder.FieldCaseConversion.NONE);
142142

143143
builder.startObject("settings");
144144
Settings settings = settingsFilter.filterSettings(indexMetaData.settings());
@@ -179,7 +179,7 @@ public class RestClusterStateAction extends BaseRestHandler {
179179
builder.startObject("routing_table");
180180
builder.startObject("indices");
181181
for (IndexRoutingTable indexRoutingTable : state.routingTable()) {
182-
builder.startObject(indexRoutingTable.index());
182+
builder.startObject(indexRoutingTable.index(), XContentBuilder.FieldCaseConversion.NONE);
183183
builder.startObject("shards");
184184
for (IndexShardRoutingTable indexShardRoutingTable : indexRoutingTable) {
185185
builder.startArray(Integer.toString(indexShardRoutingTable.shardId().id()));
@@ -206,7 +206,7 @@ public class RestClusterStateAction extends BaseRestHandler {
206206

207207
builder.startObject("nodes");
208208
for (RoutingNode routingNode : state.readOnlyRoutingNodes()) {
209-
builder.startArray(routingNode.nodeId());
209+
builder.startArray(routingNode.nodeId(), XContentBuilder.FieldCaseConversion.NONE);
210210
for (ShardRouting shardRouting : routingNode) {
211211
jsonShardRouting(builder, shardRouting);
212212
}

modules/elasticsearch/src/main/java/org/elasticsearch/rest/action/admin/indices/status/RestIndicesStatusAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class RestIndicesStatusAction extends BaseRestHandler {
7474

7575
builder.startObject("indices");
7676
for (IndexStatus indexStatus : response.indices().values()) {
77-
builder.startObject(indexStatus.index());
77+
builder.startObject(indexStatus.index(), XContentBuilder.FieldCaseConversion.NONE);
7878

7979
builder.array("aliases", indexStatus.settings().getAsArray("index.aliases"));
8080

0 commit comments

Comments
 (0)