完善 solon-server-jetty-jakarta jsp 适配

Author: noear

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServer.java

@@ -19,6 +19,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.session.DefaultSessionIdManager;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
+import org.eclipse.jetty.websocket.api.UpgradeRequest;
 import org.eclipse.jetty.websocket.server.WebSocketUpgradeHandler;
 import org.noear.solon.boot.ServerLifecycle;
 import org.noear.solon.boot.jetty.websocket.WebSocketCreatorImpl;
@@ -52,9 +53,6 @@ public void stop() throws Throwable {
     }
 
     protected void setup(String host, int port) throws IOException {
-        Class<?> wsClz = ClassUtil.loadClass("org.eclipse.jetty.websocket.server.WebSocketHandler");
-
-
         QueuedThreadPool threadPool = new QueuedThreadPool(
                 props.getMaxThreads(props.isIoBound()),
                 props.getCoreThreads());
@@ -78,11 +76,11 @@ protected void setup(String host, int port) throws IOException {
         ServletContextHandler contextHandler = buildHandler();
         real.setHandler(contextHandler);
 
-        if (enableWebSocket && wsClz != null) {
+        if (enableWebSocket && ClassUtil.hasClass(() -> UpgradeRequest.class)) {
             //real.setHandler(new HandlerHub(buildHandler()));
             WebSocketUpgradeHandler wsHandler = WebSocketUpgradeHandler.from(real, contextHandler);
             wsHandler.getServerWebSocketContainer().addMapping("/*", new WebSocketCreatorImpl());
-            real.setHandler(wsHandler);
+            //real.setHandler(wsHandler);
         }
 
         //1.1:分发事件（充许外部扩展）

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/JettyServerBase.java

@@ -51,13 +51,6 @@ public abstract class JettyServerBase implements ServerLifecycle , HttpServerCon
     protected boolean enableSessionState;
     private boolean isSecure;
 
-    private String _tempdir;
-
-    private int _fileOutputBuffer = 0;
-
-    private long _maxBodySize;
-    private long _maxFileSize;
-
     public boolean isSecure() {
         return isSecure;
     }
@@ -70,7 +63,6 @@ public void enableSessionState(boolean enableSessionState) {
     protected Set<Integer> addHttpPorts = new LinkedHashSet<>();
 
 
-
     /**
      * 是否允许Ssl
      */
@@ -157,10 +149,16 @@ protected ServerConnector getConnector(Server server, String host, int port, boo
     }
 
     protected ServletContextHandler getServletHandler() throws IOException {
-        _tempdir = System.getProperty("java.io.tmpdir");
-        _fileOutputBuffer = 1 * 1024 * 1024;
-        _maxBodySize = (ServerProps.request_maxBodySize > 0 ? ServerProps.request_maxBodySize : -1L);
-        _maxFileSize = (ServerProps.request_maxFileSize > 0 ? ServerProps.request_maxFileSize : -1L);
+        File tempDir = new File(System.getProperty("java.io.tmpdir"));
+        File scratchDir = new File(tempDir.toString(), "solon-server");
+        if(scratchDir.exists() == false){
+            scratchDir.mkdirs();
+        }
+
+        String _tempdir = scratchDir.getAbsolutePath();
+        int _fileOutputBuffer = 1 * 1024 * 1024;
+        long _maxBodySize = (ServerProps.request_maxBodySize > 0 ? ServerProps.request_maxBodySize : -1L);
+        long _maxFileSize = (ServerProps.request_maxFileSize > 0 ? ServerProps.request_maxFileSize : -1L);
 
         MultipartConfigElement multipartConfig = new MultipartConfigElement(
                 _tempdir,
@@ -175,7 +173,11 @@ protected ServletContextHandler getServletHandler() throws IOException {
         ServletContextHandler handler = new ServletContextHandler();
         handler.setContextPath("/");
         handler.addServlet(servletHolder, "/");
+        handler.setMaxFormContentSize((int)_maxBodySize);
 
+        if (ServerProps.request_useTempfile) {
+            handler.setTempDirectory(scratchDir);
+        }
 
         //添加session state 支持
         if (enableSessionState) {
@@ -189,11 +191,7 @@ protected ServletContextHandler getServletHandler() throws IOException {
         //添加容器初始器
         handler.addBean(new JtContainerInitializer(handler.getServletContext()));
 
-
         //添加临时文件（用于jsp编译，或文件上传）
-        File tempDir = new File(System.getProperty("java.io.tmpdir"));
-        File scratchDir = new File(tempDir.toString(), "solon.server.jetty");
-
         if (!scratchDir.exists()) {
             if (!scratchDir.mkdirs()) {
                 throw new IOException("Unable to create scratch directory: " + scratchDir);

solon-jakarta-projects/solon-server/solon-server-jetty-jakarta/src/main/java/org/noear/solon/boot/jetty/integration/JettyPlugin.java

@@ -70,6 +70,11 @@ private void start0(AppContext context) throws Throwable {
         //初始化属性
         ServerProps.init();
 
+        if (org.noear.solon.server.ServerProps.request_maxBodySize > 0) {
+            System.setProperty("org.eclipse.jetty.server.Request.maxFormContentSize",
+                    String.valueOf(org.noear.solon.server.ServerProps.request_maxBodySize));
+        }
+
         if (ClassUtil.hasClass(() -> JettyJspServlet.class)) {
             _server = new JettyServerAddJsp();
         } else {

solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/SolonServletInstaller.java

@@ -22,8 +22,8 @@
 import jakarta.servlet.annotation.WebServlet;
 import org.noear.solon.Solon;
 import org.noear.solon.Utils;
-import org.noear.solon.web.servlet.holder.FilterHodler;
-import org.noear.solon.web.servlet.holder.ServletHolder;
+import org.noear.solon.web.servlet.holder.FilterAnnoHodler;
+import org.noear.solon.web.servlet.holder.ServletAnnoHolder;
 
 import java.util.*;
 
@@ -33,9 +33,9 @@
  */
 public class SolonServletInstaller {
     Set<ServletContainerInitializer> initializers = new LinkedHashSet<>();
-    Set<FilterHodler> filters = new LinkedHashSet<>();
+    Set<FilterAnnoHodler> filters = new LinkedHashSet<>();
     Set<EventListener> listeners = new LinkedHashSet<>();
-    Set<ServletHolder> servlets = new LinkedHashSet<>();
+    Set<ServletAnnoHolder> servlets = new LinkedHashSet<>();
 
     public SolonServletInstaller() {
         Solon.context().beanForeach((bw) -> {
@@ -53,14 +53,14 @@ public SolonServletInstaller() {
             if (bw.raw() instanceof Filter) {
                 WebFilter anno = bw.clz().getAnnotation(WebFilter.class);
                 if (anno != null) {
-                    filters.add(new FilterHodler(anno, bw.raw()));
+                    filters.add(new FilterAnnoHodler(anno, bw.raw()));
                 }
             }
 
             if (bw.raw() instanceof Servlet) {
                 WebServlet anno = bw.clz().getAnnotation(WebServlet.class);
                 if (anno != null) {
-                    servlets.add(new ServletHolder(anno, bw.raw()));
+                    servlets.add(new ServletAnnoHolder(anno, bw.raw()));
                 }
             }
         });
@@ -75,7 +75,7 @@ public void startup(Set<Class<?>> set, ServletContext sc) throws ServletExceptio
             sc.addListener(l);
         }
 
-        for (FilterHodler f : filters) {
+        for (FilterAnnoHodler f : filters) {
             String[] urlPatterns = f.anno.value();
             if (urlPatterns.length == 0) {
                 urlPatterns = f.anno.urlPatterns();
@@ -106,7 +106,7 @@ public void startup(Set<Class<?>> set, ServletContext sc) throws ServletExceptio
             }
         }
 
-        for (ServletHolder s : servlets) {
+        for (ServletAnnoHolder s : servlets) {
             String[] urlPatterns = s.anno.value();
             if (urlPatterns.length == 0) {
                 urlPatterns = s.anno.urlPatterns();

…lon/web/servlet/holder/FilterHodler.java …web/servlet/holder/FilterAnnoHodler.javasolon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/FilterHodler.java renamed to solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/FilterAnnoHodler.java solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/FilterHodler.java renamed to solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/FilterAnnoHodler.java

@@ -20,11 +20,11 @@
 
 import java.util.Objects;
 
-public class FilterHodler {
+public class FilterAnnoHodler {
     public final WebFilter anno;
     public final Filter filter;
 
-    public FilterHodler(WebFilter anno, Filter filter) {
+    public FilterAnnoHodler(WebFilter anno, Filter filter) {
         this.anno = anno;
         this.filter = filter;
     }
@@ -33,7 +33,7 @@ public FilterHodler(WebFilter anno, Filter filter) {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        FilterHodler that = (FilterHodler) o;
+        FilterAnnoHodler that = (FilterAnnoHodler) o;
         return Objects.equals(anno, that.anno) &&
                 Objects.equals(filter, that.filter);
     }

…on/web/servlet/holder/ServletHolder.java …eb/servlet/holder/ServletAnnoHolder.javasolon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/ServletHolder.java renamed to solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/ServletAnnoHolder.java solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/ServletHolder.java renamed to solon-jakarta-projects/solon-web/solon-web-servlet-jakarta/src/main/java/org/noear/solon/web/servlet/holder/ServletAnnoHolder.java

@@ -20,11 +20,11 @@
 
 import java.util.Objects;
 
-public class ServletHolder {
+public class ServletAnnoHolder {
     public final WebServlet anno;
     public final Servlet servlet;
 
-    public ServletHolder(WebServlet anno, Servlet servlet) {
+    public ServletAnnoHolder(WebServlet anno, Servlet servlet) {
         this.anno = anno;
         this.servlet = servlet;
     }
@@ -33,7 +33,7 @@ public ServletHolder(WebServlet anno, Servlet servlet) {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        ServletHolder that = (ServletHolder) o;
+        ServletAnnoHolder that = (ServletAnnoHolder) o;
         return Objects.equals(anno, that.anno) &&
                 Objects.equals(servlet, that.servlet);
     }