RFC: Pull prisms into own module, separate shaded generators

.github/workflows/build.yml

@@ -33,4 +33,14 @@ jobs:
         env:
           JAVA_VERSION: ${{ matrix.java_version }}
         run: |
-          mvn clean package install -Ptest
+          mvn clean package install -Ptest21
+      - name: Configure minimum Java version
+        uses: actions/setup-java@v5
+        with:
+          java-version: 11
+          distribution: "zulu"
+      - name: Test on minimum version
+        env:
+          JAVA_VERSION: 11
+        run: |
+          mvn test -Ptest

aws-cognito/http-client-authtoken/pom.xml

@@ -18,7 +18,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>3.8</version>
+      <version>4.0-B.1</version>
     </dependency>
 
     <dependency>

htmx-api/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
 
   <artifactId>avaje-htmx-api</artifactId>

htmx-nima-jstache/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
 
   <artifactId>avaje-htmx-nima-jstache</artifactId>

htmx-nima-jstache/src/main/java/module-info.java

@@ -5,7 +5,7 @@
   requires transitive io.avaje.htmx.nima;
   requires transitive io.helidon.webserver;
   requires transitive io.jstach.jstachio;
-  requires transitive io.avaje.inject;
+  requires static transitive io.avaje.inject;
   requires static io.avaje.spi;
 
   provides io.avaje.inject.spi.InjectExtension with io.avaje.htmx.nima.jstache.DefaultTemplateProvider;

htmx-nima/pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
 
   <artifactId>avaje-htmx-nima</artifactId>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-htmx-api</artifactId>
-      <version>3.8</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>io.helidon.webserver</groupId>

http-api-javalin/pom.xml

@@ -4,15 +4,26 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>avaje-http-api-javalin</artifactId>
   <name>avaje-http-api-javalin</name>
+  <description>Library that generates adapter code for Javalin APIs via Annotation Processing.</description>
 
-  <scm>
-    <developerConnection>scm:git:git@github.com:avaje/avaje-http.git</developerConnection>
-    <tag>avaje-http-parent-1.19</tag>
-  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.javalin</groupId>
+      <artifactId>javalin</artifactId>
+      <version>7.1.0</version>
+      <scope>provided</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
 </project>

http-api/src/main/java/io/avaje/http/api/AvajeJavalinPlugin.java → http-api-javalin/src/main/java/io/avaje/http/api/javalin/AvajeJavalinPlugin.java

@@ -1,9 +1,9 @@
-package io.avaje.http.api;
+package io.avaje.http.api.javalin;
 
 import io.javalin.plugin.Plugin;
 
 /**
- * A Javalin 6 route generated by avaje http javalin generator.
+ * A Javalin 7 route generated by avaje http javalin generator.
  */
 public abstract class AvajeJavalinPlugin extends Plugin<Void> {
 

http-api-javalin/src/main/java/module-info.java

@@ -1,3 +1,5 @@
 module io.avaje.http.api.javalin {
 	exports io.avaje.http.api.javalin;
+  requires transitive io.avaje.http.api;
+  requires static io.javalin;
 }

http-api-vertx/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -22,5 +22,10 @@
       <artifactId>vertx-web</artifactId>
       <version>${vertx.version}</version>
     </dependency>
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-http-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
   </dependencies>
 </project>

http-api-vertx/src/main/java/module-info.java

@@ -1,7 +1,7 @@
 module io.avaje.http.api.vertx {
 
   exports io.avaje.http.api.vertx;
-
+  requires transitive io.avaje.http.api;
   requires transitive io.vertx.web;
   requires transitive io.vertx.core;
 }

http-api/pom.xml

@@ -4,32 +4,19 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
     <relativePath>..</relativePath>
   </parent>
 
   <artifactId>avaje-http-api</artifactId>
   <name>avaje-http-api</name>
 
-  <scm>
-    <developerConnection>scm:git:git@github.com:avaje/avaje-http.git</developerConnection>
-    <tag>avaje-http-parent-1.19</tag>
-  </scm>
-
   <dependencies>
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-inject-plugin</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>io.javalin</groupId>
-      <artifactId>javalin</artifactId>
-      <version>7.1.0</version>
-      <scope>provided</scope>
-      <optional>true</optional>
-    </dependency>
-
   </dependencies>
 
   <build>

http-api/src/main/java/module-info.java

@@ -3,6 +3,4 @@
 	exports io.avaje.http.api;
 	exports io.avaje.http.api.context;
 	exports io.avaje.http.api.spi;
-
-	requires static io.javalin;
 }

http-client-gson-adapter/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
 
   <artifactId>avaje-http-client-gson</artifactId>
@@ -21,7 +21,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>3.8</version>
+      <version>4.0-B.1</version>
       <scope>provided</scope>
     </dependency>
 

http-client-moshi-adapter/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
   <artifactId>avaje-http-client-moshi</artifactId>
   <name>avaje-http-client-moshi</name>
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-client</artifactId>
-      <version>3.8</version>
+      <version>4.0-B.1</version>
       <scope>provided</scope>
     </dependency>
 

http-client/pom.xml

@@ -6,17 +6,12 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
 
   <artifactId>avaje-http-client</artifactId>
   <name>avaje-http-client</name>
 
-  <scm>
-    <developerConnection>scm:git:git@github.com:avaje/avaje-http-client.git</developerConnection>
-    <tag>HEAD</tag>
-  </scm>
-
   <properties>
     <surefire.useModulePath>false</surefire.useModulePath>
   </properties>
@@ -35,14 +30,14 @@
       <version>3.1.0</version>
       <optional>true</optional>
     </dependency>
-    
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
       <version>2.21.2</version>
       <optional>true</optional>
     </dependency>
-    
+
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
@@ -89,7 +84,7 @@
 
     <dependency>
       <groupId>io.avaje</groupId>
-      <artifactId>avaje-http-api</artifactId>
+      <artifactId>avaje-http-api-javalin</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

http-client/src/test/java/org/example/webserver/HelloController$Route.java

@@ -6,10 +6,9 @@
 
 import java.time.LocalDate;
 
-import io.avaje.http.api.AvajeJavalinPlugin;
 import io.avaje.http.api.PathSegment;
 import io.avaje.http.api.Validator;
-import io.javalin.config.JavalinConfig;
+import io.avaje.http.api.javalin.AvajeJavalinPlugin;
 import io.javalin.config.JavalinState;
 import io.javalin.config.RoutesConfig;
 

http-generator-client/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>io.avaje</groupId>
     <artifactId>avaje-http-parent</artifactId>
-    <version>3.8</version>
+    <version>4.0-B.1</version>
   </parent>
 
   <artifactId>avaje-http-client-generator</artifactId>
@@ -27,12 +27,12 @@
       <scope>test</scope>
       <version>${project.version}</version>
     </dependency>
+
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-http-api</artifactId>
       <version>${project.version}</version>
-      <optional>true</optional>
-      <scope>provided</scope>
+      <scope>test</scope>
     </dependency>
 
     <dependency>
@@ -56,18 +56,15 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
+        <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <relocations>
-            <relocation>
-              <pattern>io.avaje.http.generator.core</pattern>
-              <shadedPattern>io.avaje.http.client.generator.core</shadedPattern>
-            </relocation>
-            <relocation>
-              <pattern>io.swagger.v3</pattern>
-              <shadedPattern>io.avaje.http.client.generator.swagger.v3</shadedPattern>
-            </relocation>
-          </relocations>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>io.avaje</groupId>
+              <artifactId>avaje-prisms</artifactId>
+              <version>${avaje.prisms.version}</version>
+            </path>
+          </annotationProcessorPaths>
         </configuration>
       </plugin>
     </plugins>

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

@@ -18,7 +18,6 @@
 import javax.lang.model.type.TypeKind;
 import javax.lang.model.util.ElementFilter;
 
-import io.avaje.http.api.SuppressLogging;
 import io.avaje.http.generator.core.APContext;
 import io.avaje.http.generator.core.Append;
 import io.avaje.http.generator.core.BeanParamReader;
@@ -29,15 +28,15 @@
 import io.avaje.http.generator.core.PathSegments;
 import io.avaje.http.generator.core.PathSegments.Segment;
 import io.avaje.http.generator.core.ProcessingContext;
-import io.avaje.http.generator.core.RequestTimeoutPrism;
+import io.avaje.http.generator.prisms.HeadersPrism;
+import io.avaje.http.generator.prisms.RequestTimeoutPrism;
 import io.avaje.http.generator.core.Util;
 import io.avaje.http.generator.core.WebMethod;
-import io.avaje.prism.GeneratePrism;
+import io.avaje.http.generator.prisms.SuppressLoggingPrism;
 import io.avaje.prism.GenerateUtils;
 
 /** Write code to register Web route for a given controller method. */
 @GenerateUtils
-@GeneratePrism(SuppressLogging.class)
 final class ClientMethodWriter {
   private static final KnownResponse KNOWN_RESPONSE = new KnownResponse();
   private static final String BODY_HANDLER = "java.net.http.HttpResponse.BodyHandler";

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

@@ -27,14 +27,12 @@
 import javax.tools.FileObject;
 
 import io.avaje.http.generator.core.APContext;
-import io.avaje.http.generator.core.ClientPrism;
+import io.avaje.http.generator.prisms.ClientPrism;
 import io.avaje.http.generator.core.Constants;
 import io.avaje.http.generator.core.ControllerReader;
-import io.avaje.http.generator.core.ImportPrism;
+import io.avaje.http.generator.prisms.ImportPrism;
 import io.avaje.http.generator.core.ProcessingContext;
-import io.avaje.prism.GeneratePrism;
 
-@GeneratePrism(io.avaje.http.api.Headers.class)
 @SupportedAnnotationTypes({ClientPrism.PRISM_TYPE, ImportPrism.PRISM_TYPE})
 public class ClientProcessor extends AbstractProcessor {
 

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

@@ -1,7 +1,7 @@
 package io.avaje.http.generator.client;
 
 import io.avaje.http.generator.core.BaseControllerWriter;
-import io.avaje.http.generator.core.ClientPrism;
+import io.avaje.http.generator.prisms.ClientPrism;
 import io.avaje.http.generator.core.ControllerReader;
 import io.avaje.http.generator.core.MethodReader;
 

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

@@ -23,9 +23,8 @@
 
 import io.avaje.http.generator.core.APContext;
 import io.avaje.http.generator.core.Constants;
-import io.avaje.prism.GeneratePrism;
+import io.avaje.http.generator.prisms.MetaDataPrism;
 
-@GeneratePrism(io.avaje.http.api.spi.MetaData.class)
 final class ComponentReader {
 
   private final ComponentMetaData componentMetaData;