Commit 6526493
committed
新增 JSON.format
1 parent 1662e21 commit 6526493
3 files changed
Lines changed: 23 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,8 +32,8 @@ public JSONArray createJSONArray() { | |||
| 32 | 32 | } | |
| 33 | 33 | ||
| 34 | 34 | @Override | |
| 35 | - public String toJSONString(Object obj) { | ||
| 36 | - return JSON.toJSONString(obj); | ||
| 35 | + public String toJSONString(Object obj, boolean format) { | ||
| 36 | + throw new UnsupportedOperationException(); | ||
| 37 | 37 | } | |
| 38 | 38 | ||
| 39 | 39 | @Override | |
@@ -178,11 +178,21 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> List<T> | |||
| 178 | 178 | return null; | |
| 179 | 179 | } | |
| 180 | 180 | ||
| 181 | + /** | ||
| 182 | + * @param obj | ||
| 183 | + * @return | ||
| 184 | + */ | ||
| 185 | + public static String format(Object obj) { | ||
| 186 | + return toJSONString(obj, true); | ||
| 187 | + } | ||
| 181 | 188 | /** | |
| 182 | 189 | * @param obj | |
| 183 | 190 | * @return | |
| 184 | 191 | */ | |
| 185 | 192 | public static String toJSONString(Object obj) { | |
| 193 | + return toJSONString(obj, false); | ||
| 194 | + } | ||
| 195 | + public static String toJSONString(Object obj, boolean format) { | ||
| 186 | 196 | if (obj == null) { | |
| 187 | 197 | return null; | |
| 188 | 198 | } | |
@@ -235,7 +245,7 @@ public static String toJSONString(Object obj) { | |||
| 235 | 245 | // return sb.toString(); | |
| 236 | 246 | //} | |
| 237 | 247 | ||
| 238 | - return DEFAULT_JSON_PARSER.toJSONString(obj); | ||
| 248 | + return DEFAULT_JSON_PARSER.toJSONString(obj, format); | ||
| 239 | 249 | } | |
| 240 | 250 | ||
| 241 | 251 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -23,5 +23,11 @@ public interface JSONParser<M extends Map<String, Object>, L extends List<Object | |||
| 23 | 23 | ||
| 24 | 24 | <T> List<T> parseArray(Object json, Class<T> clazz); | |
| 25 | 25 | ||
| 26 | - String toJSONString(Object obj); | ||
| 26 | + default String format(Object obj) { | ||
| 27 | + return toJSONString(obj, true); | ||
| 28 | + } | ||
| 29 | + default String toJSONString(Object obj) { | ||
| 30 | + return toJSONString(obj, false); | ||
| 31 | + } | ||
| 32 | + String toJSONString(Object obj, boolean format); | ||
| 27 | 33 | } | |
Lines changed: 3 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -495,7 +495,8 @@ public static <T, M extends Map<String, Object>, L extends List<Object>> Object | |||
| 495 | 495 | return invokeScript(parser, methodName, parameterTypes, args, returnType, current, scriptExecutor); | |
| 496 | 496 | } | |
| 497 | 497 | ||
| 498 | - Method m = parser.getClass().getMethod(methodName, parameterTypes); // 不用判空，拿不到就会抛异常 | ||
| 498 | + Class<? extends AbstractFunctionParser> cls = parser.getClass(); | ||
| 499 | + Method m = cls.getMethod(methodName, parameterTypes); // 不用判空，拿不到就会抛异常 | ||
| 499 | 500 | ||
| 500 | 501 | if (Log.DEBUG) { | |
| 501 | 502 | String rt = Log.DEBUG && m.getReturnType() != null ? m.getReturnType().getSimpleName() : null; | |
@@ -656,6 +657,7 @@ else if (v instanceof Collection) { // 泛型兼容？ // JSONArray | |||
| 656 | 657 | } | |
| 657 | 658 | else { | |
| 658 | 659 | types = new Class<?>[length + 1]; | |
| 660 | + //types[0] = Object.class; // 泛型擦除 JSON.JSON_OBJECT_CLASS; | ||
| 659 | 661 | types[0] = JSON.JSON_OBJECT_CLASS; | |
| 660 | 662 | ||
| 661 | 663 | values = new Object[length + 1]; | |
0 commit comments