feat: Support for multiple-level interface inheritance in RPC.

TongchengOpenSource · Mar 26, 2024 · aeb764e · aeb764e
1 parent 1ca056e
commit aeb764e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/src/main/java/com/ly/doc/template/IRpcDocTemplate.java b/src/main/java/com/ly/doc/template/IRpcDocTemplate.java
@@ -132,6 +132,19 @@ default List<RpcJavaMethod> getParentsClassMethods(ApiConfig apiConfig, JavaClas
         return docJavaMethods;
     }
 
+    default List<RpcJavaMethod> getInterfaceMethods(ApiConfig apiConfig, JavaClass cls) {
+        List<RpcJavaMethod> docJavaMethods = new ArrayList<>();
+        for (JavaClass javaInterface : cls.getInterfaces()) {
+            Map<String, JavaType> actualTypesMap = JavaClassUtil.getActualTypesMap(javaInterface);
+            List<JavaMethod> interfaceMethodList = javaInterface.getMethods();
+            for (JavaMethod method : interfaceMethodList) {
+                docJavaMethods.add(convertToRpcJavaMethod(apiConfig, method, actualTypesMap));
+            }
+            docJavaMethods.addAll(getInterfaceMethods(apiConfig, javaInterface));
+        }
+        return docJavaMethods;
+    }
+
     default String replaceTypeName(String type, Map<String, JavaType> actualTypesMap, boolean simple) {
         if (Objects.isNull(actualTypesMap)) {
             return type;

diff --git a/src/main/java/com/ly/doc/template/RpcDocBuildTemplate.java b/src/main/java/com/ly/doc/template/RpcDocBuildTemplate.java
@@ -126,16 +126,7 @@ private List<RpcJavaMethod> buildServiceMethod(final JavaClass cls, ApiConfig ap
         // add parent class methods
         methodDocList.addAll(getParentsClassMethods(apiConfig, cls));
         if (cls.isInterface() || cls.isAbstract()) {
-            List<JavaType> implClasses = cls.getImplements();
-            for (JavaType type : implClasses) {
-                JavaClass javaClass = (JavaClass) type;
-                Map<String, JavaType> actualTypesMap = JavaClassUtil.getActualTypesMap(javaClass);
-                for (JavaMethod method : javaClass.getMethods()) {
-                    if (!method.isDefault()) {
-                        methodDocList.add(convertToRpcJavaMethod(apiConfig, method, actualTypesMap));
-                    }
-                }
-            }
+            methodDocList.addAll(getInterfaceMethods(apiConfig,cls));
         }
 
         int methodOrder = 0;