Added HTTPContext to HTTPRequest (and all intermediate classes as necessary).

Author: voidmain

project.latte

@@ -7,7 +7,7 @@ restifyVersion = "4.2.1"
 slf4jVersion = "2.0.17"
 testngVersion = "7.11.0"
 
-project(group: "org.lattejava", name: "http", version: "0.1.3", licenses: ["MIT"]) {
+project(group: "org.lattejava", name: "http", version: "0.1.4", licenses: ["MIT"]) {
   workflow {
     standard()
   }

src/main/java/org/lattejava/http/server/HTTPRequest.java

@@ -60,6 +60,8 @@ public class HTTPRequest implements Buildable<HTTPRequest> {
 
   private String contentType;
 
+  private HTTPContext context;
+
   private String contextPath;
 
   private Charset encoding = StandardCharsets.UTF_8;
@@ -104,9 +106,10 @@ public HTTPRequest(String contextPath, @Deprecated int multipartBufferSize, Stri
     this.multipartStreamProcessor.getMultiPartConfiguration().withMultipartBufferSize(multipartBufferSize);
   }
 
-  public HTTPRequest(String contextPath, String scheme, int port, String ipAddress) {
+  public HTTPRequest(HTTPContext context, String contextPath, String scheme, int port, String ipAddress) {
     Objects.requireNonNull(contextPath);
     Objects.requireNonNull(scheme);
+    this.context = context;
     this.contextPath = contextPath;
     this.scheme = scheme;
     this.port = port;
@@ -304,6 +307,10 @@ public void setContentType(String contentType) {
     this.contentType = contentType;
   }
 
+  public HTTPContext getContext() {
+    return context;
+  }
+
   public String getContextPath() {
     return contextPath;
   }

src/main/java/org/lattejava/http/server/HTTPServer.java

@@ -93,7 +93,7 @@ public HTTPServer start() {
 
     try {
       for (HTTPListenerConfiguration listener : configuration.getListeners()) {
-        HTTPServerThread server = new HTTPServerThread(configuration, listener);
+        HTTPServerThread server = new HTTPServerThread(configuration, context, listener);
         servers.add(server);
         server.start();
         logger.info("HTTP server listening on port [{}]", listener.getPort());

src/main/java/org/lattejava/http/server/internal/HTTPServerThread.java

@@ -30,6 +30,7 @@
 
 import org.lattejava.http.log.Logger;
 import org.lattejava.http.security.SecurityTools;
+import org.lattejava.http.server.HTTPContext;
 import org.lattejava.http.server.HTTPListenerConfiguration;
 import org.lattejava.http.server.HTTPServerConfiguration;
 import org.lattejava.http.server.Instrumenter;
@@ -48,6 +49,8 @@ public class HTTPServerThread extends Thread {
 
   private final HTTPServerConfiguration configuration;
 
+  private final HTTPContext context;
+
   private final Instrumenter instrumenter;
 
   private final HTTPListenerConfiguration listener;
@@ -62,11 +65,12 @@ public class HTTPServerThread extends Thread {
 
   private volatile boolean running;
 
-  public HTTPServerThread(HTTPServerConfiguration configuration, HTTPListenerConfiguration listener)
+  public HTTPServerThread(HTTPServerConfiguration configuration, HTTPContext context, HTTPListenerConfiguration listener)
       throws IOException, GeneralSecurityException {
     super("HTTP server [" + listener.getBindAddress().toString() + ":" + listener.getPort() + "]");
 
     this.configuration = configuration;
+    this.context = context;
     this.listener = listener;
     this.instrumenter = configuration.getInstrumenter();
     this.logger = configuration.getLoggerFactory().getLogger(HTTPServerThread.class);
@@ -75,8 +79,8 @@ public HTTPServerThread(HTTPServerConfiguration configuration, HTTPListenerConfi
     this.cleaner = new HTTPServerCleanerThread();
 
     if (listener.isTLS()) {
-      SSLContext context = SecurityTools.serverContext(listener.getCertificateChain(), listener.getPrivateKey());
-      this.socket = context.getServerSocketFactory().createServerSocket();
+      SSLContext sslContext = SecurityTools.serverContext(listener.getCertificateChain(), listener.getPrivateKey());
+      this.socket = sslContext.getServerSocketFactory().createServerSocket();
     } else {
       this.socket = new ServerSocket();
     }
@@ -112,7 +116,7 @@ public void run() {
         }
 
         Throughput throughput = new Throughput(configuration.getReadThroughputCalculationDelay().toMillis(), configuration.getWriteThroughputCalculationDelay().toMillis());
-        HTTPWorker runnable = new HTTPWorker(clientSocket, configuration, instrumenter, listener, throughput);
+        HTTPWorker runnable = new HTTPWorker(clientSocket, configuration, context, instrumenter, listener, throughput);
         Thread client = Thread.ofVirtual()
                               .name("HTTP client [" + clientSocket.getRemoteSocketAddress() + "]")
                               .start(runnable);

src/main/java/org/lattejava/http/server/internal/HTTPWorker.java

@@ -34,6 +34,7 @@
 import org.lattejava.http.io.PushbackInputStream;
 import org.lattejava.http.log.Logger;
 import org.lattejava.http.server.ExceptionHandlerContext;
+import org.lattejava.http.server.HTTPContext;
 import org.lattejava.http.server.HTTPHandler;
 import org.lattejava.http.server.HTTPListenerConfiguration;
 import org.lattejava.http.server.HTTPRequest;
@@ -59,6 +60,8 @@ public class HTTPWorker implements Runnable {
 
   private final HTTPServerConfiguration configuration;
 
+  private final HTTPContext context;
+
   private final PushbackInputStream inputStream;
 
   private final Instrumenter instrumenter;
@@ -77,10 +80,11 @@ public class HTTPWorker implements Runnable {
 
   private volatile State state;
 
-  public HTTPWorker(Socket socket, HTTPServerConfiguration configuration, Instrumenter instrumenter, HTTPListenerConfiguration listener,
-                    Throughput throughput) throws IOException {
+  public HTTPWorker(Socket socket, HTTPServerConfiguration configuration, HTTPContext context, Instrumenter instrumenter,
+                    HTTPListenerConfiguration listener, Throughput throughput) throws IOException {
     this.socket = socket;
     this.configuration = configuration;
+    this.context = context;
     this.instrumenter = instrumenter;
     this.listener = listener;
     this.throughput = throughput;
@@ -117,7 +121,7 @@ public void run() {
 
       while (true) {
         logger.trace("[{}] Running HTTP worker. Block while we wait to read the preamble", Thread.currentThread().threadId());
-        request = new HTTPRequest(configuration.getContextPath(), listener.getCertificate() != null ? "https" : "http", listener.getPort(), socket.getInetAddress().getHostAddress());
+        request = new HTTPRequest(context, configuration.getContextPath(), listener.getCertificate() != null ? "https" : "http", listener.getPort(), socket.getInetAddress().getHostAddress());
 
         // Create a deep copy of the MultipartConfiguration so that the request may optionally modify the configuration on a per-request basis.
         request.getMultiPartStreamProcessor().setMultipartConfiguration(new MultipartConfiguration(configuration.getMultipartConfiguration()));