Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions src/main/java/io/github/smartdoc/helper/ParamsBuildHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -741,10 +741,16 @@ public static List<ApiParam> buildMapParam(String[] globGicName, String pre, int
paramList.add(apiParam);
// in foreach, need remove enum class in registry
registryClasses.remove(valueSimpleName);
List<ApiParam> apiParams = addValueParams(valueSimpleName, globGicName, level, isRequired, isResp,
registryClasses, projectBuilder, groupClasses, jsonViewClasses, apiParam.getId(), jsonRequest,
nextLevel, atomicInteger);
paramList.addAll(apiParams);
// Handle generic object types
if (JavaTypeConstants.JAVA_OBJECT_FULLY.equals(valueSimpleName)) {
paramList.addAll(buildGenericObjectParam(valueSimpleName, pre, isRequired, atomicInteger, pid));
}
else {
List<ApiParam> apiParams = addValueParams(valueSimpleName, globGicName, level, isRequired, isResp,
registryClasses, projectBuilder, groupClasses, jsonViewClasses, apiParam.getId(),
jsonRequest, nextLevel, atomicInteger);
paramList.addAll(apiParams);
}
}
return paramList;
}
Expand Down
11 changes: 11 additions & 0 deletions src/main/java/io/github/smartdoc/template/IJavadocDocTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,21 @@ default List<T> processClassHierarchy(JavaClass cls, Function<JavaClass, List<T>
*/
default List<T> getParentsClassAndInterfaceMethods(ApiConfig apiConfig, JavaClass cls) {
return this.processClassHierarchy(cls, currentClass -> {
// Skip the starting class — its methods are already handled in
// buildServiceMethod
if (currentClass.equals(cls)) {
return new ArrayList<>();
}
List<T> docJavaMethods = new ArrayList<>();
Map<String, JavaType> actualTypesMap = JavaClassUtil.getActualTypesMap(currentClass);
List<JavaMethod> methodList = currentClass.getMethods();
for (JavaMethod method : methodList) {
if (method.isPrivate()) {
continue;
}
if (Objects.nonNull(method.getTagByName(IGNORE))) {
continue;
}
docJavaMethods.add(this.convertToJavadocJavaMethod(apiConfig, method, actualTypesMap));
}
return docJavaMethods;
Expand Down
Loading