Merge remote-tracking branch 'origin/master'

Author: wangzihao

README.md

@@ -10,6 +10,9 @@
 
 ![](https://user-images.githubusercontent.com/18204507/68989252-9d871a80-087e-11ea-96e1-20c12689c12a.png)
 
+### 注意
+本项目不支持springboot3和jakarta-servlet，如果有需要可联系我，看下是否需要继续支持。
+
 ### 优势
 
 - 1.针对spring项目# 可以替代tomcat或jetty. 导包后一个@EnableNettyEmbedded注解即用. 
@@ -149,7 +152,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
 <dependency>
   <groupId>com.github.wangzihaogithub</groupId>
   <artifactId>spring-boot-protocol</artifactId>
-  <version>2.3.23</version>
+  <version>2.3.25</version>
 </dependency>
 ```
 
@@ -161,7 +164,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
 <dependency>
   <groupId>com.github.wangzihaogithub</groupId>
   <artifactId>netty-servlet</artifactId>
-  <version>2.3.23</version>
+  <version>2.3.25</version>
 </dependency>
 ```
 
@@ -317,7 +320,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
         <dependency>
           <groupId>com.github.wangzihaogithub</groupId>
           <artifactId>spring-boot-protocol</artifactId>
-          <version>2.3.23</version>
+          <version>2.3.25</version>
         </dependency>
 
         2.编写代码
@@ -397,7 +400,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
         <dependency>
           <groupId>com.github.wangzihaogithub</groupId>
           <artifactId>spring-boot-protocol</artifactId>
-          <version>2.3.23</version>
+          <version>2.3.25</version>
         </dependency>
 
         2.编写代码
@@ -486,7 +489,7 @@ github地址 : https://github.com/wangzihaogithub/spring-boot-protocol
          <dependency>
               <groupId>com.github.wangzihaogithub</groupId>
               <artifactId>spring-boot-protocol</artifactId>
-              <version>2.3.23</version>
+              <version>2.3.25</version>
         </dependency>
         
         2.编写启动类

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.github.wangzihaogithub</groupId>
     <artifactId>spring-boot-protocol</artifactId>
-    <version>2.3.23</version>
+    <version>2.3.25</version>
     <packaging>jar</packaging>
 
     <name>Spring Boot Protocol</name>
@@ -49,7 +49,7 @@
         <connection>scm:git:https://github.com/wangzihaogithub/spring-boot-protocol.git</connection>
         <developerConnection>scm:git:git@github.com:wangzihaogithub/spring-boot-protocol.git</developerConnection>
         <url>git@github.com:wangzihaogithub/spring-boot-protocol.git</url>
-        <tag>v2.3.23</tag>
+        <tag>v2.3.25</tag>
     </scm>
 
     <!-- 开发者信息 -->
@@ -609,4 +609,4 @@
     <!--gpg &#45;&#45;keyserver hkp://pool.sks-keyservers.net &#45;&#45;send-keys A12DCF7DF1-->
     <!--JAVA_TOOL_OPTIONS: -Dfile.encoding=UTF-8-->
     <!-- jar -cvf bundle.jar spring-boot-protocol-* -->
-</project>
+</project>

src/main/java/com/github/netty/protocol/servlet/ServletHttpAsyncRequest.java

@@ -219,7 +219,7 @@ private void decodePaths() {
             } else {
                 queryString = null;
             }
-            this.requestURI = com.github.netty.protocol.servlet.ServletContext.normPath(requestURI);
+            this.requestURI = requestURI;
             this.queryString = queryString;
         }
         this.decodePathsFlag = true;

src/main/java/com/github/netty/protocol/servlet/ServletHttpForwardRequest.java

@@ -221,7 +221,7 @@ private void decodePaths() {
             } else {
                 queryString = null;
             }
-            this.requestURI = com.github.netty.protocol.servlet.ServletContext.normPath(requestURI);
+            this.requestURI = requestURI;
             this.queryString = queryString;
         }
         this.decodePathsFlag = true;

src/main/java/com/github/netty/protocol/servlet/ServletHttpIncludeRequest.java

@@ -221,7 +221,7 @@ private void decodePaths() {
             } else {
                 queryString = null;
             }
-            this.requestURI = com.github.netty.protocol.servlet.ServletContext.normPath(requestURI);
+            this.requestURI = requestURI;
             this.queryString = queryString;
         }
         this.decodePathsFlag = true;

src/main/java/com/github/netty/protocol/servlet/ServletHttpServletRequest.java

@@ -514,7 +514,7 @@ private void decodePaths() {
         } else {
             queryString = null;
         }
-        this.requestURI = com.github.netty.protocol.servlet.ServletContext.normPath(requestURI);
+        this.requestURI = requestURI;
         this.queryString = queryString;
         this.decodePathsFlag = true;
     }

src/main/java/com/github/netty/springboot/server/NettyTcpServerFactory.java

@@ -8,6 +8,7 @@
 import com.github.netty.protocol.HttpServletProtocol;
 import com.github.netty.protocol.servlet.ServletContext;
 import com.github.netty.protocol.servlet.ServletRegistration;
+import com.github.netty.protocol.servlet.util.HttpLazyThreadPool;
 import com.github.netty.springboot.NettyProperties;
 import org.springframework.boot.web.reactive.server.ConfigurableReactiveWebServerFactory;
 import org.springframework.boot.web.server.WebServer;
@@ -23,7 +24,6 @@
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.util.Collection;
-import java.util.Objects;
 import java.util.TreeSet;
 import java.util.function.Supplier;
 
@@ -83,12 +83,13 @@ public WebServer getWebServer(HttpHandler httpHandler) {
             //Server port
             InetSocketAddress serverAddress = getServerSocketAddress(getAddress(), getPort());
             ServletContext servletContext = getServletContext();
-            if (servletContext != null) {
-                ServletRegistration.Dynamic servletRegistration = servletContext.addServlet("default", new ServletHttpHandlerAdapter(httpHandler));
-                servletRegistration.setAsyncSupported(true);
-                servletRegistration.addMapping("/");
-                servletContext.setServerAddress(serverAddress);
+            if (servletContext == null) {
+                servletContext = createHttpServletProtocolSpringAdapter().getServletContext();
             }
+            ServletRegistration.Dynamic servletRegistration = servletContext.addServlet("default", new ServletHttpHandlerAdapter(httpHandler));
+            servletRegistration.setAsyncSupported(true);
+            servletRegistration.addMapping("/");
+            servletContext.setServerAddress(serverAddress);
             return new NettyTcpServer(serverAddress, properties, protocolHandlers, serverListeners, channelHandlerSupplier);
         } catch (Exception e) {
             throw new IllegalStateException(e.getMessage(), e);
@@ -103,7 +104,10 @@ public WebServer getWebServer(HttpHandler httpHandler) {
      */
     @Override
     public WebServer getWebServer(ServletContextInitializer... initializers) {
-        ServletContext servletContext = Objects.requireNonNull(getServletContext());
+        ServletContext servletContext = getServletContext();
+        if (servletContext == null) {
+            servletContext = createHttpServletProtocolSpringAdapter().getServletContext();
+        }
         try {
             //Server port
             InetSocketAddress serverAddress = getServerSocketAddress(getAddress(), getPort());
@@ -162,6 +166,14 @@ public ServletContext getServletContext() {
         return null;
     }
 
+    protected HttpServletProtocol createHttpServletProtocolSpringAdapter() {
+        HttpLazyThreadPool threadPool = new HttpLazyThreadPool("NettyX-http");
+        HttpServletProtocolSpringAdapter adapter = new HttpServletProtocolSpringAdapter(new NettyProperties(), null, threadPool, threadPool);
+        protocolHandlers.add(adapter);
+        serverListeners.add(adapter);
+        return adapter;
+    }
+
     public Collection<ProtocolHandler> getProtocolHandlers() {
         return protocolHandlers;
     }

src/main/resources/server.properties

@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-server.info=Github Spring-boot-protocol/2.3.23
-server.number=2.3.23
-server.built=Sep 13 2024 13:23:31 UTC+8
+server.info=Github Spring-boot-protocol/2.3.25
+server.number=2.3.25
+server.built=Apr 12 2025 19:14:22 UTC+8