Skip to content

Commit 85bb167

Browse files
sohaibiftikharnik9000
authored andcommitted
Implemented XContent serialisation for GetIndexResponse (#31675)
This PR does the server side work for adding the Get Index API to the REST high-level-client, namely moving resolving default settings to the transport action. A follow up would be the client side changes.
1 parent b342552 commit 85bb167

File tree

9 files changed

+655
-125
lines changed

9 files changed

+655
-125
lines changed

client/rest-high-level/src/test/java/org/elasticsearch/client/GetAliasesResponseTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private static Map<String, Set<AliasMetaData>> createIndicesAliasesMap(int min,
5959
return map;
6060
}
6161

62-
private static AliasMetaData createAliasMetaData() {
62+
public static AliasMetaData createAliasMetaData() {
6363
AliasMetaData.Builder builder = AliasMetaData.builder(randomAlphaOfLengthBetween(3, 10));
6464
if (randomBoolean()) {
6565
builder.routing(randomAlphaOfLengthBetween(3, 10));

server/src/main/java/org/elasticsearch/action/ActionModule.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -558,9 +558,8 @@ public void initRestHandlers(Supplier<DiscoveryNodes> nodesInCluster) {
558558
registerHandler.accept(new RestRestoreSnapshotAction(settings, restController));
559559
registerHandler.accept(new RestDeleteSnapshotAction(settings, restController));
560560
registerHandler.accept(new RestSnapshotsStatusAction(settings, restController));
561-
562561
registerHandler.accept(new RestGetAllAliasesAction(settings, restController));
563-
registerHandler.accept(new RestGetIndicesAction(settings, restController, indexScopedSettings, settingsFilter));
562+
registerHandler.accept(new RestGetIndicesAction(settings, restController));
564563
registerHandler.accept(new RestIndicesStatsAction(settings, restController));
565564
registerHandler.accept(new RestIndicesSegmentsAction(settings, restController));
566565
registerHandler.accept(new RestIndicesShardStoresAction(settings, restController));

server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java

+9-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
package org.elasticsearch.action.admin.indices.get;
2121

22+
import org.elasticsearch.Version;
2223
import org.elasticsearch.action.ActionRequestValidationException;
2324
import org.elasticsearch.action.support.master.info.ClusterInfoRequest;
2425
import org.elasticsearch.common.io.stream.StreamInput;
@@ -105,8 +106,7 @@ public boolean humanReadable() {
105106

106107
/**
107108
* Sets the value of "include_defaults".
108-
* Used only by the high-level REST client.
109-
*
109+
*
110110
* @param includeDefaults value of "include_defaults" to be set.
111111
* @return this request
112112
*/
@@ -117,8 +117,7 @@ public GetIndexRequest includeDefaults(boolean includeDefaults) {
117117

118118
/**
119119
* Whether to return all default settings for each of the indices.
120-
* Used only by the high-level REST client.
121-
*
120+
*
122121
* @return <code>true</code> if defaults settings for each of the indices need to returned;
123122
* <code>false</code> otherwise.
124123
*/
@@ -135,6 +134,9 @@ public void readFrom(StreamInput in) throws IOException {
135134
features[i] = Feature.fromId(in.readByte());
136135
}
137136
humanReadable = in.readBoolean();
137+
if (in.getVersion().onOrAfter(Version.V_6_4_0)) {
138+
includeDefaults = in.readBoolean();
139+
}
138140
}
139141

140142
@Override
@@ -145,6 +147,9 @@ public void writeTo(StreamOutput out) throws IOException {
145147
out.writeByte(feature.id);
146148
}
147149
out.writeBoolean(humanReadable);
150+
if (out.getVersion().onOrAfter(Version.V_6_4_0)) {
151+
out.writeBoolean(includeDefaults);
152+
}
148153
}
149154

150155
}

0 commit comments

Comments
 (0)