read entire chain

Author: SentryMan

http-generator-client/src/test/java/io/avaje/http/generator/client/clients/ExampleClient.java

@@ -1,6 +1,10 @@
 package io.avaje.http.generator.client.clients;
 
 import io.avaje.http.api.Client;
+import io.avaje.http.api.Patch;
 
 @Client
-public interface ExampleClient extends UserClient {}
+public interface ExampleClient extends UserClient {
+  @Patch
+  void patchy();
+}

http-generator-client/src/test/java/io/avaje/http/generator/client/clients/ExampleClient2.java

@@ -0,0 +1,10 @@
+package io.avaje.http.generator.client.clients;
+
+import io.avaje.http.api.Client;
+import io.avaje.http.api.Patch;
+
+@Client
+public interface ExampleClient2 extends ExampleClient {
+  @Patch
+  void patchy2();
+}

http-generator-core/src/main/java/io/avaje/http/generator/core/ControllerReader.java

@@ -10,6 +10,8 @@
 import static java.util.function.Predicate.not;
 
 import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -35,6 +37,7 @@ public final class ControllerReader {
   private final List<ExecutableElement> interfaceMethods;
   private final List<String> roles;
   private final List<MethodReader> methods = new ArrayList<>();
+  private final Set<String> seenMethods = new HashSet<>();
   private final Set<String> staticImportTypes = new TreeSet<>();
   private final Set<String> importTypes = new TreeSet<>();
   private final List<OpenAPIResponsePrism> apiResponses;
@@ -54,7 +57,7 @@ public final class ControllerReader {
 
   public ControllerReader(TypeElement beanType) {
     this.beanType = beanType;
-    this.interfaces = initInterfaces();
+    this.interfaces = initInterfaces(beanType);
     this.interfaceMethods = initInterfaceMethods();
     this.roles = buildRoles();
     if (isOpenApiAvailable()) {
@@ -115,9 +118,9 @@ void addImports(boolean withSingleton) {
     }
   }
 
-  private List<TypeElement> initInterfaces() {
+  private List<TypeElement> initInterfaces(TypeElement element) {
     final List<TypeElement> superInterfaces = new ArrayList<>();
-    for (final TypeMirror anInterface : beanType.getInterfaces()) {
+    for (final TypeMirror anInterface : element.getInterfaces()) {
       final var ifaceElement = asElement(anInterface);
       final var controller = ControllerPrism.getInstanceOn(ifaceElement);
       if (controller != null && !controller.value().isBlank()
@@ -224,7 +227,9 @@ public void read(boolean withSingleton) {
     readSuper(beanType);
 
     if (platform().getClass().getSimpleName().contains("Client")) {
-      readInterfaces();
+      for (final var superInterface : interfaces) {
+        readInterfaces(superInterface);
+      }
     }
     deriveIncludeValidation();
     addImports(withSingleton);
@@ -273,12 +278,17 @@ private void readSuper(TypeElement beanType) {
     }
   }
 
-  /** Read methods from interfaces taking into account generics. */
-  private void readInterfaces() {
-    for (final var superInterfaces : interfaces) {
-      for (final var element : ElementFilter.methodsIn(superInterfaces.getEnclosedElements())) {
-        readMethod(element, (DeclaredType) superInterfaces.asType());
-      }
+  /**
+   * Read methods from interfaces taking into account generics.
+   *
+   * @param interfaceElement
+   */
+  private void readInterfaces(TypeElement interfaceElement) {
+    for (final var element : ElementFilter.methodsIn(interfaceElement.getEnclosedElements())) {
+      readMethod(element, (DeclaredType) interfaceElement.asType());
+    }
+    for (final var element : initInterfaces(interfaceElement)) {
+      readInterfaces(element);
     }
   }
 
@@ -293,7 +303,7 @@ private void readMethod(ExecutableElement method, DeclaredType declaredType) {
       actualExecutable = (ExecutableType) asMemberOf(declaredType, method);
     }
     final MethodReader methodReader = new MethodReader(this, method, actualExecutable);
-    if (methodReader.isWebMethod()) {
+    if (methodReader.isWebMethod() && seenMethods.add(method.toString())) {
       methodReader.read();
       methods.add(methodReader);
     }