From 67ea4d1b94c9f753b730af7de3b3ec9290a839ac Mon Sep 17 00:00:00 2001 From: oppofind <836575280@qq.com> Date: Sat, 8 Aug 2020 22:34:11 +0800 Subject: [PATCH] fix null point error, while dictionary is null. --- src/main/java/com/power/doc/model/ApiConfig.java | 5 +++++ .../com/power/doc/template/SpringBootDocBuildTemplate.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/power/doc/model/ApiConfig.java b/src/main/java/com/power/doc/model/ApiConfig.java index f125174..ccf68de 100644 --- a/src/main/java/com/power/doc/model/ApiConfig.java +++ b/src/main/java/com/power/doc/model/ApiConfig.java @@ -27,6 +27,7 @@ import com.power.doc.constants.DocLanguage; import com.power.doc.model.rpc.RpcApiDependency; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -223,6 +224,7 @@ public class ApiConfig { /** * custom setting api document name + * * @since 1.9.0 */ private String allInOneDocFileName; @@ -345,6 +347,9 @@ public class ApiConfig { } public ApiDataDictionary getDataDictionary(String enumClassSimpleName) { + if (Objects.isNull(this.dataDictionaries)) { + return null; + } return this.dataDictionaries.stream().filter((apiDataDictionary -> enumClassSimpleName.equalsIgnoreCase(apiDataDictionary.getEnumClassName()))) .findFirst().orElse(new ApiDataDictionary()); diff --git a/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java b/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java index 0b1fe0f..ff34df0 100644 --- a/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java +++ b/src/main/java/com/power/doc/template/SpringBootDocBuildTemplate.java @@ -531,7 +531,7 @@ public class SpringBootDocBuildTemplate implements IDocBuildTemplate { String[] gicNameArr = DocClassUtil.getSimpleGicName(typeName); paramList.addAll(ParamsBuildHelper.buildParams(gicNameArr[1], DocGlobalConstants.EMPTY, 0, "true", responseFieldMap, Boolean.FALSE, new HashMap<>(), builder, groupClasses, 0)); } - //参数列表 当为枚举时 + // param is enum else if (javaClass.isEnum()) { String o = JavaClassUtil.getEnumParams(javaClass);