wanjia950611
/
smart-doc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Optimised JsonBuildHelper

This commit is contained in:
shalousun 2021-06-26 16:06:46 +08:00
parent ee230dcd62
commit 01cd6f18d3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/power/doc/helper/JsonBuildHelper.java
View File

@ -22,7 +22,6 @@
*/
package com.power.doc.helper;
import com.power.common.util.JsonFormatUtil;
import com.power.common.util.StringUtil;
import com.power.doc.builder.ProjectDocConfigBuilder;
import com.power.doc.constants.DocAnnotationConstants;
@ -61,6 +60,16 @@ public class JsonBuildHelper {
if (Objects.nonNull(downloadTag)) {
return "File download.";
}
if (method.getReturns().isEnum()) {
return StringUtil.removeQuotes(String.valueOf(JavaClassUtil.getEnumValue(method.getReturns(), Boolean.FALSE)));
}
if (method.getReturns().isPrimitive()) {
String typeName = method.getReturnType().getCanonicalName();
return StringUtil.removeQuotes(DocUtil.jsonValueByType(typeName));
}
if (DocGlobalConstants.JAVA_STRING_FULLY.equals(method.getReturnType().getGenericCanonicalName())) {
return "string";
}
String returnTypeGenericCanonicalName = method.getReturnType().getGenericCanonicalName();
if (Objects.nonNull(builder.getApiConfig().getResponseBodyAdvice())
&& Objects.isNull(method.getTagByName(IGNORE_RESPONSE_BODY_ADVICE))) {
@ -91,6 +100,7 @@ public class JsonBuildHelper {
}
return StringUtil.removeQuotes(DocUtil.jsonValueByType(typeName));
}
return JsonUtil.toPrettyFormat(buildJson(typeName, returnType, Boolean.TRUE, 0, new HashMap<>(), builder));
}
@ -129,7 +139,7 @@ public class JsonBuildHelper {
return StringUtil.removeQuotes(DocUtil.jsonValueByType(typeName));
}
if (javaClass.isEnum()) {
return String.valueOf(JavaClassUtil.getEnumValue(javaClass, Boolean.FALSE));
return StringUtil.removeQuotes(String.valueOf(JavaClassUtil.getEnumValue(javaClass, Boolean.FALSE)));
}
boolean skipTransientField = apiConfig.isSkipTransientField();
StringBuilder data0 = new StringBuilder();

6
src/main/java/com/power/doc/utils/JsonUtil.java
View File

@ -4,6 +4,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonParser;
import com.power.common.util.JsonFormatUtil;
/**
* @author yu 2021/6/26.
@ -17,10 +18,7 @@ public class JsonUtil {
* @return Format json string
*/
public static String toPrettyFormat(String jsonString) {
JsonElement jsonElement = JsonParser.parseString(jsonString);
Gson gson = new GsonBuilder().setPrettyPrinting().create();
String prettyJson = gson.toJson(jsonElement);
return prettyJson;
return JsonFormatUtil.formatJson(jsonString);
}
/**