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

fix gitee #I27T49 .

This commit is contained in:
oppofind 2020-12-03 00:01:50 +08:00
parent 55a368ac3d
commit b0c41fb2ae
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ public class JsonBuildHelper {
} }
} }
if (JavaClassValidateUtil.isPrimitive(typeName)) { if (JavaClassValidateUtil.isPrimitive(typeName)) {
if(DocGlobalConstants.JAVA_STRING_FULLY.equals(typeName)){ if (DocGlobalConstants.JAVA_STRING_FULLY.equals(typeName)) {
return "string"; return "string";
} }
return StringUtil.removeQuotes(DocUtil.jsonValueByType(typeName)); return StringUtil.removeQuotes(DocUtil.jsonValueByType(typeName));
@ -229,24 +229,27 @@ public class JsonBuildHelper {
String fieldGicName = docField.getGenericCanonicalName(); String fieldGicName = docField.getGenericCanonicalName();
data0.append("\"").append(fieldName).append("\":"); data0.append("\"").append(fieldName).append("\":");
String fieldValue = "";
if (tagsMap.containsKey(DocTags.MOCK) && StringUtil.isNotEmpty(tagsMap.get(DocTags.MOCK))) {
fieldValue = tagsMap.get(DocTags.MOCK);
if (!DocUtil.javaPrimaryType(typeSimpleName)
&& !JavaClassValidateUtil.isCollection(fieldGicName)
&& !JavaClassValidateUtil.isMap(fieldGicName)) {
fieldValue = DocUtil.handleJsonStr(fieldValue);
}
}
if (JavaClassValidateUtil.isPrimitive(subTypeName)) { if (JavaClassValidateUtil.isPrimitive(subTypeName)) {
String fieldValue = ""; if (StringUtil.isEmpty(fieldValue)) {
if (tagsMap.containsKey(DocTags.MOCK) && StringUtil.isNotEmpty(tagsMap.get(DocTags.MOCK))) {
fieldValue = tagsMap.get(DocTags.MOCK);
if ("String".equals(typeSimpleName)) {
fieldValue = DocUtil.handleJsonStr(fieldValue);
}
} else {
fieldValue = DocUtil.getValByTypeAndFieldName(typeSimpleName, field.getName()); fieldValue = DocUtil.getValByTypeAndFieldName(typeSimpleName, field.getName());
} }
CustomRespField customResponseField = builder.getCustomRespFieldMap().get(fieldName); CustomRespField customResponseField = builder.getCustomRespFieldMap().get(fieldName);
if (null != customResponseField) { if (null != customResponseField) {
Object val = customResponseField.getValue(); Object val = customResponseField.getValue();
if (null != val) { if (null != val) {
if ("String".equals(typeSimpleName)) { if (DocUtil.javaPrimaryType(typeSimpleName)) {
data0.append(DocUtil.handleJsonStr(String.valueOf(val))).append(",");
} else {
data0.append(val).append(","); data0.append(val).append(",");
} else {
data0.append(DocUtil.handleJsonStr(String.valueOf(val))).append(",");
} }
} else { } else {
data0.append(fieldValue).append(","); data0.append(fieldValue).append(",");
@ -256,13 +259,17 @@ public class JsonBuildHelper {
} }
} else { } else {
if (JavaClassValidateUtil.isCollection(subTypeName) || JavaClassValidateUtil.isArray(subTypeName)) { if (JavaClassValidateUtil.isCollection(subTypeName) || JavaClassValidateUtil.isArray(subTypeName)) {
if (StringUtil.isNotEmpty(fieldValue)) {
data0.append(fieldValue).append(",");
continue out;
}
if (globGicName.length > 0 && "java.util.List".equals(fieldGicName)) { if (globGicName.length > 0 && "java.util.List".equals(fieldGicName)) {
fieldGicName = fieldGicName + "<T>"; fieldGicName = fieldGicName + "<T>";
} }
fieldGicName = JavaClassValidateUtil.isArray(subTypeName) ? fieldGicName.substring(0, fieldGicName.indexOf("[")) : fieldGicName; fieldGicName = JavaClassValidateUtil.isArray(subTypeName) ? fieldGicName.substring(0, fieldGicName.indexOf("[")) : fieldGicName;
if (DocClassUtil.getSimpleGicName(fieldGicName).length == 0) { if (DocClassUtil.getSimpleGicName(fieldGicName).length == 0) {
data0.append("{\"object\":\"any object\"},"); data0.append("[{\"object\":\"any object\"}],");
continue out; continue out;
} }
String gicName = DocClassUtil.getSimpleGicName(fieldGicName)[0]; String gicName = DocClassUtil.getSimpleGicName(fieldGicName)[0];
@ -270,10 +277,10 @@ public class JsonBuildHelper {
if (DocGlobalConstants.JAVA_STRING_FULLY.equals(gicName)) { if (DocGlobalConstants.JAVA_STRING_FULLY.equals(gicName)) {
data0.append("[").append("\"").append(buildJson(gicName, fieldGicName, isResp, nextLevel, registryClasses, builder)).append("\"]").append(","); data0.append("[").append("\"").append(buildJson(gicName, fieldGicName, isResp, nextLevel, registryClasses, builder)).append("\"]").append(",");
} else if (DocGlobalConstants.JAVA_LIST_FULLY.equals(gicName)) { } else if (DocGlobalConstants.JAVA_LIST_FULLY.equals(gicName)) {
data0.append("{\"object\":\"any object\"},"); data0.append("[{\"object\":\"any object\"}],");
} else if (gicName.length() == 1) { } else if (gicName.length() == 1) {
if (globGicName.length == 0) { if (globGicName.length == 0) {
data0.append("{\"object\":\"any object\"},"); data0.append("[{\"object\":\"any object\"}],");
continue out; continue out;
} }
String gicName1 = genericMap.get(gicName) == null ? globGicName[0] : genericMap.get(gicName); String gicName1 = genericMap.get(gicName) == null ? globGicName[0] : genericMap.get(gicName);
@ -298,6 +305,10 @@ public class JsonBuildHelper {
} }
} }
} else if (JavaClassValidateUtil.isMap(subTypeName)) { } else if (JavaClassValidateUtil.isMap(subTypeName)) {
if (StringUtil.isNotEmpty(fieldValue)) {
data0.append(fieldValue).append(",");
continue out;
}
if (JavaClassValidateUtil.isMap(fieldGicName)) { if (JavaClassValidateUtil.isMap(fieldGicName)) {
data0.append("{").append("\"mapKey\":{}},"); data0.append("{").append("\"mapKey\":{}},");
continue out; continue out;

2
src/main/java/com/power/doc/utils/DocClassUtil.java
View File

@ -62,7 +62,7 @@ public class DocClassUtil {
String[] arr = type.split(","); String[] arr = type.split(",");
return classNameFix(arr); return classNameFix(arr);
} else { } else {
return returnType.split(" "); return new String[0];
} }
} }

8
src/main/java/com/power/doc/utils/DocUtil.java
View File

@ -159,13 +159,13 @@ public class DocUtil {
break; break;
} }
} }
if (null == value) { if (Objects.isNull(value)) {
return jsonValueByType(typeName); return jsonValueByType(typeName);
} else { } else {
if ("string".equals(type.toLowerCase())) { if (javaPrimaryType(type)) {
return handleJsonStr(value.toString());
} else {
return value.toString(); return value.toString();
} else {
return handleJsonStr(value.toString());
} }
} }
} }