Simplify toJson() method.

javadev · javadev · commit b2e032f83f72 · 2015-08-31T11:41:55.000+03:00
diff --git a/lodash-plugin/src/main/java/com/github/underscore/lodash/$.java b/lodash-plugin/src/main/java/com/github/underscore/lodash/$.java
@@ -950,15 +950,15 @@ public static void writeJson(byte[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -968,15 +968,15 @@ public static void writeJson(short[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -986,15 +986,15 @@ public static void writeJson(int[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -1004,15 +1004,15 @@ public static void writeJson(long[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -1022,15 +1022,15 @@ public static void writeJson(float[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -1040,15 +1040,15 @@ public static void writeJson(double[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -1058,15 +1058,15 @@ public static void writeJson(boolean[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -1094,15 +1094,15 @@ public static void writeJson(Object[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 JsonValue.writeJson(array[0], builder);
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     JsonValue.writeJson(array[i], builder);
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
     }
@@ -1388,7 +1388,7 @@ private String readName() {
             if (current != '"') {
                 throw expected("name");
             }
-            return readStringInternal();
+            return readString();
         }
 
         private String readNull() {
@@ -1423,10 +1423,6 @@ private void readRequiredChar(char ch) {
         }
 
         private String readString() {
-            return readStringInternal();
-        }
-
-        private String readStringInternal() {
             read();
             startCapture();
             while (current != '"') {
diff --git a/string-plugin/src/main/java/com/github/underscore/string/$.java b/string-plugin/src/main/java/com/github/underscore/string/$.java
@@ -532,15 +532,15 @@ public static void writeJson(byte[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -550,15 +550,15 @@ public static void writeJson(short[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -568,15 +568,15 @@ public static void writeJson(int[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -586,15 +586,15 @@ public static void writeJson(long[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -604,15 +604,15 @@ public static void writeJson(float[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -622,15 +622,15 @@ public static void writeJson(double[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -640,15 +640,15 @@ public static void writeJson(boolean[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 builder.append(String.valueOf(array[0]));
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     builder.append(String.valueOf(array[i]));
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
 
@@ -676,15 +676,15 @@ public static void writeJson(Object[] array, StringBuilder builder) {
             } else if (array.length == 0) {
                 builder.append("[]");
             } else {
-                builder.append("[");
+                builder.append('[');
                 JsonValue.writeJson(array[0], builder);
 
                 for (int i = 1; i < array.length; i++) {
-                    builder.append(",");
+                    builder.append(',');
                     JsonValue.writeJson(array[i], builder);
                 }
 
-                builder.append("]");
+                builder.append(']');
             }
         }
     }
@@ -970,7 +970,7 @@ private String readName() {
             if (current != '"') {
                 throw expected("name");
             }
-            return readStringInternal();
+            return readString();
         }
 
         private String readNull() {
@@ -1005,10 +1005,6 @@ private void readRequiredChar(char ch) {
         }
 
         private String readString() {
-            return readStringInternal();
-        }
-
-        private String readStringInternal() {
             read();
             startCapture();
             while (current != '"') {

Original file line number	Diff line number	Diff line change
`@@ -950,15 +950,15 @@ public static void writeJson(byte[] array, StringBuilder builder) {`
`950`	`950`	`} else if (array.length == 0) {`
`951`	`951`	`builder.append("[]");`
`952`	`952`	`} else {`
`953`		`- builder.append("[");`
	`953`	`+ builder.append('[');`
`954`	`954`	`builder.append(String.valueOf(array[0]));`
`955`	`955`
`956`	`956`	`for (int i = 1; i < array.length; i++) {`
`957`		`- builder.append(",");`
	`957`	`+ builder.append(',');`
`958`	`958`	`builder.append(String.valueOf(array[i]));`
`959`	`959`	`}`
`960`	`960`
`961`		`- builder.append("]");`
	`961`	`+ builder.append(']');`
`962`	`962`	`}`
`963`	`963`	`}`
`964`	`964`
`@@ -968,15 +968,15 @@ public static void writeJson(short[] array, StringBuilder builder) {`
`968`	`968`	`} else if (array.length == 0) {`
`969`	`969`	`builder.append("[]");`
`970`	`970`	`} else {`
`971`		`- builder.append("[");`
	`971`	`+ builder.append('[');`
`972`	`972`	`builder.append(String.valueOf(array[0]));`
`973`	`973`
`974`	`974`	`for (int i = 1; i < array.length; i++) {`
`975`		`- builder.append(",");`
	`975`	`+ builder.append(',');`
`976`	`976`	`builder.append(String.valueOf(array[i]));`
`977`	`977`	`}`
`978`	`978`
`979`		`- builder.append("]");`
	`979`	`+ builder.append(']');`
`980`	`980`	`}`
`981`	`981`	`}`
`982`	`982`
`@@ -986,15 +986,15 @@ public static void writeJson(int[] array, StringBuilder builder) {`
`986`	`986`	`} else if (array.length == 0) {`
`987`	`987`	`builder.append("[]");`
`988`	`988`	`} else {`
`989`		`- builder.append("[");`
	`989`	`+ builder.append('[');`
`990`	`990`	`builder.append(String.valueOf(array[0]));`
`991`	`991`
`992`	`992`	`for (int i = 1; i < array.length; i++) {`
`993`		`- builder.append(",");`
	`993`	`+ builder.append(',');`
`994`	`994`	`builder.append(String.valueOf(array[i]));`
`995`	`995`	`}`
`996`	`996`
`997`		`- builder.append("]");`
	`997`	`+ builder.append(']');`
`998`	`998`	`}`
`999`	`999`	`}`
`1000`	`1000`
`@@ -1004,15 +1004,15 @@ public static void writeJson(long[] array, StringBuilder builder) {`
`1004`	`1004`	`} else if (array.length == 0) {`
`1005`	`1005`	`builder.append("[]");`
`1006`	`1006`	`} else {`
`1007`		`- builder.append("[");`
	`1007`	`+ builder.append('[');`
`1008`	`1008`	`builder.append(String.valueOf(array[0]));`
`1009`	`1009`
`1010`	`1010`	`for (int i = 1; i < array.length; i++) {`
`1011`		`- builder.append(",");`
	`1011`	`+ builder.append(',');`
`1012`	`1012`	`builder.append(String.valueOf(array[i]));`
`1013`	`1013`	`}`
`1014`	`1014`
`1015`		`- builder.append("]");`
	`1015`	`+ builder.append(']');`
`1016`	`1016`	`}`
`1017`	`1017`	`}`
`1018`	`1018`
`@@ -1022,15 +1022,15 @@ public static void writeJson(float[] array, StringBuilder builder) {`
`1022`	`1022`	`} else if (array.length == 0) {`
`1023`	`1023`	`builder.append("[]");`
`1024`	`1024`	`} else {`
`1025`		`- builder.append("[");`
	`1025`	`+ builder.append('[');`
`1026`	`1026`	`builder.append(String.valueOf(array[0]));`
`1027`	`1027`
`1028`	`1028`	`for (int i = 1; i < array.length; i++) {`
`1029`		`- builder.append(",");`
	`1029`	`+ builder.append(',');`
`1030`	`1030`	`builder.append(String.valueOf(array[i]));`
`1031`	`1031`	`}`
`1032`	`1032`
`1033`		`- builder.append("]");`
	`1033`	`+ builder.append(']');`
`1034`	`1034`	`}`
`1035`	`1035`	`}`
`1036`	`1036`
`@@ -1040,15 +1040,15 @@ public static void writeJson(double[] array, StringBuilder builder) {`
`1040`	`1040`	`} else if (array.length == 0) {`
`1041`	`1041`	`builder.append("[]");`
`1042`	`1042`	`} else {`
`1043`		`- builder.append("[");`
	`1043`	`+ builder.append('[');`
`1044`	`1044`	`builder.append(String.valueOf(array[0]));`
`1045`	`1045`
`1046`	`1046`	`for (int i = 1; i < array.length; i++) {`
`1047`		`- builder.append(",");`
	`1047`	`+ builder.append(',');`
`1048`	`1048`	`builder.append(String.valueOf(array[i]));`
`1049`	`1049`	`}`
`1050`	`1050`
`1051`		`- builder.append("]");`
	`1051`	`+ builder.append(']');`
`1052`	`1052`	`}`
`1053`	`1053`	`}`
`1054`	`1054`
`@@ -1058,15 +1058,15 @@ public static void writeJson(boolean[] array, StringBuilder builder) {`
`1058`	`1058`	`} else if (array.length == 0) {`
`1059`	`1059`	`builder.append("[]");`
`1060`	`1060`	`} else {`
`1061`		`- builder.append("[");`
	`1061`	`+ builder.append('[');`
`1062`	`1062`	`builder.append(String.valueOf(array[0]));`
`1063`	`1063`
`1064`	`1064`	`for (int i = 1; i < array.length; i++) {`
`1065`		`- builder.append(",");`
	`1065`	`+ builder.append(',');`
`1066`	`1066`	`builder.append(String.valueOf(array[i]));`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`		`- builder.append("]");`
	`1069`	`+ builder.append(']');`
`1070`	`1070`	`}`
`1071`	`1071`	`}`
`1072`	`1072`
`@@ -1094,15 +1094,15 @@ public static void writeJson(Object[] array, StringBuilder builder) {`
`1094`	`1094`	`} else if (array.length == 0) {`
`1095`	`1095`	`builder.append("[]");`
`1096`	`1096`	`} else {`
`1097`		`- builder.append("[");`
	`1097`	`+ builder.append('[');`
`1098`	`1098`	`JsonValue.writeJson(array[0], builder);`
`1099`	`1099`
`1100`	`1100`	`for (int i = 1; i < array.length; i++) {`
`1101`		`- builder.append(",");`
	`1101`	`+ builder.append(',');`
`1102`	`1102`	`JsonValue.writeJson(array[i], builder);`
`1103`	`1103`	`}`
`1104`	`1104`
`1105`		`- builder.append("]");`
	`1105`	`+ builder.append(']');`
`1106`	`1106`	`}`
`1107`	`1107`	`}`
`1108`	`1108`	`}`
`@@ -1388,7 +1388,7 @@ private String readName() {`
`1388`	`1388`	`if (current != '"') {`
`1389`	`1389`	`throw expected("name");`
`1390`	`1390`	`}`
`1391`		`- return readStringInternal();`
	`1391`	`+ return readString();`
`1392`	`1392`	`}`
`1393`	`1393`
`1394`	`1394`	`private String readNull() {`
`@@ -1423,10 +1423,6 @@ private void readRequiredChar(char ch) {`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`	`1425`	`private String readString() {`
`1426`		`- return readStringInternal();`
`1427`		`- }`
`1428`		`-`
`1429`		`- private String readStringInternal() {`
`1430`	`1426`	`read();`
`1431`	`1427`	`startCapture();`
`1432`	`1428`	`while (current != '"') {`
Original file line number	Diff line number	Diff line change
`@@ -532,15 +532,15 @@ public static void writeJson(byte[] array, StringBuilder builder) {`
`532`	`532`	`} else if (array.length == 0) {`
`533`	`533`	`builder.append("[]");`
`534`	`534`	`} else {`
`535`		`- builder.append("[");`
	`535`	`+ builder.append('[');`
`536`	`536`	`builder.append(String.valueOf(array[0]));`
`537`	`537`
`538`	`538`	`for (int i = 1; i < array.length; i++) {`
`539`		`- builder.append(",");`
	`539`	`+ builder.append(',');`
`540`	`540`	`builder.append(String.valueOf(array[i]));`
`541`	`541`	`}`
`542`	`542`
`543`		`- builder.append("]");`
	`543`	`+ builder.append(']');`
`544`	`544`	`}`
`545`	`545`	`}`
`546`	`546`
`@@ -550,15 +550,15 @@ public static void writeJson(short[] array, StringBuilder builder) {`
`550`	`550`	`} else if (array.length == 0) {`
`551`	`551`	`builder.append("[]");`
`552`	`552`	`} else {`
`553`		`- builder.append("[");`
	`553`	`+ builder.append('[');`
`554`	`554`	`builder.append(String.valueOf(array[0]));`
`555`	`555`
`556`	`556`	`for (int i = 1; i < array.length; i++) {`
`557`		`- builder.append(",");`
	`557`	`+ builder.append(',');`
`558`	`558`	`builder.append(String.valueOf(array[i]));`
`559`	`559`	`}`
`560`	`560`
`561`		`- builder.append("]");`
	`561`	`+ builder.append(']');`
`562`	`562`	`}`
`563`	`563`	`}`
`564`	`564`
`@@ -568,15 +568,15 @@ public static void writeJson(int[] array, StringBuilder builder) {`
`568`	`568`	`} else if (array.length == 0) {`
`569`	`569`	`builder.append("[]");`
`570`	`570`	`} else {`
`571`		`- builder.append("[");`
	`571`	`+ builder.append('[');`
`572`	`572`	`builder.append(String.valueOf(array[0]));`
`573`	`573`
`574`	`574`	`for (int i = 1; i < array.length; i++) {`
`575`		`- builder.append(",");`
	`575`	`+ builder.append(',');`
`576`	`576`	`builder.append(String.valueOf(array[i]));`
`577`	`577`	`}`
`578`	`578`
`579`		`- builder.append("]");`
	`579`	`+ builder.append(']');`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`
`@@ -586,15 +586,15 @@ public static void writeJson(long[] array, StringBuilder builder) {`
`586`	`586`	`} else if (array.length == 0) {`
`587`	`587`	`builder.append("[]");`
`588`	`588`	`} else {`
`589`		`- builder.append("[");`
	`589`	`+ builder.append('[');`
`590`	`590`	`builder.append(String.valueOf(array[0]));`
`591`	`591`
`592`	`592`	`for (int i = 1; i < array.length; i++) {`
`593`		`- builder.append(",");`
	`593`	`+ builder.append(',');`
`594`	`594`	`builder.append(String.valueOf(array[i]));`
`595`	`595`	`}`
`596`	`596`
`597`		`- builder.append("]");`
	`597`	`+ builder.append(']');`
`598`	`598`	`}`
`599`	`599`	`}`
`600`	`600`
`@@ -604,15 +604,15 @@ public static void writeJson(float[] array, StringBuilder builder) {`
`604`	`604`	`} else if (array.length == 0) {`
`605`	`605`	`builder.append("[]");`
`606`	`606`	`} else {`
`607`		`- builder.append("[");`
	`607`	`+ builder.append('[');`
`608`	`608`	`builder.append(String.valueOf(array[0]));`
`609`	`609`
`610`	`610`	`for (int i = 1; i < array.length; i++) {`
`611`		`- builder.append(",");`
	`611`	`+ builder.append(',');`
`612`	`612`	`builder.append(String.valueOf(array[i]));`
`613`	`613`	`}`
`614`	`614`
`615`		`- builder.append("]");`
	`615`	`+ builder.append(']');`
`616`	`616`	`}`
`617`	`617`	`}`
`618`	`618`
`@@ -622,15 +622,15 @@ public static void writeJson(double[] array, StringBuilder builder) {`
`622`	`622`	`} else if (array.length == 0) {`
`623`	`623`	`builder.append("[]");`
`624`	`624`	`} else {`
`625`		`- builder.append("[");`
	`625`	`+ builder.append('[');`
`626`	`626`	`builder.append(String.valueOf(array[0]));`
`627`	`627`
`628`	`628`	`for (int i = 1; i < array.length; i++) {`
`629`		`- builder.append(",");`
	`629`	`+ builder.append(',');`
`630`	`630`	`builder.append(String.valueOf(array[i]));`
`631`	`631`	`}`
`632`	`632`
`633`		`- builder.append("]");`
	`633`	`+ builder.append(']');`
`634`	`634`	`}`
`635`	`635`	`}`
`636`	`636`
`@@ -640,15 +640,15 @@ public static void writeJson(boolean[] array, StringBuilder builder) {`
`640`	`640`	`} else if (array.length == 0) {`
`641`	`641`	`builder.append("[]");`
`642`	`642`	`} else {`
`643`		`- builder.append("[");`
	`643`	`+ builder.append('[');`
`644`	`644`	`builder.append(String.valueOf(array[0]));`
`645`	`645`
`646`	`646`	`for (int i = 1; i < array.length; i++) {`
`647`		`- builder.append(",");`
	`647`	`+ builder.append(',');`
`648`	`648`	`builder.append(String.valueOf(array[i]));`
`649`	`649`	`}`
`650`	`650`
`651`		`- builder.append("]");`
	`651`	`+ builder.append(']');`
`652`	`652`	`}`
`653`	`653`	`}`
`654`	`654`
`@@ -676,15 +676,15 @@ public static void writeJson(Object[] array, StringBuilder builder) {`
`676`	`676`	`} else if (array.length == 0) {`
`677`	`677`	`builder.append("[]");`
`678`	`678`	`} else {`
`679`		`- builder.append("[");`
	`679`	`+ builder.append('[');`
`680`	`680`	`JsonValue.writeJson(array[0], builder);`
`681`	`681`
`682`	`682`	`for (int i = 1; i < array.length; i++) {`
`683`		`- builder.append(",");`
	`683`	`+ builder.append(',');`
`684`	`684`	`JsonValue.writeJson(array[i], builder);`
`685`	`685`	`}`
`686`	`686`
`687`		`- builder.append("]");`
	`687`	`+ builder.append(']');`
`688`	`688`	`}`
`689`	`689`	`}`
`690`	`690`	`}`
`@@ -970,7 +970,7 @@ private String readName() {`
`970`	`970`	`if (current != '"') {`
`971`	`971`	`throw expected("name");`
`972`	`972`	`}`
`973`		`- return readStringInternal();`
	`973`	`+ return readString();`
`974`	`974`	`}`
`975`	`975`
`976`	`976`	`private String readNull() {`
`@@ -1005,10 +1005,6 @@ private void readRequiredChar(char ch) {`
`1005`	`1005`	`}`
`1006`	`1006`
`1007`	`1007`	`private String readString() {`
`1008`		`- return readStringInternal();`
`1009`		`- }`
`1010`		`-`
`1011`		`- private String readStringInternal() {`
`1012`	`1008`	`read();`
`1013`	`1009`	`startCapture();`
`1014`	`1010`	`while (current != '"') {`