diff --git a/frameworks/Java/hserver/benchmark_config.json b/frameworks/Java/hserver/benchmark_config.json
index 87397f30d93..035eae68c9c 100644
--- a/frameworks/Java/hserver/benchmark_config.json
+++ b/frameworks/Java/hserver/benchmark_config.json
@@ -5,11 +5,11 @@
{
"default": {
"db_url": "/db",
- "query_url": "/queries?queries=",
"fortune_url": "/fortunes",
"plaintext_url": "/plaintext",
- "update_url": "/updates?queries=",
"json_url": "/json",
+ "query_url": "/queries?queries=",
+ "update_url": "/updates?queries=",
"port": 8888,
"approach": "Realistic",
"classification": "Fullstack",
@@ -18,8 +18,8 @@
"language": "Java",
"flavor": "None",
"orm": "Full",
- "platform": "None",
- "webserver": "None",
+ "platform": "hserver",
+ "webserver": "hserver",
"os": "Linux",
"database_os": "Linux",
"display_name": "hserver",
@@ -28,4 +28,4 @@
}
}
]
-}
\ No newline at end of file
+}
diff --git a/frameworks/Java/hserver/config.toml b/frameworks/Java/hserver/config.toml
index db5b6ff47a1..6979faa03a0 100644
--- a/frameworks/Java/hserver/config.toml
+++ b/frameworks/Java/hserver/config.toml
@@ -12,6 +12,6 @@ approach = "Realistic"
classification = "Fullstack"
os = "Linux"
orm = "Full"
-platform = "None"
-webserver = "None"
-versus = "hserver"
\ No newline at end of file
+platform = "hserver"
+webserver = "hserver"
+versus = "hserver"
diff --git a/frameworks/Java/hserver/hserver.dockerfile b/frameworks/Java/hserver/hserver.dockerfile
index 483485da30f..372cd10a98d 100644
--- a/frameworks/Java/hserver/hserver.dockerfile
+++ b/frameworks/Java/hserver/hserver.dockerfile
@@ -1,13 +1,13 @@
-FROM maven:3.6.3-openjdk-8-slim as maven
+FROM maven:3.8.4-openjdk-17-slim as maven
WORKDIR /hserver
COPY pom.xml pom.xml
COPY src src
RUN mvn package
-FROM openjdk:8u275-jdk-slim
+FROM openjdk:17.0.2
WORKDIR /hserver
COPY --from=maven /hserver/target/hserver-1.0.jar app.jar
EXPOSE 8888
-CMD ["java", "-jar", "app.jar"]
\ No newline at end of file
+CMD ["java", "-jar", "app.jar"]
diff --git a/frameworks/Java/hserver/pom.xml b/frameworks/Java/hserver/pom.xml
index b841cbd60ab..70d6e1b0c12 100644
--- a/frameworks/Java/hserver/pom.xml
+++ b/frameworks/Java/hserver/pom.xml
@@ -11,7 +11,7 @@
hserver-parent
cn.hserver
- 3.5.M2
+ 3.6.0
UTF-8
diff --git a/frameworks/Java/hserver/src/main/java/com/test/hserver/controller/TestController.java b/frameworks/Java/hserver/src/main/java/com/test/hserver/controller/TestController.java
index 9ab5d958039..c4bc3b4b0fb 100644
--- a/frameworks/Java/hserver/src/main/java/com/test/hserver/controller/TestController.java
+++ b/frameworks/Java/hserver/src/main/java/com/test/hserver/controller/TestController.java
@@ -3,11 +3,14 @@
import cn.hserver.core.ioc.annotation.Autowired;
import cn.hserver.plugin.web.annotation.Controller;
import cn.hserver.plugin.web.annotation.GET;
+import cn.hserver.plugin.web.interfaces.HttpRequest;
import cn.hserver.plugin.web.interfaces.HttpResponse;
import com.test.hserver.bean.Fortune;
import com.test.hserver.bean.Message;
import com.test.hserver.bean.World;
import com.test.hserver.util.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -59,8 +62,8 @@ public void db(HttpResponse response) throws SQLException {
}
@GET("/queries")
- public void queries(String queries,HttpResponse response) throws Exception {
- World[] result = new World[getQueries(queries)];
+ public void queries(HttpRequest request,HttpResponse response) throws Exception {
+ World[] result = new World[getQueries(request.query("queries"))];
try (Connection conn = dataSource.getConnection()) {
for (int i = 0; i < result.length; i++) {
try (final PreparedStatement statement = conn.prepareStatement(SELECT_WORLD)) {
@@ -78,8 +81,8 @@ public void queries(String queries,HttpResponse response) throws Exception {
@GET("/updates")
- public void updates(String queries,HttpResponse response) throws Exception {
- World[] result = new World[getQueries(queries)];
+ public void updates(HttpRequest request,HttpResponse response) throws Exception {
+ World[] result = new World[getQueries(request.query("queries"))];
StringJoiner updateSql = new StringJoiner(
", ",
"UPDATE world SET randomNumber = temp.randomNumber FROM (VALUES ",