Update maven:3.9.6 (#9257)

redkale · web-flow · commit a329357a3176 · 2024-09-12T09:06:42.000-07:00
* Update maven:3.9.6

* Update graalvm:22.0.2

* Update graalvm-ce:22.3.3

* Update native-image-community:22.0.2

* Update jdk-community:22.0.2

* Update graalvm-ce:ol9

* Update graalvm-ce:ol9

* Update config

* Update config

* Update config

* Update config

* Update FortuneRender

* Update Redkale-2.8.0
diff --git a/frameworks/Java/redkale/BenchmarkService.java b/frameworks/Java/redkale/BenchmarkService.java
@@ -12,6 +12,7 @@
 import org.redkale.net.http.*;
 import org.redkale.service.AbstractService;
 import org.redkale.source.DataSource;
+import org.redkale.util.AnyValue;
 
 /**
  * 测试redkale-jdbc, 需要覆盖到原BenchmarkService
@@ -26,6 +27,10 @@ public class BenchmarkService extends AbstractService {
     @Resource
     private DataSource source;
 
+    public void init(AnyValue conf) {
+        source.finds(CachedWorld.class, 1);
+    }
+    
     @NonBlocking
     @RestMapping(auth = false)
     public byte[] plaintext() {
diff --git a/frameworks/Java/redkale/conf/application.xml b/frameworks/Java/redkale/conf/application.xml
@@ -4,19 +4,19 @@
     
     <properties>    
         <property name="system.property.redkale.trace.enabled" value="false"/>  
-        <property name="system.property.redkale.http.request.pipeline.sameheaders" value="true"/>  
         <property name="system.property.redkale.http.response.header.server" value="redkale"/>
         <property name="system.property.redkale.http.response.header.connection" value="none"/>
     </properties>
         
-    <server protocol="HTTP" lazy="true" port="8080">      
+    <server protocol="HTTP" port="8080" shareio="true">    
         <response>
             <content-type plain="text/plain" json="application/json"/>  
             <date period="1000"/>
         </response>
-        <render value="org.redkalex.benchmark.FortuneRender"/>
-        <services autoload="true"/>        
+        <request lazyHeader="true" sameHeader="true"/>
+        <render value="org.redkalex.benchmark.FortuneRender"/>      
         <rest autoload="true"/>
+        <services autoload="true"/>  
         <servlets autoload="true"/>        
     </server>
         
diff --git a/frameworks/Java/redkale/conf/source.properties b/frameworks/Java/redkale/conf/source.properties
@@ -4,5 +4,6 @@
 redkale.datasource[].url = jdbc:postgresql://tfb-database:5432/hello_world
 redkale.datasource[].user = benchmarkdbuser
 redkale.datasource[].password = benchmarkdbpass
-redkale.datasource[].warnslowms = 0
-redkale.datasource[].errorslowms = 0
+redkale.datasource[].non-blocking = true
+redkale.datasource[].warn-slowms = 0
+redkale.datasource[].error-slowms = 0
diff --git a/frameworks/Java/redkale/pom-jdbc.xml b/frameworks/Java/redkale/pom-jdbc.xml
@@ -7,12 +7,12 @@
 
     <properties>
         <main.class>org.redkale.boot.Application</main.class>
-        <redkale.version>2.9.0-SNAPSHOT</redkale.version>
+        <redkale.version>2.8.0-SNAPSHOT</redkale.version>
         <redkale-maven.version>1.3.0-SNAPSHOT</redkale-maven.version>
-        <postgresql.version>42.6.0</postgresql.version>
+        <postgresql.version>42.7.2</postgresql.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties> 
 
     <dependencies>  
@@ -77,7 +77,6 @@
                     <encoding>UTF-8</encoding>
                     <compilerArgs>
                         <arg>-parameters</arg>
-                        <arg>--enable-preview</arg>
                     </compilerArgs>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
diff --git a/frameworks/Java/redkale/pom-pgclient.xml b/frameworks/Java/redkale/pom-pgclient.xml
@@ -7,13 +7,13 @@
 
     <properties>
         <main.class>org.redkale.boot.Application</main.class>
-        <redkale.version>2.9.0-SNAPSHOT</redkale.version>
-        <redkale-maven.version>1.3.0-SNAPSHOT</redkale-maven.version>
+        <redkale.version>2.8.0-SNAPSHOT</redkale.version>
+        <redkale-maven.version>1.2.0-SNAPSHOT</redkale-maven.version>
         <vertx.version>4.5.8</vertx.version>
         <vertx-scram.version>2.1</vertx-scram.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>18</maven.compiler.source>
-        <maven.compiler.target>18</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties> 
 
     <dependencies>  
@@ -84,7 +84,6 @@
                     <encoding>UTF-8</encoding>
                     <compilerArgs>
                         <arg>-parameters</arg>
-                        <arg>--enable-preview</arg>
                     </compilerArgs>
                     <showDeprecation>true</showDeprecation>
                 </configuration>
diff --git a/frameworks/Java/redkale/pom.xml b/frameworks/Java/redkale/pom.xml
@@ -7,11 +7,11 @@
 
     <properties>
         <main.class>org.redkale.boot.Application</main.class>
-        <redkale.version>2.9.0-SNAPSHOT</redkale.version>
-        <redkale-maven.version>1.3.0-SNAPSHOT</redkale-maven.version>
+        <redkale.version>2.8.0-SNAPSHOT</redkale.version>
+        <redkale-maven.version>1.2.0-SNAPSHOT</redkale-maven.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties> 
 
     <dependencies>  
diff --git a/frameworks/Java/redkale/redkale-block.dockerfile b/frameworks/Java/redkale/redkale-block.dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-openjdk-18-slim as maven
+FROM maven:3.9.6-amazoncorretto-21-debian as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
diff --git a/frameworks/Java/redkale/redkale-graalvm.dockerfile b/frameworks/Java/redkale/redkale-graalvm.dockerfile
@@ -1,12 +1,12 @@
-FROM maven:3.8.6-openjdk-18-slim as maven
+FROM maven:3.9.6-amazoncorretto-21-debian as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom.xml pom.xml
 RUN mvn package -q
 
 
-FROM ghcr.io/graalvm/jdk-community:21.0.0
+FROM ghcr.io/graalvm/jdk-community:22.0.2
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
diff --git a/frameworks/Java/redkale/redkale-jdbc.dockerfile b/frameworks/Java/redkale/redkale-jdbc.dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-openjdk-18-slim as maven
+FROM maven:3.9.6-amazoncorretto-21-debian as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
diff --git a/frameworks/Java/redkale/redkale-native.dockerfile b/frameworks/Java/redkale/redkale-native.dockerfile
@@ -1,20 +1,20 @@
-FROM maven:3.8.6-openjdk-18-slim as maven
+FROM maven:3.9.6-amazoncorretto-21-debian as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
 COPY pom.xml pom.xml
 RUN mvn package -q
 
 
-FROM ghcr.io/graalvm/graalvm-ce:ol9-java17-22.3.3
-RUN gu install native-image
+FROM ghcr.io/graalvm/native-image-community:22.0.2 as native
 WORKDIR /redkale
 COPY conf conf
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
-
 RUN native-image -H:+ReportExceptionStackTraces --report-unsupported-elements-at-runtime -jar redkale-benchmark.jar
 
-RUN ls -lh
+FROM ghcr.io/graalvm/jdk-community:22.0.2
+WORKDIR /redkale
+COPY --from=native /redkale/redkale-benchmark redkale-benchmark
 
 EXPOSE 8080
 
diff --git a/frameworks/Java/redkale/redkale-pgclient.dockerfile b/frameworks/Java/redkale/redkale-pgclient.dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-openjdk-18-slim as maven
+FROM maven:3.9.6-amazoncorretto-21-debian as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
diff --git a/frameworks/Java/redkale/redkale.dockerfile b/frameworks/Java/redkale/redkale.dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3.8.6-openjdk-18-slim as maven
+FROM maven:3.9.6-amazoncorretto-21-debian as maven
 WORKDIR /redkale
 COPY src src
 COPY conf conf
diff --git a/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/BenchmarkService.java b/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/BenchmarkService.java
@@ -13,6 +13,7 @@
 import org.redkale.net.http.*;
 import org.redkale.service.AbstractService;
 import org.redkale.source.DataSource;
+import org.redkale.util.AnyValue;
 
 /**
  *
@@ -27,6 +28,10 @@ public class BenchmarkService extends AbstractService {
     @Resource
     private DataSource source;
 
+    public void init(AnyValue conf) {
+        source.finds(CachedWorld.class, 1);
+    }
+
     @RestMapping(auth = false)
     public byte[] plaintext() {
         return helloBytes;
@@ -53,8 +58,8 @@ public CompletableFuture<List<World>> updates(int q) {
         IntStream ids = ThreadLocalRandom.current().ints(size, 1, 10001);
         int[] newNumbers = ThreadLocalRandom.current().ints(size, 1, 10001).toArray();
         return source.findsListAsync(World.class, ids.boxed())
-            .thenCompose(words -> source.updateAsync(World.updateNewNumbers(words, newNumbers))
-            .thenApply(v -> words));
+                .thenCompose(words -> source.updateAsync(World.updateNewNumbers(words, newNumbers))
+                        .thenApply(v -> words));
     }
 
     @RestMapping(auth = false)
diff --git a/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/FortuneRender.java b/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/FortuneRender.java
@@ -7,6 +7,7 @@
 
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.function.Function;
 import org.redkale.convert.Convert;
 import org.redkale.net.http.*;
 import org.redkale.util.*;
@@ -19,7 +20,9 @@ public class FortuneRender implements org.redkale.net.http.HttpRender {
 
     private static final String contentType = "text/html; charset=utf-8";
 
-    private static final byte[] text1 = "<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>".getBytes(StandardCharsets.UTF_8);
+    private static final byte[] text1 =
+            "<!DOCTYPE html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr>"
+                    .getBytes(StandardCharsets.UTF_8);
 
     private static final byte[] text2 = "<tr><td>".getBytes(StandardCharsets.UTF_8);
 
@@ -29,9 +32,9 @@ public class FortuneRender implements org.redkale.net.http.HttpRender {
 
     private static final byte[] text5 = "</table></body></html>".getBytes(StandardCharsets.UTF_8);
 
-    private final ThreadLocal<ByteArray> localByteArray = ThreadLocal.withInitial(() -> new ByteArray(1280));
+    private static final String arrayName = "fortuneByteArray";
 
-    private final ThreadLocal<ByteArray> localTmpArray = ThreadLocal.withInitial(() -> new ByteArray(128));
+    private static final Function<String, ByteArray> arrayFunc = s -> new ByteArray(1280);
 
     private byte[][] idBytesCache;
 
@@ -53,12 +56,11 @@ public void init(HttpContext context, AnyValue config) {
 
     @Override
     public void renderTo(HttpRequest request, HttpResponse response, Convert convert, HttpScope scope) {
-        ByteArray array = localByteArray.get().clear();
+        ByteArray array = request.getSubobjectIfAbsent(arrayName, arrayFunc).clear();
         array.put(text1);
-        ByteArray tmp = localTmpArray.get();
         for (Fortune item : (List<Fortune>) scope.getReferObj()) {
-            array.put(text2).put(escapeId(item.getId()))
-                .put(text3).put(escapeMessage(tmp, item.getMessage())).put(text4);
+            ByteArray msg = request.getSubobjectIfAbsent(item.getMessage(), this::escapeMessage);
+            array.put(text2).put(escapeId(item.getId())).put(text3).put(msg).put(text4);
         }
         array.put(text5);
         response.finish(contentType, array);
@@ -72,23 +74,22 @@ private byte[] escapeId(int id) {
         }
     }
 
-    private ByteArray escapeMessage(ByteArray tmp, String message) {
-        tmp.clear();
+    private ByteArray escapeMessage(String message) {
+        ByteArray array = new ByteArray(128);
         CharSequence cs = message;
         for (int i = 0; i < cs.length(); i++) {
             char c = cs.charAt(i);
             byte[] bs = c < escapeCache.length ? escapeCache[c] : null;
             if (bs != null) {
-                tmp.put(bs);
+                array.put(bs);
             } else if (c < 0x80) {
-                tmp.put((byte) c);
+                array.put((byte) c);
             } else if (c < 0x800) {
-                tmp.put((byte) (0xc0 | (c >> 6)), (byte) (0x80 | (c & 0x3f)));
+                array.put((byte) (0xc0 | (c >> 6)), (byte) (0x80 | (c & 0x3f)));
             } else {
-                tmp.put((byte) (0xe0 | ((c >> 12))), (byte) (0x80 | ((c >> 6) & 0x3f)), (byte) (0x80 | (c & 0x3f)));
+                array.put((byte) (0xe0 | (c >> 12)), (byte) (0x80 | ((c >> 6) & 0x3f)), (byte) (0x80 | (c & 0x3f)));
             }
         }
-        return tmp;
+        return array;
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM maven:3.8.6-openjdk-18-slim as maven`
	`1`	`+FROM maven:3.9.6-amazoncorretto-21-debian as maven`
`2`	`2`	`WORKDIR /redkale`
`3`	`3`	`COPY src src`
`4`	`4`	`COPY conf conf`