Skip to content

Commit a1c380e

Browse files
committed
No need to extend from StatusToXContentObject,
if RestToXContentListener is used instead of RestStatusToXContentListener
1 parent 578c019 commit a1c380e

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GrokProcessorGetAction.java

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,12 @@
3030
import org.elasticsearch.common.io.stream.StreamInput;
3131
import org.elasticsearch.common.io.stream.StreamOutput;
3232
import org.elasticsearch.common.settings.Settings;
33-
import org.elasticsearch.common.xcontent.StatusToXContentObject;
33+
import org.elasticsearch.common.xcontent.ToXContentObject;
3434
import org.elasticsearch.common.xcontent.XContentBuilder;
3535
import org.elasticsearch.rest.BaseRestHandler;
3636
import org.elasticsearch.rest.RestController;
3737
import org.elasticsearch.rest.RestRequest;
38-
import org.elasticsearch.rest.RestStatus;
39-
import org.elasticsearch.rest.action.RestStatusToXContentListener;
38+
import org.elasticsearch.rest.action.RestToXContentListener;
4039
import org.elasticsearch.tasks.Task;
4140
import org.elasticsearch.transport.TransportService;
4241

@@ -45,7 +44,6 @@
4544

4645
import static org.elasticsearch.ingest.common.IngestCommonPlugin.GROK_PATTERNS;
4746
import static org.elasticsearch.rest.RestRequest.Method.GET;
48-
import static org.elasticsearch.rest.RestStatus.OK;
4947

5048
public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Response> {
5149

@@ -68,7 +66,7 @@ public ActionRequestValidationException validate() {
6866
}
6967
}
7068

71-
public static class Response extends ActionResponse implements StatusToXContentObject {
69+
public static class Response extends ActionResponse implements ToXContentObject {
7270
private Map<String, String> grokPatterns;
7371

7472
Response(Map<String, String> grokPatterns) {
@@ -88,11 +86,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
8886
return builder;
8987
}
9088

91-
@Override
92-
public RestStatus status() {
93-
return OK;
94-
}
95-
9689
@Override
9790
public void readFrom(StreamInput in) throws IOException {
9891
super.readFrom(in);
@@ -136,7 +129,7 @@ public String getName() {
136129

137130
@Override
138131
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
139-
return channel -> client.executeLocally(INSTANCE, new Request(), new RestStatusToXContentListener<>(channel));
132+
return channel -> client.executeLocally(INSTANCE, new Request(), new RestToXContentListener<>(channel));
140133
}
141134
}
142135
}

0 commit comments

Comments
 (0)