Skip to content

Commit b78a8a3

Browse files
committed
Use RestToXContentListener in painless execute action rest action. (#39638)
1 parent 171ef05 commit b78a8a3

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

modules/lang-painless/src/main/java/org/elasticsearch/painless/PainlessExecuteAction.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@
7171
import org.elasticsearch.index.shard.ShardId;
7272
import org.elasticsearch.indices.IndicesService;
7373
import org.elasticsearch.rest.BaseRestHandler;
74-
import org.elasticsearch.rest.BytesRestResponse;
7574
import org.elasticsearch.rest.RestController;
7675
import org.elasticsearch.rest.RestRequest;
77-
import org.elasticsearch.rest.RestResponse;
78-
import org.elasticsearch.rest.action.RestBuilderListener;
76+
import org.elasticsearch.rest.action.RestToXContentListener;
7977
import org.elasticsearch.script.FilterScript;
8078
import org.elasticsearch.script.ScoreScript;
8179
import org.elasticsearch.script.Script;
@@ -94,7 +92,6 @@
9492
import static org.elasticsearch.action.ValidateActions.addValidationError;
9593
import static org.elasticsearch.rest.RestRequest.Method.GET;
9694
import static org.elasticsearch.rest.RestRequest.Method.POST;
97-
import static org.elasticsearch.rest.RestStatus.OK;
9895

9996
public class PainlessExecuteAction extends Action<PainlessExecuteAction.Response> {
10097

@@ -612,13 +609,7 @@ public String getName() {
612609
@Override
613610
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException {
614611
final Request request = Request.parse(restRequest.contentOrSourceParamParser());
615-
return channel -> client.executeLocally(INSTANCE, request, new RestBuilderListener<Response>(channel) {
616-
@Override
617-
public RestResponse buildResponse(Response response, XContentBuilder builder) throws Exception {
618-
response.toXContent(builder, ToXContent.EMPTY_PARAMS);
619-
return new BytesRestResponse(OK, builder);
620-
}
621-
});
612+
return channel -> client.executeLocally(INSTANCE, request, new RestToXContentListener<>(channel));
622613
}
623614
}
624615

0 commit comments

Comments
 (0)