Update images for ring-http-exchange httpserver

jj · jj · commit df6532cab73f · 2025-10-25T00:19:40.000+03:00
Also replace render type in majavat tests
diff --git a/frameworks/Clojure/kit/deps.edn b/frameworks/Clojure/kit/deps.edn
@@ -15,7 +15,7 @@
 
            ;; HTML templating
            selmer/selmer                    {:mvn/version "1.12.62"}
-           org.clojars.jj/majavat           {:mvn/version "1.12.1"}
+           org.clojars.jj/majavat           {:mvn/version "1.12.3"}
 
            ;; Database
            org.postgresql/postgresql        {:mvn/version "42.7.8"}
diff --git a/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/web/controllers/bench.clj b/frameworks/Clojure/kit/src/clj/io/github/kit_clj/te_bench/web/controllers/bench.clj
@@ -4,7 +4,7 @@
     [next.jdbc :as jdbc]
     [next.jdbc.result-set :as rs]
     [jj.majavat :as majavat]
-    [jj.majavat.renderer :refer [->InputStreamRenderer]]
+    [jj.majavat.renderer :refer [->StringRenderer]]
     [jj.majavat.renderer.sanitizer :refer [->Html]]
     [ring.util.http-response :as http-response]
     [selmer.parser :as parser]))
@@ -17,7 +17,7 @@
 (def ^:const MAX_ID_ZERO_IDX 9999)
 (def ^:const CACHE_TTL (* 24 60 60))
 (def ^:private render-fortune (majavat/build-renderer "html/fortunes.html"
-                                                      {:renderer (->InputStreamRenderer
+                                                      {:renderer (->StringRenderer
                                                                    {:sanitizer (->Html)})}))
 (def selmer-opts {:custom-resource-path (clojure.java.io/resource "html")})
 
diff --git a/frameworks/Clojure/ring-http-exchange/project.clj b/frameworks/Clojure/ring-http-exchange/project.clj
@@ -8,7 +8,7 @@
                  [org.clojure/tools.logging "1.3.0"]
                  [org.clojars.jj/ring-http-exchange "1.2.4"]
                  [seancorfield/next.jdbc "1.2.659"]
-                 [org.clojars.jj/majavat "1.12.1"]
+                 [org.clojars.jj/majavat "1.12.3"]
                  [hikari-cp "3.3.0"]
                  [org.postgresql/postgresql "42.7.8"]
                  [metosin/jsonista "0.3.13"]
diff --git a/frameworks/Clojure/ring-http-exchange/ring-http-exchange-graalvm.dockerfile b/frameworks/Clojure/ring-http-exchange/ring-http-exchange-graalvm.dockerfile
@@ -5,7 +5,7 @@ COPY resources resources
 COPY src src
 RUN lein uberjar
 
-FROM ghcr.io/graalvm/graalvm-community:24
+FROM ghcr.io/graalvm/graalvm-community:25
 WORKDIR /ring-http-exchange
 COPY --from=lein /ring-http-exchange/target/ring-http-server-1.0.0-standalone.jar app.jar
 
diff --git a/frameworks/Clojure/ring-http-exchange/ring-http-exchange-robaho-graalvm.dockerfile b/frameworks/Clojure/ring-http-exchange/ring-http-exchange-robaho-graalvm.dockerfile
@@ -5,7 +5,7 @@ COPY resources resources
 COPY src src
 RUN lein with-profile robaho uberjar
 
-FROM ghcr.io/graalvm/graalvm-community:24
+FROM ghcr.io/graalvm/graalvm-community:25
 WORKDIR /ring-http-exchange
 COPY --from=lein /ring-http-exchange/target/ring-http-server-1.0.0-standalone.jar app.jar
 
diff --git a/frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj b/frameworks/Clojure/ring-http-exchange/src/ring_http_exchange/benchmark.clj
@@ -3,7 +3,7 @@
   (:require
     [jsonista.core :as json]
     [jj.majavat :as majavat]
-    [jj.majavat.renderer :refer [->InputStreamRenderer]]
+    [jj.majavat.renderer :refer [->StringRenderer]]
     [jj.majavat.renderer.sanitizer :refer [->Html]]
     [ring-http-exchange.core :as server]
     [next.jdbc :as jdbc]
@@ -34,7 +34,7 @@
                                                      "Content-Type" "text/plain"}
                                            :body    "Hello, World!"})
 (def ^:private render-fortune (majavat/build-renderer "fortune.html"
-                                                      {:renderer (->InputStreamRenderer
+                                                      {:renderer (->StringRenderer
                                                                    {:sanitizer (->Html)})}))
 
 (defn -main
diff --git a/frameworks/Java/httpserver/httpserver-graalvm.dockerfile b/frameworks/Java/httpserver/httpserver-graalvm.dockerfile
@@ -1,10 +1,10 @@
-FROM maven:3-eclipse-temurin-24-alpine as maven
+FROM maven:3-eclipse-temurin-25-alpine as maven
 WORKDIR /httpserver
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile assembly:single -q
 
-FROM ghcr.io/graalvm/graalvm-community:24
+FROM ghcr.io/graalvm/graalvm-community:25
 WORKDIR /httpserver
 COPY --from=maven /httpserver/target/httpserver-1.0-jar-with-dependencies.jar app.jar
 
diff --git a/frameworks/Java/httpserver/httpserver-postgres.dockerfile b/frameworks/Java/httpserver/httpserver-postgres.dockerfile
@@ -1,4 +1,4 @@
-FROM maven:3-eclipse-temurin-24-alpine as maven
+FROM maven:3-eclipse-temurin-25-alpine as maven
 WORKDIR /httpserver
 COPY pom.xml pom.xml
 COPY src src
diff --git a/frameworks/Java/httpserver/httpserver-robaho-graalvm.dockerfile b/frameworks/Java/httpserver/httpserver-robaho-graalvm.dockerfile
@@ -1,10 +1,10 @@
-FROM jelastic/maven:3.9.9-openjdk-23.0.1-almalinux-9 as maven
+FROM maven:3-eclipse-temurin-25-alpine as maven
 WORKDIR /httpserver-robaho
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile -P robaho assembly:single -q
 
-FROM ghcr.io/graalvm/graalvm-community:24
+FROM ghcr.io/graalvm/graalvm-community:25
 WORKDIR /httpserver-robaho
 COPY --from=maven /httpserver-robaho/target/httpserver-1.0-jar-with-dependencies.jar app.jar
 
diff --git a/frameworks/Java/httpserver/httpserver-robaho-postgres.dockerfile b/frameworks/Java/httpserver/httpserver-robaho-postgres.dockerfile
@@ -1,10 +1,10 @@
-FROM jelastic/maven:3.9.9-openjdk-23.0.1-almalinux-9 as maven
+FROM maven:3-eclipse-temurin-25-alpine as maven
 WORKDIR /httpserver-robaho
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile -P robaho assembly:single -q
 
-FROM openjdk:23-jdk-slim
+FROM openjdk:25-jdk-slim
 WORKDIR /httpserver-robaho
 COPY --from=maven /httpserver-robaho/target/httpserver-1.0-jar-with-dependencies.jar app.jar
 
diff --git a/frameworks/Java/httpserver/httpserver-robaho.dockerfile b/frameworks/Java/httpserver/httpserver-robaho.dockerfile
@@ -1,10 +1,10 @@
-FROM jelastic/maven:3.9.9-openjdk-23.0.1-almalinux-9 as maven
+FROM maven:3-eclipse-temurin-25-alpine as maven
 WORKDIR /httpserver-robaho
 COPY pom.xml pom.xml
 COPY src src
 RUN mvn compile -P robaho assembly:single -q
 
-FROM openjdk:23-jdk-slim
+FROM openjdk:25-jdk-slim
 WORKDIR /httpserver-robaho
 COPY --from=maven /httpserver-robaho/target/httpserver-1.0-jar-with-dependencies.jar app.jar
 
diff --git a/frameworks/Java/httpserver/pom.xml b/frameworks/Java/httpserver/pom.xml
@@ -10,8 +10,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>25</maven.compiler.source>
+        <maven.compiler.target>25</maven.compiler.target>
     </properties>
 
     <dependencies>
diff --git a/frameworks/Java/httpserver/src/main/java/benchmarks/Fortune.java b/frameworks/Java/httpserver/src/main/java/benchmarks/Fortune.java
@@ -1,22 +1,6 @@
 package benchmarks;
 
-public class Fortune implements Comparable<Fortune> {
-
-    private final int id;
-    private final String message;
-
-    public Fortune(int id, String message) {
-        this.id = id;
-        this.message = message;
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public String getMessage() {
-        return message;
-    }
+public record Fortune(int id, String message) implements Comparable<Fortune> {
 
     @Override
     public int compareTo(Fortune other) {
diff --git a/frameworks/Java/httpserver/src/main/java/benchmarks/Server.java b/frameworks/Java/httpserver/src/main/java/benchmarks/Server.java
@@ -61,14 +61,14 @@ private static DataSource createPostgresDataSource() throws ClassNotFoundExcepti
         return new HikariDataSource(config);
     }
 
-    private static Template loadTemplate(String filename) throws IOException, ParseException {
+    private static Template loadTemplate() throws IOException, ParseException {
         Properties props = new Properties();
         props.put("import.packages", "java.util," + Fortune.class.getPackage().getName());
         props.put("input.encoding", "UTF-8");
         props.put("output.encoding", "UTF-8");
         props.put("precompiled", "false");
         Engine engine = Engine.getEngine(props);
-        return engine.getTemplate(filename);
+        return engine.getTemplate("/fortunes.template.httl");
     }
 
     private static HttpHandler createPlaintextHandler() {
@@ -102,7 +102,7 @@ private static HttpHandler createJSONHandler() {
     }
 
     private static HttpHandler createFortunesHandler(DataSource ds) throws IOException, ParseException {
-        Template template = loadTemplate("/fortunes.template.httl");
+        Template template = loadTemplate();
         return t -> {
             try {
                 // query db
@@ -127,7 +127,7 @@ private static HttpHandler createFortunesHandler(DataSource ds) throws IOExcepti
         };
     }
 
-    public static void main(String[] args) throws Exception {
+    static void main(String[] args) throws Exception {
         // parse arguments
         String settings = args.length > 0 ? args[0] : "";
         int port = args.length > 1 ? Integer.parseInt(args[1]) : 8080;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM maven:3-eclipse-temurin-24-alpine as maven`
	`1`	`+FROM maven:3-eclipse-temurin-25-alpine as maven`
`2`	`2`	`WORKDIR /httpserver`
`3`	`3`	`COPY pom.xml pom.xml`
`4`	`4`	`COPY src src`