更新版本jrouter-servlet 2.0.0, 更新pom.xml.

更新依赖包jrouter至 1.8.8.
完善代码格式、注释及文档。

Author: lluo

.gitignore

@@ -1,4 +1,34 @@
-/nb-configuration.xml
-/target
-/jrouter-servlet.iml
-/.idea
+target/
+!.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nb-configuration.xml
+/nbproject/
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/

.springjavaformatconfig

@@ -0,0 +1 @@
+indentation-style=spaces

README.md

@@ -11,7 +11,7 @@
 <dependency>
     <groupId>net.jrouter</groupId>
     <artifactId>jrouter-servlet</artifactId>
-    <version>1.8.7</version>
+    <version>1.8.8</version>
 </dependency>
 ```
 

pom.xml

@@ -5,23 +5,20 @@
     <parent>
         <groupId>net.jrouter</groupId>
         <artifactId>j-parent</artifactId>
-        <version>1.7</version>
+        <version>2.0</version>
     </parent>
     <artifactId>jrouter-servlet</artifactId>
     <packaging>jar</packaging>
-    <version>1.8.8-SNAPSHOT</version>
+    <version>2.0.0</version>
     <name>JRouter-servlet</name>
     <url>https://github.com/tripluo/jrouter-servlet</url>
     <licenses>
         <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
+            <name>Apache License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0</url>
         </license>
     </licenses>
     <scm>
-        <connection>scm:git:git@github.com:tripluo/jrouter-servlet.git</connection>
-        <developerConnection>scm:git:git@github.com:tripluo/jrouter-servlet.git</developerConnection>
         <url>https://github.com/tripluo/jrouter-servlet</url>
     </scm>
     <developers>
@@ -34,15 +31,19 @@
     <description>jrouter for http request mapping also adapted servlet.</description>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <checkstyle.config.file></checkstyle.config.file>
-        <pmd.rule.file></pmd.rule.file>
+        <surefire.argLine>
+            --add-opens=java.base/java.lang=ALL-UNNAMED
+            --add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+            --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+            --add-opens=java.base/java.util=ALL-UNNAMED
+        </surefire.argLine>
     </properties>
     <dependencies>
         <!-- jrouter -->
         <dependency>
             <groupId>net.jrouter</groupId>
             <artifactId>jrouter</artifactId>
-            <version>${project.version}</version>
+            <version>1.8.8</version>
         </dependency>
         <!-- logback -->
         <dependency>
@@ -59,14 +60,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <exclusions>
-                <!--
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-                -->
-            </exclusions>
             <optional>true</optional>
         </dependency>
         <dependency>
@@ -88,9 +81,8 @@
         </dependency>
         <!-- servlet/jsp -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <!-- spring test -->
         <dependency>
@@ -109,32 +101,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <showDeprecation>true</showDeprecation>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
-            <!-- jar -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

src/main/java/net/jrouter/http/netty/HttpActionInvocation.java

@@ -32,29 +32,26 @@ public interface HttpActionInvocation extends ActionInvocation<String> {
 
     /**
      * Gets the HTTP request object.
-     *
      * @return the HTTP request object.
      */
     FullHttpRequest getRequest();
 
     /**
      * Gets the HTTP response object.
-     *
      * @return the HTTP response object.
      */
     FullHttpResponse getResponse();
 
     /**
      * Gets the {@code ChannelHandlerContext} object.
-     *
      * @return the {@code ChannelHandlerContext} object.
      */
     ChannelHandlerContext getChannelHandlerContext();
 
     /**
      * Get Invocation Context Map.
-     *
      * @return the Context Map.
      */
     Map<String, Object> getContextMap();
+
 }

src/main/java/net/jrouter/http/netty/HttpServerActionFactory.java

@@ -20,10 +20,6 @@
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.FullHttpResponse;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
 import net.jrouter.ActionFactory;
 import net.jrouter.ActionInvocation;
 import net.jrouter.JRouterException;
@@ -32,23 +28,26 @@
 import net.jrouter.impl.PathActionFactory;
 import net.jrouter.support.ActionInvocationDelegate;
 
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 /**
  * {@code HttpServerActionFactory} invoke Action with Http parameters.
  */
 public interface HttpServerActionFactory extends ActionFactory<String> {
 
     /**
-     * Use this instead of {@link #invokeAction(Object, Object...)} to pass Http parameters.
-     *
+     * Use this instead of {@link #invokeAction(Object, Object...)} to pass Http
+     * parameters.
      * @param <T> Generic type.
      * @param path Action path.
      * @param request FullHttpRequest.
      * @param response FullHttpResponse.
      * @param context ChannelHandlerContext.
-     *
      * @return Action invoked result.
-     *
-     * @throws JRouterException if error occurrs.
+     * @throws JRouterException if error occurs.
      * @see #invokeAction(Object, Object...)
      */
     <T> T invokeAction(String path, FullHttpRequest request, FullHttpResponse response, ChannelHandlerContext context)
@@ -57,7 +56,7 @@ <T> T invokeAction(String path, FullHttpRequest request, FullHttpResponse respon
     /**
      * 提供{@code ServletActionFactory}接口默认实现。覆写{@link #createActionInvocation}方法创建{@code HttpServerActionFactory}接口对象。
      *
-     * @see #createActionInvocation(java.lang.String, java.lang.Object...)
+     * @see #createActionInvocation
      */
     class DefaultHttpActionFactory extends PathActionFactory implements HttpServerActionFactory {
 
@@ -69,7 +68,6 @@ class DefaultHttpActionFactory extends PathActionFactory implements HttpServerAc
 
         /**
          * Constructor.
-         *
          * @param properties Properties
          */
         public DefaultHttpActionFactory(Properties properties) {
@@ -79,15 +77,14 @@ public DefaultHttpActionFactory(Properties properties) {
 
         @Override
         public <T> T invokeAction(String path, FullHttpRequest request, FullHttpResponse response,
-                                  ChannelHandlerContext sc) throws JRouterException {
+                ChannelHandlerContext sc) throws JRouterException {
             // invoke and pass http parameters
             return (T) super.invokeAction(actionPathCaseSensitive ? path : path.toLowerCase(Locale.getDefault()),
                     request, response, sc);
         }
 
         /**
          * 创建并返回{@link ChannelHandlerContext}接口对象。
-         *
          * @return {@link ChannelHandlerContext}接口对象。
          */
         @Override
@@ -98,12 +95,8 @@ protected ActionInvocation<String> createActionInvocation(String path, Object...
 
             // 优先从invokeAction参数中获取Http参数对象，已由invokeAction方法指定参数顺序
             if (checkHttpParameters(params)) {
-                httpInvocation = new DefaultHttpActionInvocation(invocation,
-                        (FullHttpRequest) params[0],
-                        (FullHttpResponse) params[1],
-                        (ChannelHandlerContext) params[2],
-                        new HashMap<>(4)
-                );
+                httpInvocation = new DefaultHttpActionInvocation(invocation, (FullHttpRequest) params[0],
+                        (FullHttpResponse) params[1], (ChannelHandlerContext) params[2], new HashMap<>(4));
                 return httpInvocation;
             }
             // return ActionInvocation if can't get any http parameters
@@ -112,18 +105,15 @@ protected ActionInvocation<String> createActionInvocation(String path, Object...
 
         /**
          * 检测{@link #invokeAction}方法传递过来参数的正确性。
-         *
          * @param params 由{@link #invokeAction}方法传递过来参数。
-         *
          * @return 参数是否为正确的Http参数对象。
          *
-         * @see #invokeAction(String, FullHttpRequest, FullHttpResponse, ChannelHandlerContext)
+         * @see #invokeAction(String, FullHttpRequest,
+         * FullHttpResponse,ChannelHandlerContext)
          */
         private boolean checkHttpParameters(Object... params) {
-            return params != null && params.length == 3
-                    && (params[0] instanceof FullHttpRequest)
-                    && (params[1] instanceof FullHttpResponse)
-                    && (params[2] instanceof ChannelHandlerContext);
+            return params != null && params.length == 3 && (params[0] instanceof FullHttpRequest)
+                    && (params[1] instanceof FullHttpResponse) && (params[2] instanceof ChannelHandlerContext);
         }
 
         /**
@@ -153,7 +143,9 @@ protected String buildActionPath(String namespace, String aname, Method method)
                 }
                 super.afterPropertiesSet();
             }
+
         }
+
     }
 
     /**
@@ -182,8 +174,10 @@ class DefaultHttpActionInvocation extends ActionInvocationDelegate<String> imple
          */
         private final Map<String, Object> contextMap;
 
-        public DefaultHttpActionInvocation(ActionInvocation<String> invocation, FullHttpRequest request, //NOPMD ExcessiveParameterList
-                                           FullHttpResponse response, ChannelHandlerContext channelHandlerContext, Map<String, Object> contextMap) {
+        public DefaultHttpActionInvocation(ActionInvocation<String> invocation, FullHttpRequest request, // NOPMD
+                                                                                                         // ExcessiveParameterList
+                FullHttpResponse response, ChannelHandlerContext channelHandlerContext,
+                Map<String, Object> contextMap) {
             super();
             this.delegate = invocation;
             this.request = request;
@@ -212,6 +206,7 @@ public ChannelHandlerContext getChannelHandlerContext() {
         public Map<String, Object> getContextMap() {
             return contextMap;
         }
+
     }
 
 }