Update redkale-block (#9295)

* Update redkale-block * ConvertStandardString
TechEmpower · Oct 1, 2024 · 289d579 · 289d579
1 parent d96bcdc
commit 289d579
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 16 deletions.
diff --git a/frameworks/Java/redkale/BenchmarkService.java b/frameworks/Java/redkale/BenchmarkService.java
@@ -6,13 +6,12 @@
 package org.redkalex.benchmark;
 
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Stream;
 import org.redkale.annotation.*;
 import org.redkale.net.http.*;
 import org.redkale.service.AbstractService;
 import org.redkale.source.DataSource;
-import org.redkale.util.AnyValue;
 
 /**
  * 测试redkale-jdbc, 需要覆盖到原BenchmarkService
@@ -27,10 +26,6 @@ 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/benchmark_config.json b/frameworks/Java/redkale/benchmark_config.json
@@ -96,6 +96,7 @@
                 "versus": "Redkale"
             },
             "block": {
+                "plaintext_url": "/plaintext",
                 "db_url": "/db",
                 "query_url": "/queries?q=", 
                 "fortune_url": "/fortunes",

diff --git a/frameworks/Java/redkale/conf/application.xml b/frameworks/Java/redkale/conf/application.xml
@@ -8,7 +8,7 @@
         <property name="system.property.redkale.http.response.header.connection" value="none"/>
     </properties>
 
-    <server protocol="HTTP" port="8080" shareio="true">    
+    <server protocol="HTTP" port="8080">    
         <response>
             <content-type plain="text/plain" json="application/json"/>  
             <date period="1000"/>

diff --git a/frameworks/Java/redkale/config.toml b/frameworks/Java/redkale/config.toml
@@ -71,6 +71,7 @@ webserver = "Redkale"
 versus = "Redkale"
 
 [block]
+urls.plaintext = "/plaintext"
 urls.db = "/db"
 urls.fortune = "/fortunes"
 urls.query = "/queries?q="

diff --git a/frameworks/Java/redkale/redkale-block.dockerfile b/frameworks/Java/redkale/redkale-block.dockerfile
@@ -9,6 +9,7 @@ RUN mvn package -q
 FROM openjdk:23-jdk-slim
 WORKDIR /redkale
 COPY conf conf
+RUN sed -i 's/sameHeader="true"/ /g' /redkale/conf/application.xml
 COPY --from=maven /redkale/target/redkale-benchmark-1.0.0.jar redkale-benchmark.jar
 
 EXPOSE 8080

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
@@ -7,13 +7,11 @@
 
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
+import java.util.stream.*;
 import org.redkale.annotation.*;
 import org.redkale.net.http.*;
 import org.redkale.service.AbstractService;
 import org.redkale.source.DataSource;
-import org.redkale.util.AnyValue;
 
 /**
  *
@@ -28,10 +26,6 @@ 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;

diff --git a/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Message.java b/frameworks/Java/redkale/src/main/java/org/redkalex/benchmark/Message.java
@@ -6,7 +6,7 @@
 package org.redkalex.benchmark;
 
 import org.redkale.annotation.Serial;
-import org.redkale.convert.ConvertSmallString;
+import org.redkale.convert.ConvertStandardString;
 import org.redkale.convert.json.JsonConvert;
 
 /**
@@ -16,7 +16,7 @@
 @Serial
 public final class Message {
 
-    @ConvertSmallString
+    @ConvertStandardString
     private String message;
 
     public Message() {}