Skip to content
This repository was archived by the owner on Dec 4, 2025. It is now read-only.
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
22 changes: 22 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,30 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<!--
Fail the build if any Javadoc warnings or errors occur.
This ensures that all Javadoc issues are treated seriously.
-->
<failOnError>true</failOnError>
<additionalOptions>
<!--
Enable strict validation of Javadoc content.
The "all" option checks for syntax, references, and HTML issues.
-->
<additionalOption>-Xdoclint:all</additionalOption>
</additionalOptions>
</configuration>
<executions>
<execution>
<id>validate-javadoc</id>
<phase>validate</phase>
<goals>
<goal>javadoc</goal>
</goals>
</execution>
<execution>
<id>package-javadoc-jar</id>
<phase>package</phase>
<goals>
<goal>jar</goal>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ default void buildAllInOne(List<T> apiDocList, ApiConfig config, JavaProjectBuil
* @param javaProjectBuilder JavaProjectBuilder
* @param template template
* @param outPutFileName output file
* @return beetl Template
*/
default Template buildAllInOneWord(List<RpcApiDoc> apiDocList, ApiConfig config,
JavaProjectBuilder javaProjectBuilder, String template, String outPutFileName) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/ly/doc/template/IRestDocTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -1214,7 +1214,7 @@ else if (JavaClassValidateUtil.isFile(gicName)) {
paramList.add(param);
}
else {
if (requestBodyCounter > 0 || !ApiParamEnum.QUERY.equals(apiParamEnum)) {
if (requestBodyCounter > 0 || !isQueryParam) {
// for json
paramList.addAll(ParamsBuildHelper.buildParams(gicNameArr[0], DocGlobalConstants.EMPTY, 0,
String.valueOf(required), Boolean.FALSE, new HashMap<>(16), builder, groupClasses,
Expand Down Expand Up @@ -1305,6 +1305,7 @@ else if (isRequestPart) {
String.valueOf(required), Boolean.FALSE, new HashMap<>(16), builder, groupClasses,
docJavaMethod.getJsonViewClasses(), 1, jsonRequest, null));
}
// other types
else {
List<ApiParam> apiParams = ParamsBuildHelper.buildParams(typeName, DocGlobalConstants.EMPTY, 0,
String.valueOf(required), Boolean.FALSE, new HashMap<>(16), builder, groupClasses,
Expand All @@ -1313,7 +1314,7 @@ else if (isRequestPart) {
boolean hasFile = apiParams.stream()
.anyMatch(param -> ParamTypeConstants.PARAM_TYPE_FILE.equals(param.getType()));
// if it does not have file and query param, set query param true
if (!hasFile && ApiParamEnum.QUERY.equals(apiParamEnum)) {
if (!hasFile && isQueryParam) {
for (ApiParam apiParam : apiParams) {
apiParam.traverseAndConsume(ApiParam::setQueryParamTrue);
}
Expand Down
Loading