Use Strings.toString() for toString() in SearchResponse and GetResponse (#18102)

This commit is contained in:
Johnny Lim 2016-05-10 05:56:02 +09:00 committed by Nik Everett
parent ddc531e729
commit 0970c59608
2 changed files with 8 additions and 10 deletions

View File

@ -21,6 +21,7 @@ package org.elasticsearch.action.get;
import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
@ -168,4 +169,9 @@ public class GetResponse extends ActionResponse implements Iterable<GetField>, T
super.writeTo(out); super.writeTo(out);
getResult.writeTo(out); getResult.writeTo(out);
} }
@Override
public String toString() {
return Strings.toString(this, true);
}
} }

View File

@ -21,12 +21,12 @@ package org.elasticsearch.action.search;
import org.elasticsearch.action.ActionResponse; import org.elasticsearch.action.ActionResponse;
import org.elasticsearch.common.Nullable; import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.common.xcontent.StatusToXContent; import org.elasticsearch.common.xcontent.StatusToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.rest.RestStatus; import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.action.support.RestActions; import org.elasticsearch.rest.action.support.RestActions;
import org.elasticsearch.search.SearchHits; import org.elasticsearch.search.SearchHits;
@ -232,14 +232,6 @@ public class SearchResponse extends ActionResponse implements StatusToXContent {
@Override @Override
public String toString() { public String toString() {
try { return Strings.toString(this, true);
XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
builder.startObject();
toXContent(builder, EMPTY_PARAMS);
builder.endObject();
return builder.string();
} catch (IOException e) {
return "{ \"error\" : \"" + e.getMessage() + "\"}";
}
} }
} }