Cleanup and upgrade of the Spring implementations to Spring Boot 3.3 (#9167)

* Upgrade spring test to Spring Boot 3.3.1

This commit also introduces several refinements:
- Upgrade to Java 21 with Liberica JRE
- Make Message a top level class
- Properly exclude autoconfigurations based on profiles
- Use Spring Boot 3.3 executable JAR unpack feature
- Remove java options enabled by default
- Keep debug symbol in JVM bytecode for parameter name resolution

* Upgrade spring-webflux test to Spring Boot 3.3.1

This commit also introduces several refinements
- Reactivate the test
- Remove unmaintained variants to keep only r2dbc and mongo
- Upgrade to Spring Boot 3.3.1
- Upgrade to Java 21 with Liberica JRE
- Dependency cleanup
- Various related updates
- Add JSON and textplain endpoints
- Properly exclude autoconfigurations based on profiles
- Use Spring Boot 3.3 executable JAR unpack feature
- Add -Dreactor.netty.http.server.lastFlushWhenNoRead=true property
- Keep debug symbol in JVM bytecode for parameter name resolution

Author: sdeleuze

frameworks/Java/spring-webflux/README.md

@@ -37,15 +37,6 @@ For mongoDB access, spring-data-mongodb with reactive support is used. See [Mong
 
 * [Template rendering test source](src/main/java/benchmark/web/WebfluxRouter.java)
 
-## Versions
-
-* [Java OpenJDK 10](http://openjdk.java.net/)
-* [Spring boot 2.1.0.RELEASE](https://spring.io/projects/spring-boot)
-* [Spring data mongodb 2.1.0.RELEASE](https://projects.spring.io/spring-data-mongodb/)
-* [reactive-pg-client 0.10.6](https://github.com/reactiverse/reactive-pg-client)
-* [rxjava2-jdbc 0.2.0](https://github.com/davidmoten/rxjava2-jdbc)
-* [r2dbc-postgresql 1.0.0.BUILD-SNAPSHOT](https://github.com/r2dbc/r2dbc-postgresql)
-
 ## Test URLs
 
 ### Plaintext Test

frameworks/Java/spring-webflux/benchmark_config.json

@@ -2,9 +2,11 @@
   "framework": "spring-webflux",
   "tests": [{
     "default": {
+      "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
       "fortune_url": "/fortunes",
+      "plaintext_url": "/plaintext",
       "update_url": "/updates?queries=",
       "port": 8080,
       "approach": "Realistic",
@@ -23,9 +25,11 @@
       "versus": "spring"
     },
     "mongo": {
+      "json_url": "/json",
       "db_url": "/db",
       "query_url": "/queries?queries=",
       "fortune_url": "/fortunes",
+      "plaintext_url": "/plaintext",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
@@ -41,69 +45,6 @@
       "display_name": "spring-webflux-mongo",
       "notes": "",
       "versus": "spring"
-    },
-    "pgclient": {
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "spring",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Micro",
-      "platform": "Netty",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "spring-webflux-pgclient",
-      "notes": "",
-      "versus": "spring"
-    },
-    "rxjdbc": {
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "spring",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Micro",
-      "platform": "Netty",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "spring-webflux-rxjdbc",
-      "notes": "",
-      "versus": "spring"
-    },
-    "jdbc": {
-      "db_url": "/db",
-      "query_url": "/queries?queries=",
-      "fortune_url": "/fortunes",
-      "update_url": "/updates?queries=",
-      "port": 8080,
-      "approach": "Realistic",
-      "classification": "Fullstack",
-      "database": "Postgres",
-      "framework": "spring",
-      "language": "Java",
-      "flavor": "None",
-      "orm": "Micro",
-      "platform": "Netty",
-      "webserver": "None",
-      "os": "Linux",
-      "database_os": "Linux",
-      "display_name": "spring-webflux-jdbc",
-      "notes": "",
-      "versus": "spring"
     }
   }]
 }

frameworks/Java/spring-webflux/config.toml

@@ -16,36 +16,6 @@ platform = "Netty"
 webserver = "None"
 versus = "spring"
 
-[pgclient]
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Fullstack"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Netty"
-webserver = "None"
-versus = "spring"
-
-[jdbc]
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Fullstack"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Netty"
-webserver = "None"
-versus = "spring"
-
 [mongo]
 urls.db = "/db"
 urls.query = "/queries?queries="
@@ -59,18 +29,3 @@ orm = "Full"
 platform = "Netty"
 webserver = "None"
 versus = "spring"
-
-[rxjdbc]
-urls.db = "/db"
-urls.query = "/queries?queries="
-urls.update = "/updates?queries="
-urls.fortune = "/fortunes"
-approach = "Realistic"
-classification = "Fullstack"
-database = "Postgres"
-database_os = "Linux"
-os = "Linux"
-orm = "Micro"
-platform = "Netty"
-webserver = "None"
-versus = "spring"

frameworks/Java/spring-webflux/pom.xml

@@ -8,19 +8,18 @@
 
     <groupId>benchmark</groupId>
     <artifactId>spring-webflux-benchmark</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.0-SNAPSHOT</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1</version>
     </parent>
 
     <properties>
-        <java.version>17</java.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <pgclient.version>0.11.4</pgclient.version>
-        <rxjava2-jdbc.version>0.2.14</rxjava2-jdbc.version>
     </properties>
 
     <dependencies>
@@ -30,7 +29,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jdbc</artifactId>
+            <artifactId>spring-boot-starter-data-r2dbc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>r2dbc-postgresql</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -40,38 +43,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb-reactive</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.reactiverse</groupId>
-            <artifactId>reactive-pg-client</artifactId>
-            <version>${pgclient.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.github.davidmoten</groupId>
-            <artifactId>rxjava2-jdbc</artifactId>
-            <version>${rxjava2-jdbc.version}</version>
-        </dependency>
-
-		<dependency>
-		    <groupId>org.postgresql</groupId>
-		    <artifactId>r2dbc-postgresql</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-pool</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-r2dbc</artifactId>
-        </dependency>
-        <dependency>
-        	<groupId>org.springframework.boot</groupId>
-        	<artifactId>spring-boot-configuration-processor</artifactId>
-        	<optional>true</optional>
-        </dependency>
     </dependencies>
 
     <build>
@@ -84,9 +55,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <debug>false</debug>
-                </configuration>
             </plugin>
         </plugins>
     </build>

frameworks/Java/spring-webflux/spring-webflux-jdbc.dockerfile

@@ -1,13 +1,16 @@
-FROM maven:3.9.6-eclipse-temurin-21 as maven
+FROM maven:3.9.5-eclipse-temurin-21 as maven
 WORKDIR /spring
 COPY src src
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM eclipse-temurin:21.0.3_9-jre-jammy
+FROM bellsoft/liberica-openjre-debian:21
 WORKDIR /spring
 COPY --from=maven /spring/target/spring-webflux-benchmark.jar app.jar
+# See https://docs.spring.io/spring-boot/reference/packaging/efficient.html
+RUN java -Djarmode=tools -jar app.jar extract
+
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-Dlogging.level.root=OFF", "-jar", "app.jar", "--spring.profiles.active=mongo"]
+CMD ["java", "-Dlogging.level.root=OFF", "-Dreactor.netty.http.server.lastFlushWhenNoRead=true", "-jar", "app/app.jar", "--spring.profiles.active=mongo"]

frameworks/Java/spring-webflux/spring-webflux-mongo.dockerfile

@@ -1,13 +1,15 @@
-FROM maven:3.9.6-eclipse-temurin-21 as maven
+FROM maven:3.9.5-eclipse-temurin-21 as maven
 WORKDIR /spring
 COPY src src
 COPY pom.xml pom.xml
 RUN mvn package -q
 
-FROM eclipse-temurin:21.0.3_9-jre-jammy
+FROM bellsoft/liberica-openjre-debian:21
 WORKDIR /spring
 COPY --from=maven /spring/target/spring-webflux-benchmark.jar app.jar
+# See https://docs.spring.io/spring-boot/reference/packaging/efficient.html
+RUN java -Djarmode=tools -jar app.jar extract
 
 EXPOSE 8080
 
-CMD ["java", "-server", "-XX:+UseNUMA", "-Dlogging.level.root=OFF", "-jar", "app.jar", "--spring.profiles.active=r2dbc,postgres"]
+CMD ["java", "-Dlogging.level.root=OFF", "-Dreactor.netty.http.server.lastFlushWhenNoRead=true", "-jar", "app/app.jar", "--spring.profiles.active=r2dbc"]

frameworks/Java/spring-webflux/spring-webflux-pgclient.dockerfile

@@ -1,52 +1,15 @@
 package benchmark;
 
-import java.util.concurrent.Executors;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.boot.web.reactive.result.view.MustacheViewResolver;
-import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.web.reactive.config.EnableWebFlux;
-import org.springframework.web.reactive.config.ViewResolverRegistry;
-import org.springframework.web.reactive.config.WebFluxConfigurer;
-
-import reactor.core.scheduler.Scheduler;
-import reactor.core.scheduler.Schedulers;
 
 @SpringBootApplication
-@EnableWebFlux
 @EnableScheduling
-@EnableConfigurationProperties
-public class App implements WebFluxConfigurer {
-
-    @Autowired
-    private MustacheViewResolver mustacheViewResolver;
+public class App  {
 
     public static void main(String[] args) {
         SpringApplication.run(App.class, args);
     }
 
-    @Bean
-    ServerFilter serverFilter() {
-        return new ServerFilter();
-    }
-
-    @Bean
-    DateHandler dateHandler() {
-        return new DateHandler();
-    }
-
-    @Bean
-    Scheduler ioScheduler() {
-        return Schedulers.fromExecutor(Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 2));
-    }
-
-    @Override
-    public void configureViewResolvers(ViewResolverRegistry registry) {
-        registry.viewResolver(mustacheViewResolver);
-    }
-
 }