Skip to content
This repository was archived by the owner on Dec 4, 2025. It is now read-only.

fix(enum): Fix the json request enumeration identification error #990

Merged
shalousun merged 1 commit into from
Dec 13, 2024
Merged

fix(enum): Fix the json request enumeration identification error #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/ly/doc/helper/ParamsBuildHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ else if (JavaClassValidateUtil.isCollection(subTypeName)
param.setType(ParamTypeConstants.PARAM_TYPE_ARRAY);

EnumInfoAndValues enumInfoAndValue = JavaClassUtil.getEnumInfoAndValue(arraySubClass,
projectBuilder, Boolean.TRUE);
projectBuilder, jsonRequest || isResp);
if (Objects.nonNull(enumInfoAndValue)) {
param.setValue("[" + enumInfoAndValue.getValue() + "]")
.setEnumInfoAndValues(enumInfoAndValue);
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/ly/doc/template/IRestDocTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,7 @@ default ApiMethodReqParam requestParams(final DocJavaMethod docJavaMethod, Proje
String strRequired = "false";
boolean required = false;
boolean isRequestPart = false;
boolean jsonRequest = false;
ApiParamEnum apiParamEnum = null;
if (paramAnnotations.isEmpty() && (Methods.GET.getValue().equals(docJavaMethod.getMethodType())
|| Methods.DELETE.getValue().equals(docJavaMethod.getMethodType()))) {
Expand Down Expand Up @@ -1096,6 +1097,7 @@ else if (frameworkAnnotations.getRequestPartAnnotation()
new HashMap<>(16), groupClasses, docJavaMethod.getJsonViewClasses(), builder);
requestBodyCounter++;
apiParamEnum = ApiParamEnum.BODY;
jsonRequest = true;
}
required = Boolean.parseBoolean(strRequired);
}
Expand Down Expand Up @@ -1168,7 +1170,7 @@ else if (frameworkAnnotations.getRequestPartAnnotation()
.setId(paramList.size() + 1)
.setType(ParamTypeConstants.PARAM_TYPE_ARRAY);
EnumInfoAndValues enumInfoAndValue = JavaClassUtil.getEnumInfoAndValue(gicJavaClass, builder,
Boolean.FALSE);
jsonRequest);
if (Objects.nonNull(enumInfoAndValue)) {
param.setValue(StringUtil.removeDoubleQuotes(String.valueOf(enumInfoAndValue.getValue())))
.setEnumInfoAndValues(enumInfoAndValue);
Expand Down Expand Up @@ -1276,8 +1278,7 @@ else if (javaClass.isEnum()) {
.setRequired(required)
.setVersion(DocGlobalConstants.DEFAULT_VERSION);

EnumInfoAndValues enumInfoAndValue = JavaClassUtil.getEnumInfoAndValue(javaClass, builder,
ApiParamEnum.BODY.equals(apiParamEnum));
EnumInfoAndValues enumInfoAndValue = JavaClassUtil.getEnumInfoAndValue(javaClass, builder, jsonRequest);
if (Objects.nonNull(enumInfoAndValue)) {
param.setValue(StringUtil.removeDoubleQuotes(String.valueOf(enumInfoAndValue.getValue())))
.setEnumInfoAndValues(enumInfoAndValue)
Expand All @@ -1302,12 +1303,12 @@ else if (isRequestPart) {
paramList.add(param);
paramList.addAll(ParamsBuildHelper.buildParams(typeName, DocGlobalConstants.PARAM_PREFIX, 1,
String.valueOf(required), Boolean.FALSE, new HashMap<>(16), builder, groupClasses,
docJavaMethod.getJsonViewClasses(), 1, ApiParamEnum.BODY.equals(apiParamEnum), null));
docJavaMethod.getJsonViewClasses(), 1, jsonRequest, null));
}
else {
List<ApiParam> apiParams = ParamsBuildHelper.buildParams(typeName, DocGlobalConstants.EMPTY, 0,
String.valueOf(required), Boolean.FALSE, new HashMap<>(16), builder, groupClasses,
docJavaMethod.getJsonViewClasses(), 0, ApiParamEnum.BODY.equals(apiParamEnum), null);
docJavaMethod.getJsonViewClasses(), 0, jsonRequest, null);

boolean hasFile = apiParams.stream()
.anyMatch(param -> ParamTypeConstants.PARAM_TYPE_FILE.equals(param.getType()));
Expand Down
Loading