Merge remote-tracking branch 'upstream/master' into SentryMan-patch-1

Author: SentryMan

.editorconfig

@@ -10,3 +10,4 @@ indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 spaces_around_operators = true
+max_line_length = 135

.github/workflows/build.yml

@@ -1,36 +1,41 @@
 name: Build
 
 on: [push, pull_request, workflow_dispatch]
-
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
     permissions:
       contents: read
       packages: write
     strategy:
       fail-fast: false
       matrix:
-        java_version: [11,17]
+        java_version: [11, 17, 19]
         os: [ubuntu-latest]
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Java
-      uses: actions/setup-java@v2
-      with:
-        java-version: ${{ matrix.java_version }}
-        distribution: 'zulu'
-    - name: Maven cache
-      uses: actions/cache@v2
-      env:
-        cache-name: maven-cache
-      with:
-        path:
-          ~/.m2
-        key: build-${{ env.cache-name }}
-    - name: Maven version
-      run: mvn --version
-    - name: Build with Maven
-      run: mvn clean test
+      - uses: actions/checkout@v2
+      - name: Set up Java
+        uses: actions/setup-java@v2
+        with:
+          java-version: ${{ matrix.java_version }}
+          distribution: "zulu"
+      - name: Maven cache
+        uses: actions/cache@v2
+        env:
+          cache-name: maven-cache
+        with:
+          path: ~/.m2
+          key: build-${{ env.cache-name }}
+      - name: Maven version
+        run: mvn --version
+      - name: Build with Maven
+        env:
+          JAVA_VERSION: ${{ matrix.java_version }}
+        run: |
+          if (( JAVA_VERSION < 19 ));
+          then
+             mvn clean test -pl "!:avaje-http-nima-generator"
+          else
+             mvn clean test
+          fi

.gitignore

@@ -3,3 +3,11 @@ build/
 .idea/
 *.iml
 .gradle
+*.prefs
+*.class*
+*.factorypath
+*.project
+*.processors
+*/bin/
+*.editorconfig
+*.Module

README.md

@@ -78,7 +78,7 @@ public class WidgetController {
   public WidgetController(HelloComponent hello) {
     this.hello = hello;
   }
-  
+
   @Get("/{id}")
   Widget getById(int id) {
     return new Widget(id, "you got it"+ hello.hello());
@@ -104,7 +104,7 @@ The annotation processor will generate controller classes implementing the WebRo
 get all the WebRoutes and register them with Javalin using:
 
 ```java
-var routes = BeanScope.builder().build().list(WebRoutes.class); 
+var routes = BeanScope.builder().build().list(WebRoutes.class);
 
 Javalin.create()
         .routes(() -> routes.forEach(WebRoutes::registerRoutes))
@@ -117,7 +117,7 @@ The annotation processor will generate controller classes implementing the Helid
 get all the Services and register them with Helidon `RoutingBuilder`.
 
 ```java
-var routes = BeanScope.builder().build().list(Service.class); 
+var routes = BeanScope.builder().build().list(Service.class);
 var routingBuilder = Routing.builder().register(routes.stream().toArray(Service[]::new));
 WebServer.builder()
         .addMediaSupport(JacksonSupport.create())
@@ -132,7 +132,7 @@ The annotation processor will generate controller classes implementing the Helid
 get all the services and register them with the Helidon `HttpRouting`.
 
 ```java
-var routes = BeanScope.builder().build().list(HttpService.class); 
+var routes = BeanScope.builder().build().list(HttpService.class);
 final var builder = HttpRouting.builder();
 
 for (final HttpService httpService : routes) {

http-api/pom.xml

@@ -4,15 +4,15 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-generator-parent</artifactId>
-    <version>1.18-SNAPSHOT</version>
+    <version>1.21-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>avaje-http-api</artifactId>
 
   <scm>
     <developerConnection>scm:git:[email protected]:avaje/avaje-http.git</developerConnection>
-    <tag>HEAD</tag>
+    <tag>avaje-http-generator-parent-1.19</tag>
   </scm>
 
   <dependencies>

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

@@ -35,7 +35,6 @@ public interface MediaType {
    */
   String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded";
 
-
   /**
    * A {@code String} constant representing {@value #MULTIPART_FORM_DATA} media type.
    */
@@ -51,7 +50,6 @@ public interface MediaType {
    */
   String TEXT_PLAIN = "text/plain";
 
-
   /**
    * A {@code String} constant representing {@value #TEXT_XML} media type.
    */
@@ -71,5 +69,35 @@ public interface MediaType {
    * {@link String} representation of {@value #APPLICATION_JSON_PATCH_JSON} media type..
    */
   String APPLICATION_JSON_PATCH_JSON = "application/json-patch+json";
-
+  
+	/**
+	 * {@link String} representation of {@value #APPLICATION_PDF} media type.
+	 */
+	String APPLICATION_PDF = "application/pdf";
+
+	/**
+	 * {@link String} representation of {@value #IMAGE_GIF} media type.
+	 */
+	String IMAGE_GIF = "image/gif";
+
+	/**
+	 * {@link String} representation of {@value #IMAGE_JPEG} media type.
+	 */
+	String IMAGE_JPEG = "image/jpeg";
+
+	/**
+	 * {@link String} representation of {@value #IMAGE_PNG} media type.
+	 */
+	String IMAGE_PNG = "image/png";
+
+	/**
+	 * {@link String} representation of {@value #MULTIPART_MIXED} media type.
+	 */
+	String MULTIPART_MIXED = "multipart/mixed";
+
+	/**
+	 * {@link String} representation of {@value #MULTIPART_RELATED} media type.
+	 */
+	String MULTIPART_RELATED = "multipart/related";
+  
 }

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

@@ -0,0 +1,43 @@
+package io.avaje.http.api;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Specify endpoint response status code/description/type.
+ *
+ * <p>When not specified the default 2xx openAPI generation is based on the javadoc of the method.
+ * <p> Will not override the default 2xx generated openapi unless status code is 2xx
+ * <pre>{@code
+ * @Post("/post")
+ * @OpenAPIReturns(responseCode = "200", description = "from annotaion")
+ * @OpenAPIReturns(responseCode = "201")
+ * @OpenAPIReturns(responseCode = "500", description = "Some other Error", type=ErrorResponse.class)
+ * ResponseModel endpoint() {}
+ *
+ * }</pre>
+ */
+@Target(value = METHOD)
+@Retention(value = RUNTIME)
+@Repeatable(OpenAPIResponses.class)
+public @interface OpenAPIResponse {
+
+  /** the http status code of this response */
+  String responseCode();
+
+  /**
+   * The description of the return value. By default uses the @return javadoc of the method as the
+   * description
+   */
+  String description() default "";
+
+  /**
+   * The concrete type that that this endpoint returns. If status code is a 2xx code it will default
+   * to the return type of the method
+   */
+  Class<?> type() default Void.class;
+}

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

@@ -0,0 +1,18 @@
+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;
+
+/**
+ * Container for repeatable {@link OpenAPIResponse} annotation
+ *
+ * @see OpenAPIResponse
+ */
+@Target(value = METHOD)
+@Retention(value = RUNTIME)
+public @interface OpenAPIResponses {
+  OpenAPIResponse[] value();
+}

http-generator-client/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-generator-parent</artifactId>
-    <version>1.18-SNAPSHOT</version>
+    <version>1.21-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>