diff --git a/src/main/java/io/github/smartdoc/builder/AdocDocBuilder.java b/src/main/java/io/github/smartdoc/builder/AdocDocBuilder.java index ea4a283f..3504dc4e 100644 --- a/src/main/java/io/github/smartdoc/builder/AdocDocBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/AdocDocBuilder.java @@ -29,7 +29,6 @@ import com.thoughtworks.qdox.JavaProjectBuilder; import java.util.List; -import java.util.Objects; /** * Use to create Asciidoc @@ -77,7 +76,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); List apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas(); if (config.isAllInOne()) { String docName = builderTemplate.allInOneDocName(config, INDEX_DOC, DocGlobalConstants.ASCIIDOC_EXTENSION); diff --git a/src/main/java/io/github/smartdoc/builder/ApiDocBuilder.java b/src/main/java/io/github/smartdoc/builder/ApiDocBuilder.java index ef524a65..1d5e85b9 100644 --- a/src/main/java/io/github/smartdoc/builder/ApiDocBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/ApiDocBuilder.java @@ -30,7 +30,6 @@ import com.thoughtworks.qdox.JavaProjectBuilder; import java.util.List; -import java.util.Objects; /** * use to create Markdown doc @@ -67,7 +66,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); List apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas(); if (config.isAllInOne()) { String version = config.isCoverOld() ? "" : "-V" + DateTimeUtil.long2Str(System.currentTimeMillis(), diff --git a/src/main/java/io/github/smartdoc/builder/DocBuilderTemplate.java b/src/main/java/io/github/smartdoc/builder/DocBuilderTemplate.java index a9e469ad..8ef4181e 100644 --- a/src/main/java/io/github/smartdoc/builder/DocBuilderTemplate.java +++ b/src/main/java/io/github/smartdoc/builder/DocBuilderTemplate.java @@ -428,7 +428,6 @@ private List listOfApiData(ApiConfig config, JavaProjectBuilder javaProj ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); return docBuildTemplate.getApiData(configBuilder).getApiDatas(); } diff --git a/src/main/java/io/github/smartdoc/builder/HtmlApiDocBuilder.java b/src/main/java/io/github/smartdoc/builder/HtmlApiDocBuilder.java index 913313b5..5c69a5a7 100644 --- a/src/main/java/io/github/smartdoc/builder/HtmlApiDocBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/HtmlApiDocBuilder.java @@ -33,7 +33,6 @@ import org.beetl.core.Template; import java.util.List; -import java.util.Objects; /** * HTML API Doc Builder @@ -86,7 +85,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); List apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas(); builderTemplate.copyJQueryAndCss(config); if (config.isAllInOne()) { diff --git a/src/main/java/io/github/smartdoc/builder/IBaseDocBuilderTemplate.java b/src/main/java/io/github/smartdoc/builder/IBaseDocBuilderTemplate.java index 0b46274b..aa2c0fe2 100644 --- a/src/main/java/io/github/smartdoc/builder/IBaseDocBuilderTemplate.java +++ b/src/main/java/io/github/smartdoc/builder/IBaseDocBuilderTemplate.java @@ -85,7 +85,6 @@ default List getApiDoc(boolean isAsciidoc, boolean showJavaType, boolean para ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); return docBuildTemplate.getApiData(configBuilder).getApiDatas(); } diff --git a/src/main/java/io/github/smartdoc/builder/IRpcDocBuilderTemplate.java b/src/main/java/io/github/smartdoc/builder/IRpcDocBuilderTemplate.java index 1782dee7..4c69d944 100644 --- a/src/main/java/io/github/smartdoc/builder/IRpcDocBuilderTemplate.java +++ b/src/main/java/io/github/smartdoc/builder/IRpcDocBuilderTemplate.java @@ -226,7 +226,6 @@ default List listOfApiData(ApiConfig config, JavaProjectBuilder javaProjectBu ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); return docBuildTemplate.getApiData(configBuilder).getApiDatas(); } diff --git a/src/main/java/io/github/smartdoc/builder/JMeterBuilder.java b/src/main/java/io/github/smartdoc/builder/JMeterBuilder.java index 68ca185e..dd934e92 100644 --- a/src/main/java/io/github/smartdoc/builder/JMeterBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/JMeterBuilder.java @@ -32,7 +32,6 @@ import com.thoughtworks.qdox.JavaProjectBuilder; import java.util.List; -import java.util.Objects; /** * used to generate jmx file for Jmeter @@ -75,7 +74,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); List apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas(); String version = config.isCoverOld() ? "" : "-V" + DateTimeUtil.long2Str(System.currentTimeMillis(), DocGlobalConstants.DATE_FORMAT_YYYY_MM_DD_HH_MM); diff --git a/src/main/java/io/github/smartdoc/builder/PostmanJsonBuilder.java b/src/main/java/io/github/smartdoc/builder/PostmanJsonBuilder.java index 198080a8..ec33d315 100644 --- a/src/main/java/io/github/smartdoc/builder/PostmanJsonBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/PostmanJsonBuilder.java @@ -50,7 +50,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Objects; import java.util.Optional; /** @@ -278,7 +277,6 @@ private static List buildHeaderBeanList(ApiMethodDoc apiMethodDoc) { private static void postManCreate(ApiConfig config, ProjectDocConfigBuilder configBuilder) { IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); config.setShowJavaType(true); List apiDocList = docBuildTemplate.getApiData(configBuilder).getApiDatas(); apiDocList = docBuildTemplate.handleApiGroup(apiDocList, config); diff --git a/src/main/java/io/github/smartdoc/builder/TornaBuilder.java b/src/main/java/io/github/smartdoc/builder/TornaBuilder.java index c3c51c8b..dd71a84d 100644 --- a/src/main/java/io/github/smartdoc/builder/TornaBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/TornaBuilder.java @@ -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; @@ -154,7 +153,6 @@ private static List generateApiDocs(ApiConfig config, JavaProjectBuilder ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); ApiSchema apiSchema = docBuildTemplate.getApiData(configBuilder); return docBuildTemplate.handleApiGroup(apiSchema.getApiDatas(), config); } diff --git a/src/main/java/io/github/smartdoc/builder/WordDocBuilder.java b/src/main/java/io/github/smartdoc/builder/WordDocBuilder.java index f5188512..b070e1b7 100644 --- a/src/main/java/io/github/smartdoc/builder/WordDocBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/WordDocBuilder.java @@ -34,7 +34,6 @@ import org.beetl.core.Template; import java.util.List; -import java.util.Objects; /** * Word doc builder @@ -94,7 +93,6 @@ public static void buildApiDoc(ApiConfig config, JavaProjectBuilder javaProjectB ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); ApiSchema apiSchema = docBuildTemplate.getApiData(configBuilder); List apiDocList = apiSchema.getApiDatas(); diff --git a/src/main/java/io/github/smartdoc/builder/javadoc/JavadocDocBuilderTemplate.java b/src/main/java/io/github/smartdoc/builder/javadoc/JavadocDocBuilderTemplate.java index 2b9a3503..0089dcbb 100644 --- a/src/main/java/io/github/smartdoc/builder/javadoc/JavadocDocBuilderTemplate.java +++ b/src/main/java/io/github/smartdoc/builder/javadoc/JavadocDocBuilderTemplate.java @@ -44,7 +44,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; /** * java doc build template. @@ -170,7 +169,6 @@ private List listOfApiData(ApiConfig config, JavaProjectBuilder j ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory .getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); ApiSchema apiSchema = docBuildTemplate.getApiData(configBuilder); return apiSchema.getApiDatas(); } @@ -186,7 +184,6 @@ public List getJavadocApiDoc(ApiConfig config, JavaProjectBuilder ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory .getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); return docBuildTemplate.getApiData(configBuilder).getApiDatas(); } diff --git a/src/main/java/io/github/smartdoc/builder/openapi/AbstractOpenApiBuilder.java b/src/main/java/io/github/smartdoc/builder/openapi/AbstractOpenApiBuilder.java index 9c56ca5a..8041cd45 100644 --- a/src/main/java/io/github/smartdoc/builder/openapi/AbstractOpenApiBuilder.java +++ b/src/main/java/io/github/smartdoc/builder/openapi/AbstractOpenApiBuilder.java @@ -645,7 +645,6 @@ public ApiSchema getOpenApiDocs(ApiConfig config, JavaProjectBuilder pro config.setParamsDataToTree(true); IDocBuildTemplate docBuildTemplate = BuildTemplateFactory.getDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(docBuildTemplate, "doc build template is null"); return docBuildTemplate.getApiData(configBuilder); } diff --git a/src/main/java/io/github/smartdoc/builder/websocket/WebSocketDocBuilderTemplate.java b/src/main/java/io/github/smartdoc/builder/websocket/WebSocketDocBuilderTemplate.java index b1e0ee9e..3354c681 100644 --- a/src/main/java/io/github/smartdoc/builder/websocket/WebSocketDocBuilderTemplate.java +++ b/src/main/java/io/github/smartdoc/builder/websocket/WebSocketDocBuilderTemplate.java @@ -42,7 +42,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Objects; /** * WebSocket doc builder template. @@ -81,7 +80,6 @@ public List getWebSocketApiDoc(ApiConfig config, JavaProjectBuilde ProjectDocConfigBuilder configBuilder = new ProjectDocConfigBuilder(config, javaProjectBuilder); IWebSocketDocBuildTemplate webSocketDocBuildTemplate = BuildTemplateFactory .getWebSocketDocBuildTemplate(config.getFramework(), config.getClassLoader()); - Objects.requireNonNull(webSocketDocBuildTemplate, "doc build websocket template is null"); return webSocketDocBuildTemplate.getWebSocketData(configBuilder); }