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

Renamed readable_format flag to human 

Closes #3541
This commit is contained in:
Luca Cavanna 2013-08-20 13:43:36 +02:00
parent 81bee86778
commit 3b03bc65b9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
View File

@ -83,7 +83,7 @@ public final class XContentBuilder implements BytesStream {
private StringBuilder cachedStringBuilder;
private boolean readableFormat = false;
private boolean humanReadable = false;
/**
* Constructs a new builder using the provided xcontent and an OutputStream. Make sure
@ -108,13 +108,13 @@ public final class XContentBuilder implements BytesStream {
return this;
}
public XContentBuilder readableFormat(boolean readableFormat) {
this.readableFormat = readableFormat;
public XContentBuilder humanReadable(boolean humanReadable) {
this.humanReadable = humanReadable;
return this;
}
public boolean readableFormat() {
return this.readableFormat;
public boolean humanReadable() {
return this.humanReadable;
}
public XContentBuilder field(String name, ToXContent xContent) throws IOException {
@ -837,7 +837,7 @@ public final class XContentBuilder implements BytesStream {
}
public XContentBuilder timeValueField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, TimeValue timeValue) throws IOException {
if (readableFormat) {
if (humanReadable) {
field(readableFieldName, timeValue.toString());
}
field(rawFieldName, timeValue.millis());
@ -845,7 +845,7 @@ public final class XContentBuilder implements BytesStream {
}
public XContentBuilder timeValueField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, long rawTime) throws IOException {
if (readableFormat) {
if (humanReadable) {
field(readableFieldName, new TimeValue(rawTime).toString());
}
field(rawFieldName, rawTime);
@ -853,7 +853,7 @@ public final class XContentBuilder implements BytesStream {
}
public XContentBuilder byteSizeField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, ByteSizeValue byteSizeValue) throws IOException {
if (readableFormat) {
if (humanReadable) {
field(readableFieldName, byteSizeValue.toString());
}
field(rawFieldName, byteSizeValue.bytes());
@ -861,7 +861,7 @@ public final class XContentBuilder implements BytesStream {
}
public XContentBuilder byteSizeField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, long rawSize) throws IOException {
if (readableFormat) {
if (humanReadable) {
field(readableFieldName, new ByteSizeValue(rawSize).toString());
}
field(rawFieldName, rawSize);

2
src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java
View File

@ -58,7 +58,7 @@ public class RestXContentBuilder {
builder.prettyPrint();
}
builder.readableFormat(request.paramAsBoolean("readable_format", builder.readableFormat()));
builder.humanReadable(request.paramAsBoolean("human", builder.humanReadable()));
String casing = request.param("case");
if (casing != null && "camelCase".equals(casing)) {