diff --git a/src/main/java/com/ly/doc/helper/FormDataBuildHelper.java b/src/main/java/com/ly/doc/helper/FormDataBuildHelper.java index 433a1825b..f0d175eb7 100644 --- a/src/main/java/com/ly/doc/helper/FormDataBuildHelper.java +++ b/src/main/java/com/ly/doc/helper/FormDataBuildHelper.java @@ -101,8 +101,8 @@ public static List getFormData(String className, Map r for (DocJavaField docField : fields) { JavaField field = docField.getJavaField(); String fieldName = field.getName(); - String subTypeName = docField.getFullyQualifiedName(); - String fieldGicName = docField.getGenericCanonicalName(); + String subTypeName = docField.getTypeFullyQualifiedName(); + String fieldGicName = docField.getTypeGenericCanonicalName(); JavaClass javaClass = field.getType(); if (field.isStatic() || "this$0".equals(fieldName) || JavaClassValidateUtil.isIgnoreFieldTypes(subTypeName)) { diff --git a/src/main/java/com/ly/doc/helper/JsonBuildHelper.java b/src/main/java/com/ly/doc/helper/JsonBuildHelper.java index 247dd1369..9765e25a0 100644 --- a/src/main/java/com/ly/doc/helper/JsonBuildHelper.java +++ b/src/main/java/com/ly/doc/helper/JsonBuildHelper.java @@ -233,7 +233,7 @@ public static String buildJson(String typeName, String genericCanonicalName, if (ignoreFields.containsKey(fieldName)) { continue; } - String subTypeName = docField.getFullyQualifiedName(); + String subTypeName = docField.getTypeFullyQualifiedName(); if ((responseFieldToUnderline && isResp) || (requestFieldToUnderline && !isResp)) { fieldName = StringUtil.camelToUnderline(fieldName); } @@ -267,7 +267,7 @@ public static String buildJson(String typeName, String genericCanonicalName, } } String typeSimpleName = docField.getTypeSimpleName(); - String fieldGicName = docField.getGenericCanonicalName(); + String fieldGicName = docField.getTypeGenericCanonicalName(); CustomField.Key key = CustomField.Key.create(docField.getDeclaringClassName(), fieldName); CustomField customResponseField = CustomField.nameEquals(key, builder.getCustomRespFieldMap()); diff --git a/src/main/java/com/ly/doc/helper/ParamsBuildHelper.java b/src/main/java/com/ly/doc/helper/ParamsBuildHelper.java index 789ccc1c7..c9659f8e5 100644 --- a/src/main/java/com/ly/doc/helper/ParamsBuildHelper.java +++ b/src/main/java/com/ly/doc/helper/ParamsBuildHelper.java @@ -41,7 +41,6 @@ import com.ly.doc.utils.JavaClassValidateUtil; import com.power.common.model.EnumDictionary; import com.power.common.util.CollectionUtil; -import com.power.common.util.StringEscapeUtil; import com.power.common.util.StringUtil; import com.ly.doc.builder.ProjectDocConfigBuilder; import com.ly.doc.constants.DocTags; @@ -176,12 +175,12 @@ public static List buildParams(String className, String pre, int level continue; } - String subTypeName = docField.getFullyQualifiedName(); + String subTypeName = docField.getTypeFullyQualifiedName(); if ((responseFieldToUnderline && isResp) || (requestFieldToUnderline && !isResp)) { fieldName = StringUtil.camelToUnderline(fieldName); } String typeSimpleName = field.getType().getSimpleName(); - String fieldGicName = docField.getGenericCanonicalName(); + String fieldGicName = docField.getTypeGenericCanonicalName(); List javaAnnotations = docField.getAnnotations(); Map tagsMap = DocUtil.getFieldTagsValue(field, docField); @@ -375,7 +374,7 @@ public static List buildParams(String className, String pre, int level } else if (JavaClassValidateUtil.isCollection(subTypeName) || JavaClassValidateUtil.isArray(subTypeName)) { if (isShowJavaType) { // rpc - param.setType(JavaFieldUtil.convertToSimpleTypeName(docField.getGenericFullyQualifiedName())); + param.setType(JavaFieldUtil.convertToSimpleTypeName(docField.getTypeGenericFullyQualifiedName())); } else { param.setType("array"); } diff --git a/src/main/java/com/ly/doc/model/DocJavaField.java b/src/main/java/com/ly/doc/model/DocJavaField.java index c8a42de1d..c5105cd6e 100644 --- a/src/main/java/com/ly/doc/model/DocJavaField.java +++ b/src/main/java/com/ly/doc/model/DocJavaField.java @@ -40,7 +40,7 @@ public class DocJavaField { /** * comment */ - private String Comment; + private String comment; /** * tags @@ -55,17 +55,17 @@ public class DocJavaField { /** * field fullyQualifiedName */ - private String fullyQualifiedName; + private String typeFullyQualifiedName; /** * field genericCanonicalName */ - private String genericCanonicalName; + private String typeGenericCanonicalName; /** * genericFullyQualifiedName */ - private String genericFullyQualifiedName; + private String typeGenericFullyQualifiedName; /** * field generic actualJavaType; @@ -110,29 +110,29 @@ public DocJavaField setJavaField(JavaField javaField) { } public String getComment() { - return Comment; + return comment; } public DocJavaField setComment(String comment) { - Comment = comment; + this.comment = comment; return this; } - public String getFullyQualifiedName() { - return fullyQualifiedName; + public String getTypeFullyQualifiedName() { + return typeFullyQualifiedName; } - public DocJavaField setFullyQualifiedName(String fullyQualifiedName) { - this.fullyQualifiedName = fullyQualifiedName; + public DocJavaField setTypeFullyQualifiedName(String typeFullyQualifiedName) { + this.typeFullyQualifiedName = typeFullyQualifiedName; return this; } - public String getGenericCanonicalName() { - return genericCanonicalName; + public String getTypeGenericCanonicalName() { + return typeGenericCanonicalName; } - public DocJavaField setGenericCanonicalName(String genericCanonicalName) { - this.genericCanonicalName = genericCanonicalName; + public DocJavaField setTypeGenericCanonicalName(String typeGenericCanonicalName) { + this.typeGenericCanonicalName = typeGenericCanonicalName; return this; } @@ -235,12 +235,12 @@ public DocJavaField setDeclaringClassName(String declaringClassName) { return this; } - public String getGenericFullyQualifiedName() { - return genericFullyQualifiedName; + public String getTypeGenericFullyQualifiedName() { + return typeGenericFullyQualifiedName; } - public DocJavaField setGenericFullyQualifiedName(String genericFullyQualifiedName) { - this.genericFullyQualifiedName = genericFullyQualifiedName; + public DocJavaField setTypeGenericFullyQualifiedName(String typeGenericFullyQualifiedName) { + this.typeGenericFullyQualifiedName = typeGenericFullyQualifiedName; return this; } diff --git a/src/main/java/com/ly/doc/utils/JavaClassUtil.java b/src/main/java/com/ly/doc/utils/JavaClassUtil.java index c28b6fbdb..2e251f03b 100644 --- a/src/main/java/com/ly/doc/utils/JavaClassUtil.java +++ b/src/main/java/com/ly/doc/utils/JavaClassUtil.java @@ -67,7 +67,7 @@ public static List getFields(JavaClass cls1, int counter, Map fields = getFields(cls1, counter, addedFields, actualJavaTypes, classLoader); for (DocJavaField field : fields) { - String genericCanonicalName = field.getGenericCanonicalName(); + String genericCanonicalName = field.getTypeGenericCanonicalName(); if (Objects.isNull(genericCanonicalName)) { continue; } @@ -75,8 +75,8 @@ public static List getFields(JavaClass cls1, int counter, Map getFields(JavaClass cls1, int counter, Map getFields(JavaClass cls1, int counter, Map