Refactor move jetty into separate module, add JDK http service implementation module

avaje-jetty-loom/pom.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>java11-oss</artifactId>
+    <groupId>org.avaje</groupId>
+    <version>3.2</version>
+  </parent>
+
+  <artifactId>avaje-jex-loomjetty</artifactId>
+  <groupId>io.avaje</groupId>
+  <version>1.0</version>
+
+  <properties>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <javadoc.source>17</javadoc.source>
+    <java.release>17</java.release>
+    <jetty.version>11.0.2</jetty.version>
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.moditect</groupId>
+        <artifactId>moditect-maven-plugin</artifactId>
+        <version>1.0.0.RC1</version>
+        <executions>
+          <execution>
+            <id>add-module-infos</id>
+            <phase>package</phase>
+            <goals>
+              <goal>add-module-info</goal>
+            </goals>
+            <configuration>
+              <jvmVersion>9</jvmVersion>
+              <module>
+                <moduleInfoFile>src/main/java9/module-info.java</moduleInfoFile>
+              </module>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

avaje-jex-freemarker/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>avaje-jex-parent</artifactId>
@@ -21,6 +22,13 @@
       <version>1.8-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jex-jetty</artifactId>
+      <version>1.8-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.freemarker</groupId>
       <artifactId>freemarker</artifactId>
@@ -36,4 +44,17 @@
 
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <argLine>
+            --add-modules io.avaje.jex.jetty
+          </argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>

avaje-jex-freemarker/src/main/java/module-info.java

@@ -4,5 +4,7 @@
   requires transitive freemarker;
   requires java.net.http;
 
+  requires static io.avaje.jex.jetty;
+
   provides io.avaje.jex.TemplateRender with io.avaje.jex.render.freemarker.FreeMarkerRender;
 }

avaje-jex-grizzly/pom.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>avaje-jex-parent</artifactId>
+    <groupId>io.avaje</groupId>
+    <version>1.8-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>avaje-jex-grizzly</artifactId>
+
+  <properties>
+<!--    <java.release>17</java.version>-->
+  </properties>
+
+  <dependencies>
+
+    <dependency>
+      <groupId>io.avaje</groupId>
+      <artifactId>avaje-jex</artifactId>
+      <version>1.8-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http-server</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.glassfish.grizzly</groupId>
+      <artifactId>grizzly-http2</artifactId>
+      <version>3.0.0</version>
+      <optional>true</optional>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jul-to-slf4j</artifactId>
+      <version>1.7.30</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+
+
+</project>

avaje-jex-grizzly/src/main/java/io/avaje/jex/grizzly/ContextUtil.java

@@ -0,0 +1,65 @@
+package io.avaje.jex.grizzly;
+
+import org.glassfish.grizzly.http.server.Request;
+
+import java.io.*;
+
+class ContextUtil {
+
+  private static final int DEFAULT_BUFFER_SIZE = 8 * 1024;
+
+  private static final int BUFFER_MAX = 65536;
+
+  static byte[] requestBodyAsBytes(Request req) {
+    final int len = req.getContentLength();
+    try (final InputStream inputStream = req.getInputStream()) {
+
+      int bufferSize = len > -1 ? len : DEFAULT_BUFFER_SIZE;
+      if (bufferSize > BUFFER_MAX) {
+        bufferSize = BUFFER_MAX;
+      }
+      ByteArrayOutputStream os = new ByteArrayOutputStream(bufferSize);
+      copy(inputStream, os, bufferSize);
+      return os.toByteArray();
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+
+  static void copy(InputStream in, OutputStream out, int bufferSize) throws IOException {
+    byte[] buffer = new byte[bufferSize];
+    int len;
+    while ((len = in.read(buffer, 0, bufferSize)) > 0) {
+      out.write(buffer, 0, len);
+    }
+  }
+
+  static String requestBodyAsString(Request request) {
+    final long requestLength = request.getContentLengthLong();
+    if (requestLength == 0) {
+      return "";
+    }
+    if (requestLength < 0) {
+      throw new IllegalStateException("No content-length set?");
+    }
+    final int bufferSize = requestLength > 512 ? 512 : (int)requestLength;
+
+    StringWriter writer = new StringWriter((int)requestLength);
+    final Reader reader = request.getReader();
+    try {
+      long transferred = 0;
+      char[] buffer = new char[bufferSize];
+      int nRead;
+      while ((nRead = reader.read(buffer, 0, bufferSize)) >= 0) {
+        writer.write(buffer, 0, nRead);
+        transferred += nRead;
+        if (transferred == requestLength) {
+          break;
+        }
+      }
+      return writer.toString();
+    } catch (IOException e) {
+      throw new UncheckedIOException(e);
+    }
+  }
+}