Skip to content

Commit 10e2013

Browse files
committed
Move RestGetSettingsAction to RestToXContentListener (#31101)
1 parent aeb2c32 commit 10e2013

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestGetSettingsAction.java

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,18 @@
2020
package org.elasticsearch.rest.action.admin.indices;
2121

2222
import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
23-
import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
2423
import org.elasticsearch.action.support.IndicesOptions;
2524
import org.elasticsearch.client.node.NodeClient;
2625
import org.elasticsearch.common.Strings;
2726
import org.elasticsearch.common.settings.Settings;
28-
import org.elasticsearch.common.xcontent.XContentBuilder;
2927
import org.elasticsearch.rest.BaseRestHandler;
30-
import org.elasticsearch.rest.BytesRestResponse;
3128
import org.elasticsearch.rest.RestController;
3229
import org.elasticsearch.rest.RestRequest;
33-
import org.elasticsearch.rest.RestResponse;
34-
import org.elasticsearch.rest.action.RestBuilderListener;
30+
import org.elasticsearch.rest.action.RestToXContentListener;
3531

3632
import java.io.IOException;
3733

3834
import static org.elasticsearch.rest.RestRequest.Method.GET;
39-
import static org.elasticsearch.rest.RestStatus.OK;
4035

4136
public class RestGetSettingsAction extends BaseRestHandler {
4237

@@ -68,15 +63,6 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
6863
.names(names);
6964
getSettingsRequest.local(request.paramAsBoolean("local", getSettingsRequest.local()));
7065
getSettingsRequest.masterNodeTimeout(request.paramAsTime("master_timeout", getSettingsRequest.masterNodeTimeout()));
71-
72-
return channel -> client.admin().indices().getSettings(getSettingsRequest, new RestBuilderListener<GetSettingsResponse>(channel) {
73-
74-
@Override
75-
public RestResponse buildResponse(GetSettingsResponse getSettingsResponse, XContentBuilder builder) throws Exception {
76-
getSettingsResponse.toXContent(builder, request);
77-
return new BytesRestResponse(OK, builder);
78-
}
79-
});
66+
return channel -> client.admin().indices().getSettings(getSettingsRequest, new RestToXContentListener<>(channel));
8067
}
81-
8268
}

0 commit comments

Comments
 (0)