Add support for compact JSON output.

gk-brown · gk-brown · commit ca71d19e0f3e · 2018-10-18T20:01:58.000-04:00
diff --git a/httprpc/build.gradle b/httprpc/build.gradle
@@ -20,7 +20,7 @@ plugins {
 }
 
 group = 'org.httprpc'
-version = '5.9.4'
+version = '5.9.5'
 
 repositories {
     mavenCentral()
diff --git a/httprpc/src/main/java/org/httprpc/WebService.java b/httprpc/src/main/java/org/httprpc/WebService.java
@@ -512,11 +512,22 @@ protected String getKey(String name) {
     protected void encodeResult(HttpServletRequest request, HttpServletResponse response, Object result) throws IOException {
         response.setContentType(String.format("application/json;charset=%s", UTF_8));
 
-        JSONEncoder jsonEncoder = new JSONEncoder();
+        JSONEncoder jsonEncoder = new JSONEncoder(isCompact());
 
         jsonEncoder.writeValue(BeanAdapter.adapt(result), response.getOutputStream());
     }
 
+    /**
+     * Enables or disables compact output.
+     *
+     * @return
+     * <tt>true</tt> if the encoded output should be compact; <tt>false</tt>,
+     * otherwise.
+     */
+    protected boolean isCompact() {
+        return false;
+    }
+
     private void describeService(HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType(String.format("text/html;charset=%s", UTF_8));
 
diff --git a/httprpc/src/main/java/org/httprpc/io/JSONEncoder.java b/httprpc/src/main/java/org/httprpc/io/JSONEncoder.java
@@ -29,8 +29,28 @@
  * JSON encoder.
  */
 public class JSONEncoder {
+    private boolean compact;
+
     private int depth = 0;
 
+    /**
+     * Constructs a new JSON encoder.
+     */
+    public JSONEncoder() {
+        this(false);
+    }
+
+    /**
+     * Constructs a new JSON encoder.
+     *
+     * @param compact
+     * <tt>true</tt> if the encoded output should be compact; <tt>false</tt>,
+     * otherwise.
+     */
+    public JSONEncoder(boolean compact) {
+        this.compact = compact;
+    }
+
     /**
      * Writes a value to an output stream.
      *
@@ -114,9 +134,11 @@ private void encodeValue(Object value, Writer writer) throws IOException {
                     writer.append(",");
                 }
 
-                writer.append("\n");
+                if (!compact) {
+                    writer.append("\n");
 
-                indent(writer);
+                    indent(writer);
+                }
 
                 encodeValue(element, writer);
 
@@ -125,9 +147,11 @@ private void encodeValue(Object value, Writer writer) throws IOException {
 
             depth--;
 
-            writer.append("\n");
+            if (!compact) {
+                writer.append("\n");
 
-            indent(writer);
+                indent(writer);
+            }
 
             writer.append("]");
         } else if (value instanceof Map<?, ?>) {
@@ -142,15 +166,17 @@ private void encodeValue(Object value, Writer writer) throws IOException {
                     writer.append(",");
                 }
 
-                writer.append("\n");
-
                 Object key = entry.getKey();
 
                 if (key == null) {
                     continue;
                 }
 
-                indent(writer);
+                if (!compact) {
+                    writer.append("\n");
+
+                    indent(writer);
+                }
 
                 encodeValue(key.toString(), writer);
 
@@ -163,9 +189,11 @@ private void encodeValue(Object value, Writer writer) throws IOException {
 
             depth--;
 
-            writer.append("\n");
+            if (!compact) {
+                writer.append("\n");
 
-            indent(writer);
+                indent(writer);
+            }
 
             writer.append("}");
         } else {

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ plugins {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`group = 'org.httprpc'`
`23`		`-version = '5.9.4'`
	`23`	`+version = '5.9.5'`
`24`	`24`
`25`	`25`	`repositories {`
`26`	`26`	`mavenCentral()`