Merge pull request #841 from linwumingshi/fix/npe

fix: 🐛  ensure non-null collections for API schema properties

Author: shalousun

src/main/java/com/ly/doc/model/ApiSchema.java

@@ -21,6 +21,7 @@
 
 package com.ly.doc.model;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -37,6 +38,9 @@ public class ApiSchema<T> {
     private List<ApiExceptionStatus> apiExceptionStatuses;
 
     public List<T> getApiDatas() {
+        if (apiDatas == null) {
+            apiDatas = new ArrayList<>();
+        }
         return apiDatas;
     }
 
@@ -45,6 +49,9 @@ public void setApiDatas(List<T> apiDatas) {
     }
 
     public List<ApiExceptionStatus> getApiExceptionStatuses() {
+        if (apiExceptionStatuses == null) {
+            apiExceptionStatuses = new ArrayList<>();
+        }
         return apiExceptionStatuses;
     }
 

src/main/java/com/ly/doc/template/IDocBuildTemplate.java

@@ -29,6 +29,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author yu 2019/12/21.
@@ -46,12 +47,15 @@ default ApiSchema<T> getApiData(ProjectDocConfigBuilder projectBuilder) {
         DocMapping.init();
         DocBuildHelper docBuildHelper = DocBuildHelper.create(projectBuilder);
 
-        preRender(docBuildHelper);
+        this.preRender(docBuildHelper);
         // get candidate classes
-        Collection<JavaClass> candidateClasses = getCandidateClasses(projectBuilder, docBuildHelper);
-        ApiSchema<T> apiSchema = renderApi(projectBuilder, candidateClasses);
+        Collection<JavaClass> candidateClasses = this.getCandidateClasses(projectBuilder, docBuildHelper);
+        ApiSchema<T> apiSchema = this.renderApi(projectBuilder, candidateClasses);
 
-        postRender(docBuildHelper, apiSchema.getApiDatas());
+        if (Objects.isNull(apiSchema)) {
+            apiSchema = new ApiSchema<>();
+        }
+        this.postRender(docBuildHelper, apiSchema.getApiDatas());
 
         return apiSchema;
     }
@@ -67,8 +71,6 @@ default ApiSchema<T> getApiData(ProjectDocConfigBuilder projectBuilder) {
     ApiSchema<T> renderApi(ProjectDocConfigBuilder projectBuilder, Collection<JavaClass> candidateClasses);
 
 
-
-
     /**
      * post render
      *