Renamed readable_format flag to human

Closes #3541
elastic · Aug 20, 2013 · b6c55c1 · b6c55c1
1 parent cf9df5c
commit b6c55c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java b/src/main/java/org/elasticsearch/common/xcontent/XContentBuilder.java
@@ -83,7 +83,7 @@ public static XContentBuilder builder(XContent xContent) throws IOException {
 
     private StringBuilder cachedStringBuilder;
 
-    private boolean readableFormat = true;
+    private boolean humanReadable = true;
 
     /**
      * Constructs a new builder using the provided xcontent and an OutputStream. Make sure
@@ -108,13 +108,13 @@ public XContentBuilder prettyPrint() {
         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,31 +837,31 @@ public XContentBuilder rawField(String fieldName, BytesReference content) throws
     }
 
     public XContentBuilder timeValueField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, TimeValue timeValue) throws IOException {
-        if (readableFormat) {
+        if (humanReadable) {
             field(readableFieldName, timeValue.toString());
         }
         field(rawFieldName, timeValue.millis());
         return this;
     }
 
     public XContentBuilder timeValueField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, long rawTime) throws IOException {
-        if (readableFormat) {
+        if (humanReadable) {
             field(readableFieldName, new TimeValue(rawTime).toString());
         }
         field(rawFieldName, rawTime);
         return this;
     }
 
     public XContentBuilder byteSizeField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, ByteSizeValue byteSizeValue) throws IOException {
-        if (readableFormat) {
+        if (humanReadable) {
             field(readableFieldName, byteSizeValue.toString());
         }
         field(rawFieldName, byteSizeValue.bytes());
         return this;
     }
 
     public XContentBuilder byteSizeField(XContentBuilderString rawFieldName, XContentBuilderString readableFieldName, long rawSize) throws IOException {
-        if (readableFormat) {
+        if (humanReadable) {
             field(readableFieldName, new ByteSizeValue(rawSize).toString());
         }
         field(rawFieldName, rawSize);

diff --git a/src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java b/src/main/java/org/elasticsearch/rest/action/support/RestXContentBuilder.java
@@ -58,7 +58,7 @@ public static XContentBuilder restContentBuilder(RestRequest request, @Nullable
             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)) {