Skip to content

Commit f6e99ff

Browse files
author
jj
committed
merge httpserver and httpserver-robaho into single project
1 parent 52b0aba commit f6e99ff

File tree

8 files changed

+143
-102
lines changed

8 files changed

+143
-102
lines changed

‎frameworks/Java/httpserver-robaho/benchmark_config.json‎

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,5 @@
11
{
22
"framework": "httpserver-robaho",
33
"tests": [
4-
{
5-
"default": {
6-
"json_url": "/json",
7-
"plaintext_url": "/plaintext",
8-
"port": 8080,
9-
"approach": "Realistic",
10-
"classification": "Platform",
11-
"database": "None",
12-
"framework": "None",
13-
"language": "Java",
14-
"flavor": "None",
15-
"orm": "Raw",
16-
"platform": "httpserver",
17-
"webserver": "None",
18-
"os": "Linux",
19-
"database_os": "Linux",
20-
"display_name": "httpserver-robaho",
21-
"notes": "",
22-
"versus": ""
23-
},
24-
"postgres": {
25-
"fortune_url": "/fortunes",
26-
"port": 8080,
27-
"approach": "Realistic",
28-
"classification": "Platform",
29-
"database": "Postgres",
30-
"framework": "None",
31-
"language": "Java",
32-
"flavor": "None",
33-
"orm": "Raw",
34-
"platform": "httpserver",
35-
"webserver": "None",
36-
"os": "Linux",
37-
"database_os": "Linux",
38-
"display_name": "httpserver-robaho-postgres",
39-
"notes": "",
40-
"versus": ""
41-
},
42-
"graalvm": {
43-
"json_url": "/json",
44-
"plaintext_url": "/plaintext",
45-
"port": 8080,
46-
"approach": "Realistic",
47-
"classification": "Platform",
48-
"database": "None",
49-
"framework": "None",
50-
"language": "Java",
51-
"flavor": "None",
52-
"orm": "Raw",
53-
"platform": "httpserver",
54-
"webserver": "None",
55-
"os": "Linux",
56-
"database_os": "Linux",
57-
"display_name": "httpserver-robaho-graalvm",
58-
"notes": "",
59-
"versus": "httpserver-robaho"
60-
}
61-
}
624
]
635
}

‎frameworks/Java/httpserver/benchmark_config.json‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,64 @@
5858
"notes": "",
5959
"versus": "httpserver"
6060
}
61+
},
62+
{
63+
"robaho": {
64+
"json_url": "/json",
65+
"plaintext_url": "/plaintext",
66+
"port": 8080,
67+
"approach": "Realistic",
68+
"classification": "Platform",
69+
"database": "None",
70+
"framework": "None",
71+
"language": "Java",
72+
"flavor": "None",
73+
"orm": "Raw",
74+
"platform": "httpserver",
75+
"webserver": "None",
76+
"os": "Linux",
77+
"database_os": "Linux",
78+
"display_name": "httpserver-robaho",
79+
"notes": "",
80+
"versus": ""
81+
},
82+
"robaho-postgres": {
83+
"fortune_url": "/fortunes",
84+
"port": 8080,
85+
"approach": "Realistic",
86+
"classification": "Platform",
87+
"database": "Postgres",
88+
"framework": "None",
89+
"language": "Java",
90+
"flavor": "None",
91+
"orm": "Raw",
92+
"platform": "httpserver",
93+
"webserver": "None",
94+
"os": "Linux",
95+
"database_os": "Linux",
96+
"display_name": "httpserver-robaho-postgres",
97+
"notes": "",
98+
"versus": ""
99+
},
100+
"robaho-graalvm": {
101+
"json_url": "/json",
102+
"plaintext_url": "/plaintext",
103+
"port": 8080,
104+
"approach": "Realistic",
105+
"classification": "Platform",
106+
"database": "None",
107+
"framework": "None",
108+
"language": "Java",
109+
"flavor": "None",
110+
"orm": "Raw",
111+
"platform": "httpserver",
112+
"webserver": "None",
113+
"os": "Linux",
114+
"database_os": "Linux",
115+
"display_name": "httpserver-robaho-graalvm",
116+
"notes": "",
117+
"versus": "httpserver-robaho"
118+
}
61119
}
62120
]
63121
}

‎frameworks/Java/httpserver/httpserver-robaho-graalvm.dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM jelastic/maven:3.9.9-openjdk-23.0.1-almalinux-9 as maven
2+
WORKDIR /httpserver-robaho
3+
COPY pom.xml pom.xml
4+
COPY src src
5+
RUN mvn compile assembly:single -q
6+
7+
FROM ghcr.io/graalvm/graalvm-community:24
8+
WORKDIR /httpserver-robaho
9+
COPY --from=maven /httpserver/target/httpserver-1.0-jar-with-dependencies.jar app.jar
10+
11+
EXPOSE 8080
12+
13+
CMD ["java", "-server", "-jar", "app.jar"]

‎frameworks/Java/httpserver/httpserver-robaho-postgres.dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM jelastic/maven:3.9.9-openjdk-23.0.1-almalinux-9 as maven
2+
WORKDIR /httpserver-robaho
3+
COPY pom.xml pom.xml
4+
COPY src src
5+
RUN mvn compile assembly:single -q
6+
7+
FROM openjdk:23-jdk-slim
8+
WORKDIR /httpserver-robaho
9+
COPY --from=maven /httpserver/target/httpserver-1.0-jar-with-dependencies.jar app.jar
10+
11+
EXPOSE 8080
12+
13+
CMD ["java", "-server", "-jar", "app.jar", "postgres"]

‎frameworks/Java/httpserver/httpserver-robaho.dockerfile‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM jelastic/maven:3.9.9-openjdk-23.0.1-almalinux-9 as maven
2+
WORKDIR /httpserver-robaho
3+
COPY pom.xml pom.xml
4+
COPY src src
5+
RUN mvn compile assembly:single -q
6+
7+
FROM openjdk:23-jdk-slim
8+
WORKDIR /httpserver-robaho
9+
COPY --from=maven /httpserver/target/httpserver-1.0-jar-with-dependencies.jar app.jar
10+
11+
EXPOSE 8080
12+
13+
CMD ["java", "-server", "-jar", "app.jar"]

‎frameworks/Java/httpserver/pom.xml‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33

44
<modelVersion>4.0.0</modelVersion>
55

@@ -16,14 +16,9 @@
1616

1717
<dependencies>
1818
<dependency>
19-
<groupId>com.fasterxml.jackson.core</groupId>
20-
<artifactId>jackson-databind</artifactId>
21-
<version>2.16.0</version>
22-
</dependency>
23-
<dependency>
24-
<groupId>com.fasterxml.jackson.module</groupId>
25-
<artifactId>jackson-module-afterburner</artifactId>
26-
<version>2.9.9</version>
19+
<groupId>com.googlecode.json-simple</groupId>
20+
<artifactId>json-simple</artifactId>
21+
<version>1.1.1</version>
2722
</dependency>
2823

2924
<dependency>
@@ -49,6 +44,21 @@
4944
<version>1.8.0-beta4</version>
5045
</dependency>
5146
</dependencies>
47+
<profiles>
48+
<profile>
49+
<id>robaho</id>
50+
<activation>
51+
<activeByDefault>false</activeByDefault>
52+
</activation>
53+
<dependencies>
54+
<dependency>
55+
<groupId>io.github.robaho</groupId>
56+
<artifactId>httpserver</artifactId>
57+
<version>1.0.23</version>
58+
</dependency>
59+
</dependencies>
60+
</profile>
61+
</profiles>
5262

5363
<build>
5464
<plugins>

‎frameworks/Java/httpserver/src/main/java/benchmarks/Message.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package benchmarks;
22

3-
public class Message {
3+
import java.io.IOException;
4+
import java.io.Writer;
5+
import java.util.Map;
46

5-
private final String message;
7+
import org.json.simple.JSONStreamAware;
8+
import org.json.simple.JSONValue;
69

7-
public Message(String message) {
8-
this.message = message;
9-
}
10+
public record Message(String message) implements JSONStreamAware {
1011

11-
public String getMessage() {
12-
return message;
12+
@Override
13+
public void writeJSONString(Writer out) throws IOException {
14+
JSONValue.writeJSONString(Map.of("message", message), out);
1315
}
14-
1516
}

‎frameworks/Java/httpserver/src/main/java/benchmarks/Server.java‎

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,28 @@
22

33
import java.io.ByteArrayOutputStream;
44
import java.io.IOException;
5+
import java.io.OutputStreamWriter;
56
import java.net.InetSocketAddress;
67
import java.sql.Connection;
78
import java.sql.PreparedStatement;
89
import java.sql.ResultSet;
910
import java.sql.SQLException;
1011
import java.text.ParseException;
11-
import java.util.*;
12+
import java.util.ArrayList;
13+
import java.util.Collections;
14+
import java.util.HashMap;
15+
import java.util.List;
16+
import java.util.Map;
17+
import java.util.Properties;
1218
import java.util.concurrent.Executors;
13-
import java.util.concurrent.SynchronousQueue;
14-
import java.util.concurrent.ThreadPoolExecutor;
15-
import java.util.concurrent.TimeUnit;
19+
1620
import javax.sql.DataSource;
17-
import com.fasterxml.jackson.databind.ObjectMapper;
18-
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
21+
1922
import com.sun.net.httpserver.HttpHandler;
2023
import com.sun.net.httpserver.HttpServer;
2124
import com.zaxxer.hikari.HikariConfig;
2225
import com.zaxxer.hikari.HikariDataSource;
26+
2327
import httl.Engine;
2428
import httl.Template;
2529

@@ -28,12 +32,7 @@ public class Server {
2832
private static final String HELLO_TEXT = "Hello, World!";
2933
private static final byte[] HELLO_BYTES = HELLO_TEXT.getBytes();
3034
private static final int HELLO_LENGTH = HELLO_BYTES.length;
31-
private static final String SERVER_NAME = "httpserver";
32-
private static final ObjectMapper MAPPER = new ObjectMapper();
33-
34-
static {
35-
MAPPER.registerModule(new AfterburnerModule());
36-
}
35+
private static final String SERVER_NAME = "httpserver-robaho";
3736

3837
private static List<Fortune> queryFortunes(DataSource ds) throws SQLException {
3938
List<Fortune> fortunes = new ArrayList<>();
@@ -72,27 +71,21 @@ private static HttpHandler createPlaintextHandler() {
7271
t.getResponseHeaders().add("Server", SERVER_NAME);
7372
t.sendResponseHeaders(200, HELLO_LENGTH);
7473
t.getResponseBody().write(HELLO_BYTES);
75-
t.getResponseBody().flush();
7674
t.getResponseBody().close();
7775
};
7876
}
7977

8078
private static HttpHandler createJSONHandler() {
8179
return t -> {
82-
// serialize message to JSON
83-
Message msg = new Message(HELLO_TEXT);
84-
byte[] bytes;
85-
try {
86-
bytes = MAPPER.writeValueAsBytes(msg);
87-
} catch (Exception e) {
88-
throw new RuntimeException(e);
89-
}
90-
// send response
80+
Message m = new Message(HELLO_TEXT);
9181
t.getResponseHeaders().add("Content-Type", "application/json");
9282
t.getResponseHeaders().add("Server", SERVER_NAME);
93-
t.sendResponseHeaders(200, bytes.length);
94-
t.getResponseBody().write(bytes);
95-
t.getResponseBody().flush();
83+
var bos = new ByteArrayOutputStream();
84+
OutputStreamWriter w = new OutputStreamWriter(bos);
85+
m.writeJSONString(w);
86+
w.flush();
87+
t.sendResponseHeaders(200, bos.size());
88+
bos.writeTo(t.getResponseBody());
9689
t.getResponseBody().close();
9790
};
9891
}
@@ -116,7 +109,6 @@ private static HttpHandler createFortunesHandler(DataSource ds) throws IOExcepti
116109
t.getResponseHeaders().add("Server", SERVER_NAME);
117110
t.sendResponseHeaders(200, bytes.length);
118111
t.getResponseBody().write(bytes);
119-
t.getResponseBody().flush();
120112
t.getResponseBody().close();
121113
} catch (SQLException | ParseException e) {
122114
throw new IOException(e);
@@ -133,7 +125,6 @@ public static void main(String[] args) throws Exception {
133125
// create server
134126
HttpServer server = HttpServer.create(new InetSocketAddress(port), 1024 * 8);
135127
server.setExecutor(Executors.newVirtualThreadPerTaskExecutor());
136-
// add context handlers
137128
server.createContext("/plaintext", createPlaintextHandler());
138129
server.createContext("/json", createJSONHandler());
139130
if (settings.contains("postgres")) {

0 commit comments

Comments
 (0)