Uplift t-io to jdk 25

Author: jj

frameworks/Java/t-io/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-http-parent</artifactId>
-		<version>3.5.5.v20191010-RELEASE</version>
+		<version>3.8.6.v20240801-RELEASE</version>
 	</parent>
 
 	<properties>
@@ -25,7 +25,6 @@
 			<artifactId>tio-http-server</artifactId>
 		</dependency>
 
-		<!-- slf4j-logback绑定 -->
 		<dependency>
 			<groupId>ch.qos.logback</groupId>
 			<artifactId>logback-classic</artifactId>
@@ -83,8 +82,8 @@
 				<artifactId>maven-assembly-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>make-assembly</id> <!--名字任意 -->
-						<phase>package</phase>  <!-- 绑定到package生命周期阶段上 -->
+						<id>make-assembly</id>
+						<phase>package</phase>
 						<goals>
 							<goal>single</goal>
 						</goals>

frameworks/Java/t-io/script/pkg.xml

@@ -18,7 +18,7 @@
 
 		<fileSet>
 			<directory>${project.basedir}</directory>
-			<outputDirectory></outputDirectory>
+			<outputDirectory/>
 			<includes>
 				<include>startup.*</include>
 				<include>debug.*</include>

frameworks/Java/t-io/src/main/java/org/tio/http/server/benchmark/TioBenchmarkStarter.java

@@ -7,37 +7,36 @@
 import org.tio.http.server.benchmark.controller.TestController;
 import org.tio.http.server.handler.DefaultHttpRequestHandler;
 import org.tio.http.server.mvc.Routes;
-import org.tio.server.ServerTioConfig;
+import org.tio.server.TioServerConfig;
 
 /**
- * @author tanyaowu 
- * 2018年6月9日 上午10:30:45
+ * @author tanyaowu
  */
 public class TioBenchmarkStarter {
-	public static HttpConfig				httpConfig;
-	public static DefaultHttpRequestHandler	requestHandler;
-	public static HttpServerStarter			httpServerStarter;
-	public static ServerTioConfig			serverTioConfig;
+    public static HttpConfig httpConfig;
+    public static DefaultHttpRequestHandler requestHandler;
+    public static HttpServerStarter httpServerStarter;
+    public static TioServerConfig serverTioConfig;
 
-	/**
-	 * @param args
-	 * @author tanyaowu
-	 * @throws IOException
-	 */
-	public static void main(String[] args) throws Exception {
-		httpConfig = new HttpConfig(8080, null, null, null);
-		httpConfig.setUseSession(false);
-		httpConfig.setWelcomeFile(null);
-		httpConfig.setCheckHost(false);
-		httpConfig.setCompatible1_0(false);
+    /**
+     * @param args
+     * @throws IOException
+     * @author tanyaowu
+     */
+    public static void main(String[] args) throws Exception {
+        httpConfig = new HttpConfig(8080, null, null, null);
+        httpConfig.setUseSession(false);
+        httpConfig.setWelcomeFile(null);
+        httpConfig.setCheckHost(false);
+        httpConfig.setCompatible1_0(false);
 
-		Routes routes = new Routes(TestController.class);
+        Routes routes = new Routes(TestController.class);
 
-		requestHandler = new DefaultHttpRequestHandler(httpConfig, routes);
-		requestHandler.setCompatibilityAssignment(false);
-		httpServerStarter = new HttpServerStarter(httpConfig, requestHandler);
-		serverTioConfig = httpServerStarter.getServerTioConfig();
-		serverTioConfig.statOn = false;
-		httpServerStarter.start();
-	}
+        requestHandler = new DefaultHttpRequestHandler(httpConfig, routes);
+        requestHandler.setCompatibilityAssignment(false);
+        httpServerStarter = new HttpServerStarter(httpConfig, requestHandler);
+        serverTioConfig = httpServerStarter.getTioServerConfig();
+        serverTioConfig.statOn = false;
+        httpServerStarter.start();
+    }
 }

frameworks/Java/t-io/src/main/java/org/tio/http/server/benchmark/controller/TestController.java

@@ -28,9 +28,6 @@ public HttpResponse json(HttpRequest request) throws Exception {
 		ret.setBody(Json.toJson(new Message(HELLO_WORLD)).getBytes());
 		ret.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_JSON);
 		return ret;
-		
-		//简便写法
-//		return Resps.json(request, new Message(HELLO_WORLD));
 	}
 
 	@RequestPath(value = "plaintext")
@@ -41,7 +38,5 @@ public HttpResponse plaintext(HttpRequest request) throws Exception {
 		ret.addHeader(HeaderName.Content_Type, HeaderValue.Content_Type.TEXT_PLAIN_TXT);
 		return ret;
 
-		//简便写法
-//		return Resps.bytesWithContentType(request, HELLO_WORLD_BYTES, MimeType.TEXT_PLAIN_TXT.getType());
 	}
 }

frameworks/Java/t-io/src/main/java/org/tio/http/server/benchmark/model/Message.java

@@ -2,7 +2,6 @@
 
 /**
  * @author tanyaowu 
- * 2018年6月9日 上午10:06:26
  */
 public final class Message {
 	private final String message;

frameworks/Java/t-io/tio-mvc.dockerfile

@@ -1,13 +1,17 @@
-FROM maven:3.6.1-jdk-11-slim as maven
+FROM maven:3-eclipse-temurin-24-alpine as maven
 WORKDIR /t-io
 COPY pom.xml pom.xml
 COPY src src
 COPY script script
-RUN mvn package -q
+RUN mvn compile assembly:single -q
 
-#TODO use separate JDK/JRE for the RUN (as the other builds)
-WORKDIR /t-io/target/tio-http-server-benchmark
+FROM openjdk:25-jdk-slim
+WORKDIR /t-io
+COPY --from=maven /t-io/target/tio-http-server-benchmark/config /t-io/config
+COPY --from=maven /t-io/target/tio-http-server-benchmark/lib /t-io/lib
+
+WORKDIR /t-io
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-Xms1G", "-Xmx1G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dpacket.handler.mode=queue1", "-cp", "/t-io/target/tio-http-server-benchmark/config:/t-io/target/tio-http-server-benchmark/lib/*", "org.tio.http.server.benchmark.TioBenchmarkStarter"]
+CMD ["java", "-server", "-Xms1G", "-Xmx1G", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-Dpacket.handler.mode=queue1", "-cp", "/t-io/config:/t-io/lib/*", "org.tio.http.server.benchmark.TioBenchmarkStarter"]