Update 2.3.0 (#6431)

* Update application.xml

* Update persistence.xml

* Update benchmark_config.json

* Update Service.java

frameworks/Java/redkale/benchmark_config.json

@@ -1,7 +1,7 @@
 {
   "framework": "redkale",
   "tests": [{
-	"default": {
+    "default": {
       "plaintext_url": "/plaintext",   
       "json_url": "/json",   
       "port": 8080,
@@ -41,6 +41,43 @@
       "display_name": "redkale",
       "notes": "",
       "versus": "Redkale"
+    },
+	"io": {
+      "plaintext_url": "/plaintext",   
+      "json_url": "/json",   
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "Redkale",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "Redkale",
+      "webserver": "Redkale",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "redkale",
+      "notes": "",
+      "versus": "Redkale"
+    },
+	"json": { 
+      "json_url": "/json",   
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "Redkale",
+      "language": "Java",
+      "flavor": "None",
+      "orm": "Raw",
+      "platform": "Redkale",
+      "webserver": "Redkale",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "redkale",
+      "notes": "",
+      "versus": "Redkale"
     }
   }]
 }

frameworks/Java/redkale/conf/application.xml

@@ -3,20 +3,18 @@
 <application port="8585">     
     
     <resources>
-	<executor threads="0"/>
-	<properties>	
-        	<property name="system.property.convert.tiny" value="false"/>	
-        	<property name="system.property.http.response.header.connection" value="none"/>
+        <executor threads="0"/>
+        <properties>    
+            <property name="system.property.convert.tiny" value="false"/>    
+            <property name="system.property.http.response.header.connection" value="none"/>
         </properties>
     </resources> 
         
     <server protocol="HTTP" lazy="true" port="8080">      
-                
         <response>
-		<contenttype plain="text/plain" json="application/json"/>  
-		<date period="1000"/>
-	</response>
-
+            <contenttype plain="text/plain" json="application/json"/>  
+            <date period="1000"/>
+        </response>
         <services autoload="true"/>        
         <rest autoload="true"/>
         <servlets autoload="true"/>

frameworks/Java/redkale/conf/persistence.xml

@@ -7,7 +7,6 @@
         <properties>
             <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://tfb-database:5432/hello_world"/>
             <property name="javax.persistence.jdbc.preparecache" value="true"/>
-            <property name="javax.persistence.jdbc.prepare" value="true"/>
             <property name="javax.persistence.connections.limit" value="512"/>
             <property name="javax.persistence.jdbc.user" value="benchmarkdbuser"/>
             <property name="javax.persistence.jdbc.password" value="benchmarkdbpass"/>

frameworks/Java/redkale/config.toml

@@ -29,3 +29,28 @@ orm = "Raw"
 platform = "Redkale"
 webserver = "Redkale"
 versus = "Redkale"
+
+[io]
+urls.plaintext = "/plaintext"
+urls.json = "/json"
+approach = "Realistic"
+classification = "Fullstack"
+database = "None"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = "Redkale"
+webserver = "Redkale"
+versus = "Redkale"
+
+[json]
+urls.json = "/json"
+approach = "Realistic"
+classification = "Fullstack"
+database = "None"
+database_os = "Linux"
+os = "Linux"
+orm = "Raw"
+platform = "Redkale"
+webserver = "Redkale"
+versus = "Redkale"

frameworks/Java/redkale/redkale-io.dockerfile

@@ -0,0 +1,15 @@
+FROM maven:3.6.1-jdk-11-slim as maven
+WORKDIR /redkale
+COPY src src
+COPY conf conf
+COPY pom.xml pom.xml
+RUN mvn package -q
+
+FROM openjdk:11.0.3-jdk-slim
+WORKDIR /redkale
+COPY conf conf
+COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
+
+EXPOSE 8080
+
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=80000", "-XX:BiasedLockingStartupDelay=500", "-Dio.direct.fd=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/redkale-json.dockerfile

@@ -0,0 +1,15 @@
+FROM maven:3.6.1-jdk-11-slim as maven
+WORKDIR /redkale
+COPY src src
+COPY conf conf
+COPY pom.xml pom.xml
+RUN mvn package -q
+
+FROM openjdk:11.0.3-jdk-slim
+WORKDIR /redkale
+COPY conf conf
+COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
+
+EXPOSE 8080
+
+CMD ["java", "-server", "-XX:+UseNUMA", "-XX:+UseParallelGC", "-XX:AutoBoxCacheMax=80000", "-XX:BiasedLockingStartupDelay=500", "-Djson.direct.test=true", "-DAPP_HOME=./", "-jar", "redkale-benchmark.jar"]

frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Service.java

@@ -13,6 +13,7 @@ import javax.annotation.Resource;
 import org.redkale.net.http.*;
 import org.redkale.service.AbstractService;
 import org.redkale.source.*;
+import org.redkale.util.StringWrapper;
 
 /**
  *
@@ -49,12 +50,6 @@ public class Service extends AbstractService {
         final Random random = localRandom.get();
         final World[] worlds = new World[size];
 
-//        final CompletableFuture[] futures = new CompletableFuture[size];
-//        for (int i = 0; i < size; i++) {
-//            final int index = i;
-//            futures[i] = source.findAsync(World.class, randomId(random)).thenAccept(v -> worlds[index] = v);
-//        }
-//        return CompletableFuture.allOf(futures).thenApply(v -> worlds);
         final AtomicInteger index = new AtomicInteger();
         final Function<?, CompletableFuture> func = f -> source.findAsync(World.class, randomId(random))
             .thenAccept(v -> worlds[index.getAndIncrement()] = v);
@@ -71,12 +66,6 @@ public class Service extends AbstractService {
         final Random random = localRandom.get();
         final World[] worlds = new World[size];
 
-//        final CompletableFuture[] futures = new CompletableFuture[size];
-//        for (int i = 0; i < size; i++) {
-//            final int index = i;
-//            futures[i] = source.findAsync(World.class, randomId(random)).thenAccept(v -> worlds[index] = v.randomNumber(randomId(random)));
-//        }
-//        return CompletableFuture.allOf(futures).thenCompose(v -> source.updateAsync(sort(worlds))).thenApply(v -> worlds);
         final AtomicInteger index = new AtomicInteger();
         final Function<?, CompletableFuture> func = f -> source.findAsync(World.class, randomId(random))
             .thenAccept(v -> worlds[index.getAndIncrement()] = v.randomNumber(randomId(random)));