honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

No need to extend from StatusToXContentObject, 

if RestToXContentListener is used instead of RestStatusToXContentListener
This commit is contained in:
Martijn van Groningen 2019-03-04 13:26:43 +01:00
parent 547af21a12
commit b8659fcb83
No known key found for this signature in database
GPG Key ID: AB236F4FCF2AF12A
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,13 +30,12 @@ import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.xcontent.StatusToXContentObject;
import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.rest.BaseRestHandler;
import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestRequest;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.action.RestStatusToXContentListener;
import org.elasticsearch.rest.action.RestToXContentListener;
import org.elasticsearch.tasks.Task;
import org.elasticsearch.transport.TransportService;
@ -45,7 +44,6 @@ import java.util.Map;
import static org.elasticsearch.ingest.common.IngestCommonPlugin.GROK_PATTERNS;
import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestStatus.OK;
public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Response> {
@ -68,7 +66,7 @@ public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Respon
}
}
public static class Response extends ActionResponse implements StatusToXContentObject {
public static class Response extends ActionResponse implements ToXContentObject {
private Map<String, String> grokPatterns;
Response(Map<String, String> grokPatterns) {
@ -88,11 +86,6 @@ public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Respon
return builder;
}
@Override
public RestStatus status() {
return OK;
}
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
@ -136,7 +129,7 @@ public class GrokProcessorGetAction extends Action<GrokProcessorGetAction.Respon
@Override
protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
return channel -> client.executeLocally(INSTANCE, new Request(), new RestStatusToXContentListener<>(channel));
return channel -> client.executeLocally(INSTANCE, new Request(), new RestToXContentListener<>(channel));
}
}
}