Merge pull request #657 from Fioooooooo/master

基于 git 管理的增量文档构建
TongchengOpenSource · Nov 17, 2023 · a66801a · a66801a
2 parents bafa85d + 81069a0
commit a66801a
Show file tree

Hide file tree

Showing 26 changed files with 1,452 additions and 57 deletions.
diff --git a/pom.xml b/pom.xml
@@ -73,6 +73,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>2.0.7</version>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>5.13.2.202306221912-r</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/src/main/java/com/ly/doc/extension/dict/DictionaryValuesResolver.java b/src/main/java/com/ly/doc/extension/dict/DictionaryValuesResolver.java
@@ -22,7 +22,6 @@
 
 import com.power.common.model.EnumDictionary;
 
-import javax.annotation.Nonnull;
 import java.util.Collection;
 import java.util.Collections;
 
@@ -38,8 +37,7 @@ public interface DictionaryValuesResolver {
      * @param clazz dictionary class
      * @return the dictionary
      */
-    @Nonnull
-    default <T extends EnumDictionary> Collection<T> resolve(@Nonnull Class<?> clazz) {
+    default <T extends EnumDictionary> Collection<T> resolve(Class<?> clazz) {
         return resolve();
     }
 
@@ -48,7 +46,6 @@ default <T extends EnumDictionary> Collection<T> resolve(@Nonnull Class<?> clazz
      *
      * @see #resolve(Class)
      */
-    @Nonnull
     default <T extends EnumDictionary> Collection<T> resolve() {
         return Collections.emptyList();
     }

diff --git a/src/main/java/com/ly/doc/factory/BuildTemplateFactory.java b/src/main/java/com/ly/doc/factory/BuildTemplateFactory.java
@@ -21,6 +21,7 @@
 package com.ly.doc.factory;
 
 import com.ly.doc.constants.FrameworkEnum;
+import com.ly.doc.model.IDoc;
 import com.ly.doc.template.IDocBuildTemplate;
 
 /**
@@ -35,10 +36,10 @@ public class BuildTemplateFactory {
      * @param <T>       API doc type
      * @return Implements of IDocBuildTemplate
      */
-    public static <T> IDocBuildTemplate getDocBuildTemplate(String framework) {
+    public static <T extends IDoc> IDocBuildTemplate<T> getDocBuildTemplate(String framework) {
         String className = FrameworkEnum.getClassNameByFramework(framework);
         try {
-            return (IDocBuildTemplate) Class.forName(className).newInstance();
+            return (IDocBuildTemplate<T>) Class.forName(className).newInstance();
         } catch (InstantiationException e) {
             e.printStackTrace();
         } catch (IllegalAccessException e) {