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

convert to json wasn't taking reformat flag properly into account

This commit is contained in:
Shay Banon 2012-06-08 13:54:07 +02:00
parent 4df978e479
commit 395a09db03
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
View File

@ -76,8 +76,12 @@ public class XContentHelper {
} }
public static String convertToJson(byte[] data, int offset, int length, boolean reformatJson) throws IOException { public static String convertToJson(byte[] data, int offset, int length, boolean reformatJson) throws IOException {
return convertToJson(data, offset, length, reformatJson, false);
}
public static String convertToJson(byte[] data, int offset, int length, boolean reformatJson, boolean prettyPrint) throws IOException {
XContentType xContentType = XContentFactory.xContentType(data, offset, length); XContentType xContentType = XContentFactory.xContentType(data, offset, length);
if (xContentType == XContentType.JSON && reformatJson) { if (xContentType == XContentType.JSON && !reformatJson) {
return new String(data, offset, length, Charsets.UTF_8); return new String(data, offset, length, Charsets.UTF_8);
} }
XContentParser parser = null; XContentParser parser = null;
@ -85,6 +89,9 @@ public class XContentHelper {
parser = XContentFactory.xContent(xContentType).createParser(data, offset, length); parser = XContentFactory.xContent(xContentType).createParser(data, offset, length);
parser.nextToken(); parser.nextToken();
XContentBuilder builder = XContentFactory.jsonBuilder(); XContentBuilder builder = XContentFactory.jsonBuilder();
if (prettyPrint) {
builder.prettyPrint();
}
builder.copyCurrentStructure(parser); builder.copyCurrentStructure(parser);
return builder.string(); return builder.string();
} finally { } finally {