Switch vanilla-jpa sample to Spring MVC

Author: sdeleuze

spring-graalvm-native-samples/vanilla-jpa/compile.sh

@@ -29,6 +29,9 @@ echo "Compiling $ARTIFACT with $GRAALVM_VERSION"
 { time native-image \
   --verbose \
   -H:+RemoveSaturatedTypeFlows \
+  -Dspring.native.remove-yaml-support=true \
+  -Dspring.native.remove-jmx-support=true \
+  -Dspring.native.remove-spel-support=true \
   -H:Name=$ARTIFACT \
   -cp $CP $MAINCLASS >> output.txt ; } 2>> output.txt
 

spring-graalvm-native-samples/vanilla-jpa/pom.xml

@@ -50,21 +50,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webflux</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>jakarta.validation</groupId>
-					<artifactId>jakarta.validation-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-validation</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.hibernate.validator</groupId>
-					<artifactId>hibernate-validator</artifactId>
-				</exclusion>
-			</exclusions>
+			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -76,6 +62,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>

spring-graalvm-native-samples/vanilla-jpa/src/main/java/app/main/SampleApplication.java

@@ -4,20 +4,19 @@
 
 import app.main.model.Foo;
 import app.main.model.FooRepository;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.web.SpringDataWebAutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.web.reactive.function.server.RouterFunction;
+import org.springframework.web.servlet.function.RouterFunction;
 
-import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
-import static org.springframework.web.reactive.function.server.RouterFunctions.route;
-import static org.springframework.web.reactive.function.server.ServerResponse.ok;
+import static org.springframework.web.servlet.function.RequestPredicates.GET;
+import static org.springframework.web.servlet.function.RouterFunctions.route;
+import static org.springframework.web.servlet.function.ServerResponse.ok;
 
-@SpringBootApplication(proxyBeanMethods = false)
+@SpringBootApplication(proxyBeanMethods = false, exclude = SpringDataWebAutoConfiguration.class)
 public class SampleApplication {
 
 	private FooRepository entities;
@@ -28,37 +27,21 @@ public SampleApplication(FooRepository entities) {
 
 	@Bean
 	public CommandLineRunner runner() {
-		System.err.println("+++++++++++");
 		return args -> {
-			try {
-				System.err.println("****");
 				Optional<Foo> foo = entities.findById(1L);
-				System.err.println("****: " + foo);
 				if (!foo.isPresent()) {
 					entities.save(new Foo("Hello"));
 				}
-			}
-			catch (Exception e) {
-				e.printStackTrace();
-			}
 		};
 	}
 
 	@Bean
 	public RouterFunction<?> userEndpoints() {
-		return route(GET("/"), request -> ok().body(
-				Mono.fromCallable(this::findOne).log().subscribeOn(Schedulers.elastic()),
-				Foo.class));
+		return route(GET("/"), request -> ok().body(findOne()));
 	}
 
 	private Foo findOne() {
-		try {
-			return entities.findById(1L).get();
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-			throw e;
-		}
+		return entities.findById(1L).get();
 	}
 
 	public static void main(String[] args) {

spring-graalvm-native-samples/vanilla-jpa/src/main/resources/application.properties

@@ -1,3 +1,3 @@
-logging.level.root=debug
+#logging.level.root=debug
 #spring.jpa.show-sql=true
 #spring.data.jpa.repositories.bootstrap-mode=lazy

spring-graalvm-native-samples/vanilla-jpa/src/test/java/app/main/SampleApplicationTests.java

@@ -16,34 +16,22 @@
 
 package app.main;
 
-import org.junit.Before;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.reactive.server.WebTestClient;
-import org.springframework.web.server.WebHandler;
 
 /**
  * @author Dave Syer
  *
  */
-@SpringBootTest
-@AutoConfigureWebTestClient
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class SampleApplicationTests {
 
-	@Autowired
-	private WebHandler webHandler;
-
 	@Autowired
 	private WebTestClient client;
 
-	@Before
-	public void init() {
-		client = WebTestClient.bindToWebHandler(webHandler).build();
-	}
-
 	@Test
 	public void test() {
 		client.get().uri("/").exchange().expectBody(String.class).isEqualTo("{\"value\":\"Hello\"}");