Skip to content

refactor: remove redundant null checks after throwing template factories #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shalousun merged 1 commit into from
Aug 23, 2026
Merged

refactor: remove redundant null checks after throwing template factories #29

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: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/AdocDocBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import com.thoughtworks.qdox.JavaProjectBuilder;

import java.util.List;
import java.util.Objects;

/**
* Use to create Asciidoc
Expand Down Expand Up @@ -77,7 +76,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas();
if (config.isAllInOne()) {
String docName = builderTemplate.allInOneDocName(config, INDEX_DOC, DocGlobalConstants.ASCIIDOC_EXTENSION);
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/ApiDocBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import com.thoughtworks.qdox.JavaProjectBuilder;

import java.util.List;
import java.util.Objects;

/**
* use to create Markdown doc
Expand Down Expand Up @@ -67,7 +66,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas();
if (config.isAllInOne()) {
String version = config.isCoverOld() ? "" : "-V" + DateTimeUtil.long2Str(System.currentTimeMillis(),
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/smartdoc/builder/DocBuilderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,6 @@ private List<ApiDoc> listOfApiData(ApiConfig config, JavaProjectBuilder javaProj
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
return docBuildTemplate.getApiData(configBuilder).getApiDatas();
}

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/HtmlApiDocBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.beetl.core.Template;

import java.util.List;
import java.util.Objects;

/**
* HTML API Doc Builder
Expand Down Expand Up @@ -86,7 +85,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas();
builderTemplate.copyJQueryAndCss(config);
if (config.isAllInOne()) {
Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/smartdoc/builder/IBaseDocBuilderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ default List<T> getApiDoc(boolean isAsciidoc, boolean showJavaType, boolean para
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<T> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
return docBuildTemplate.getApiData(configBuilder).getApiDatas();
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/smartdoc/builder/IRpcDocBuilderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ default List<T> listOfApiData(ApiConfig config, JavaProjectBuilder javaProjectBu
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<T> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
return docBuildTemplate.getApiData(configBuilder).getApiDatas();
}

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/JMeterBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.thoughtworks.qdox.JavaProjectBuilder;

import java.util.List;
import java.util.Objects;

/**
* used to generate jmx file for Jmeter
Expand Down Expand Up @@ -75,7 +74,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas();
String version = config.isCoverOld() ? "" : "-V"
+ DateTimeUtil.long2Str(System.currentTimeMillis(), DocGlobalConstants.DATE_FORMAT_YYYY_MM_DD_HH_MM);
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/PostmanJsonBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

/**
Expand Down Expand Up @@ -278,7 +277,6 @@ private static List<HeaderBean> buildHeaderBeanList(ApiMethodDoc apiMethodDoc) {
private static void postManCreate(ApiConfig config, ProjectDocConfigBuilder configBuilder) {
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
config.setShowJavaType(true);
List<ApiDoc> apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas();
apiDocList = docBuildTemplate.handleApiGroup(apiDocList, config);
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/TornaBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

import static io.github.smartdoc.constants.TornaConstants.DEFAULT_GROUP_CODE;

Expand Down Expand Up @@ -154,7 +153,6 @@ private static List<ApiDoc> generateApiDocs(ApiConfig config, JavaProjectBuilder
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
ApiSchema<ApiDoc> apiSchema = docBuildTemplate.getApiData(configBuilder);
return docBuildTemplate.handleApiGroup(apiSchema.getApiDatas(), config);
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/WordDocBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.beetl.core.Template;

import java.util.List;
import java.util.Objects;

/**
* Word doc builder
Expand Down Expand Up @@ -94,7 +93,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
ApiSchema<ApiDoc> apiSchema = docBuildTemplate.getApiData(configBuilder);
List<ApiDoc> apiDocList = apiSchema.getApiDatas();

Expand Down
3 changes: 0 additions & 3 deletions src/main/java/io/github/smartdoc/builder/javadoc/JavadocDocBuilderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/**
* java doc build template.
Expand Down Expand Up @@ -170,7 +169,6 @@ private List<JavadocApiDoc> listOfApiData(ApiConfig config, JavaProjectBuilder j
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<JavadocApiDoc> docBuildTemplate = BuildTemplateFactory
.getDocBuildTemplate(config.getFramework(), config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
ApiSchema<JavadocApiDoc> apiSchema = docBuildTemplate.getApiData(configBuilder);
return apiSchema.getApiDatas();
}
Expand All @@ -186,7 +184,6 @@ public List<JavadocApiDoc> getJavadocApiDoc(ApiConfig config, JavaProjectBuilder
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IDocBuildTemplate<JavadocApiDoc> docBuildTemplate = BuildTemplateFactory
.getDocBuildTemplate(config.getFramework(), config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
return docBuildTemplate.getApiData(configBuilder).getApiDatas();
}

Expand Down
1 change: 0 additions & 1 deletion src/main/java/io/github/smartdoc/builder/openapi/AbstractOpenApiBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,7 +645,6 @@ public ApiSchema<ApiDoc> getOpenApiDocs(ApiConfig config, JavaProjectBuilder pro
config.setParamsDataToTree(true);
IDocBuildTemplate<ApiDoc> docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(),
config.getClassLoader());
Objects.requireNonNull(docBuildTemplate, "doc build template is null");
return docBuildTemplate.getApiData(configBuilder);
}

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/io/github/smartdoc/builder/websocket/WebSocketDocBuilderTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;

/**
* WebSocket doc builder template.
Expand Down Expand Up @@ -81,7 +80,6 @@ public List<WebSocketDoc> getWebSocketApiDoc(ApiConfig config, JavaProjectBuilde
ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder);
IWebSocketDocBuildTemplate<WebSocketDoc> webSocketDocBuildTemplate = BuildTemplateFactory
.getWebSocketDocBuildTemplate(config.getFramework(), config.getClassLoader());
Objects.requireNonNull(webSocketDocBuildTemplate, "doc build websocket template is null");
return webSocketDocBuildTemplate.getWebSocketData(configBuilder);
}

Expand Down
Loading