Merge remote-tracking branch 'upstream/master' into multival

Author: SentryMan

README.md

@@ -2,6 +2,7 @@
 [![Build](https://github.com/avaje/avaje-http/actions/workflows/build.yml/badge.svg)](https://github.com/avaje/avaje-http/actions/workflows/build.yml)
 <img src="https://img.shields.io/maven-central/v/io.avaje/avaje-http-api.svg?label=Maven%20Central">
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/avaje/avaje-inject/blob/master/LICENSE)
+[![Discord](https://img.shields.io/discord/1074074312421683250?color=%237289da&label=discord)](https://discord.gg/Qcqf9R27BR)
 
 HTTP server and client libraries via code generation.
 

http-api/src/main/java/io/avaje/http/api/RequestTimeout.java

@@ -0,0 +1,29 @@
+package io.avaje.http.api;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import java.time.temporal.ChronoUnit;
+
+/**
+ * Overrides global request timeout for this endpoint.
+ *
+ * <pre>{@code
+ * @Client
+ * interface CustomerApi {
+ *   @Get("/{id}")
+ *   @RequestTimeout(value = 1, ChronoUnit.SECONDS)
+ *   Customer getById(long id);
+ * }
+ *
+ * }</pre>
+ */
+@Target(METHOD)
+@Retention(RUNTIME)
+public @interface RequestTimeout {
+  long value();
+
+  ChronoUnit chronoUnit() default ChronoUnit.MILLIS;
+}

http-client/pom.xml

@@ -83,7 +83,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
-      <version>1.20</version>
+      <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
 

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientMethodWriter.java

@@ -3,6 +3,7 @@
 import io.avaje.http.generator.core.*;
 
 import javax.lang.model.element.TypeElement;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -24,6 +25,7 @@ class ClientMethodWriter {
   private MethodParam bodyHandlerParam;
   private String methodGenericParams = "";
   private final boolean useJsonb;
+  private final Optional<RequestTimeoutPrism> timeout;
 
   ClientMethodWriter(MethodReader method, Append writer, ProcessingContext ctx, boolean useJsonb) {
     this.method = method;
@@ -32,6 +34,7 @@ class ClientMethodWriter {
     this.ctx = ctx;
     this.returnType = Util.parseType(method.returnType());
     this.useJsonb = useJsonb;
+    this.timeout = method.timeout();
   }
 
   void addImportTypes(ControllerReader reader) {
@@ -86,12 +89,18 @@ void write() {
     writeQueryParams(pathSegments);
     writeBeanParams(pathSegments);
     writeFormParams(pathSegments);
+    timeout.ifPresent(this::writeTimeout);
     writeBody();
     writeEnd();
   }
 
-  private void writeEnd() {
-    WebMethod webMethod = method.webMethod();
+  private void writeTimeout(RequestTimeoutPrism p) {
+
+    writer.append("      .requestTimeout(of(%s, %s))", p.value(), p.chronoUnit()).eol();
+  }
+
+private void writeEnd() {
+    final var webMethod = method.webMethod();
     writer.append("      .%s()", webMethod.name()).eol();
     if (returnType == UType.VOID) {
       writer.append("      .asVoid();").eol();

http-generator-client/src/main/java/io/avaje/http/generator/client/ClientProcessor.java

@@ -3,16 +3,14 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.LinkedHashSet;
-import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.lang.model.SourceVersion;
-import javax.lang.model.element.AnnotationMirror;
-import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.TypeElement;
 import javax.tools.FileObject;
@@ -84,22 +82,11 @@ private void writeServicesFile() {
   }
 
   private void writeForImported(Element importedElement) {
-    for (AnnotationMirror annotationMirror : importedElement.getAnnotationMirrors()) {
-      for (AnnotationValue value : annotationMirror.getElementValues().values()) {
-        for (Object apiClassDef : (List<?>) value.getValue()) {
-          writeImported(apiClassDef.toString());
-        }
-      }
-    }
-  }
 
-  private void writeImported(String fullName) {
-    // trim .class suffix
-    String apiClassName = fullName.substring(0, fullName.length() - 6);
-    TypeElement typeElement = ctx.typeElement(apiClassName);
-    if (typeElement != null) {
-      writeClient(typeElement);
-    }
+    ImportPrism.getInstanceOn(importedElement).types().stream()
+        .map(ctx::asElement)
+        .filter(Objects::nonNull)
+        .forEach(this::writeClient);
   }
 
   private void writeClient(Element controller) {

http-generator-core/pom.xml

@@ -11,13 +11,7 @@
     <relativePath>..</relativePath>
   </parent>
 
-  <properties>
-    <swagger.version>2.0.8</swagger.version>
-  </properties>
-
   <dependencies>
-
-
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-prisms</artifactId>
@@ -34,6 +28,12 @@
       <scope>provided</scope>
     </dependency>
 
+    <dependency>
+      <groupId>io.swagger.core.v3</groupId>
+      <artifactId>swagger-annotations</artifactId>
+      <version>${swagger.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-models</artifactId>

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

@@ -2,7 +2,6 @@
 
 import java.io.IOException;
 import java.util.Set;
-
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.annotation.processing.RoundEnvironment;
@@ -41,6 +40,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
     if (ctx.isOpenApiAvailable()) {
       readOpenApiDefinition(round);
       readTagDefinitions(round);
+      readSecuritySchemes(round);
     }
 
     final Set<? extends Element> controllers =
@@ -75,7 +75,19 @@ private void readTagDefinitions(RoundEnvironment round) {
       ctx.doc().addTagsDefinition(element);
     }
   }
-  
+
+  private void readSecuritySchemes(RoundEnvironment round) {
+    Set<? extends Element> elements = round.getElementsAnnotatedWith(ctx.typeElement(SecuritySchemePrism.PRISM_TYPE));
+    for (Element element : elements) {
+        ctx.doc().addSecurityScheme(element);
+    }
+
+    elements = round.getElementsAnnotatedWith(ctx.typeElement(SecuritySchemesPrism.PRISM_TYPE));
+    for (Element element : elements) {
+        ctx.doc().addSecuritySchemes(element);
+    }
+  }
+
   private void writeOpenAPI() {
     ctx.doc().writeApi();
   }

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

@@ -1,23 +1,24 @@
 package io.avaje.http.generator.core;
 
+import io.avaje.http.generator.core.javadoc.Javadoc;
+import io.avaje.http.generator.core.openapi.MethodDocBuilder;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-
+import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;
 import javax.lang.model.element.VariableElement;
 import javax.lang.model.type.ExecutableType;
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.type.TypeMirror;
 
-import io.avaje.http.generator.core.javadoc.Javadoc;
-import io.avaje.http.generator.core.openapi.MethodDocBuilder;
-
 public class MethodReader {
 
   private final ProcessingContext ctx;
@@ -31,12 +32,14 @@ public class MethodReader {
    */
   private final List<String> methodRoles;
   private final Optional<ProducesPrism> producesAnnotation;
+  private final List<SecurityRequirementPrism> securityRequirements;
   private final List<OpenAPIResponsePrism> apiResponses;
   private final ExecutableType actualExecutable;
   private final List<? extends TypeMirror> actualParams;
   private final PathSegments pathSegments;
   private final boolean hasValid;
   private final List<ExecutableElement> superMethods;
+  private final Optional<RequestTimeoutPrism> timeout;
 
   private WebMethod webMethod;
   private String webMethodPath;
@@ -57,9 +60,15 @@ public class MethodReader {
         ctx.superMethods(element.getEnclosingElement(), element.getSimpleName().toString());
     superMethods.forEach(m -> methodRoles.addAll(Util.findRoles(m)));
 
+    this.securityRequirements = readSecurityRequirements();
     this.apiResponses = buildApiResponses();
     this.javadoc = buildJavadoc(element, ctx);
-
+    this.timeout = RequestTimeoutPrism.getOptionalOn(element);
+    timeout.ifPresent(
+        p -> {
+          bean.addStaticImportType("java.time.temporal.ChronoUnit." + p.chronoUnit());
+          bean.addStaticImportType("java.time.Duration.of");
+        });
     if (isWebMethod()) {
       this.hasValid = initValid();
       this.pathSegments = PathSegments.parse(Util.combinePath(bean.path(), webMethodPath));
@@ -130,6 +139,40 @@ public Javadoc javadoc() {
     return javadoc;
   }
 
+  private List<SecurityRequirementPrism> readSecurityRequirements() {
+    var list = new ArrayList<SecurityRequirementPrism>();
+
+    readSecurityRequirements(element, list);
+    for (ExecutableElement superMethod : superMethods) {
+        readSecurityRequirements(superMethod, list);
+    }
+    readSecurityRequirements(bean.beanType(), list);
+
+    var map = new HashMap<String, SecurityRequirementPrism>();
+    for (SecurityRequirementPrism p : list) {
+        if (!map.containsKey(p.name())) {
+          map.put(p.name(), p);
+        }
+    }
+    return List.copyOf(map.values());
+  }
+
+  private void readSecurityRequirements(Element element, List<SecurityRequirementPrism> list) {
+    Consumer<Element> f = e -> {
+      Optional.ofNullable(SecurityRequirementsPrism.getInstanceOn(e))
+        .map(SecurityRequirementsPrism::value)
+        .ifPresent(list::addAll);
+      Optional.ofNullable(SecurityRequirementPrism.getAllInstancesOn(e))
+        .ifPresent(list::addAll);
+    };
+    f.accept(element);
+
+    for (AnnotationMirror annotationMirror : element.getAnnotationMirrors()) {
+      // find only one level
+      f.accept(annotationMirror.getAnnotationType().asElement());
+    }
+  }
+
   private List<OpenAPIResponsePrism> buildApiResponses() {
 
     final var container =
@@ -260,6 +303,10 @@ public String produces() {
     return producesAnnotation.map(ProducesPrism::value).orElseGet(bean::produces);
   }
 
+  public List<SecurityRequirementPrism> securityRequirements() {
+    return securityRequirements;
+  }
+
   public List<OpenAPIResponsePrism> apiResponses() {
     return apiResponses;
   }
@@ -325,4 +372,8 @@ public String bodyName() {
     }
     return "body";
   }
+
+  public Optional<RequestTimeoutPrism> timeout() {
+    return timeout;
+  }
 }