Add Spring Boot 4.0.0-M2 support #3062

Author: bnasslahsen

pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>4.0.0-M1</version>
+		<version>4.0.0-M2</version>
 	</parent>
 
 	<licenses>
@@ -104,6 +104,11 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-jackson</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

springdoc-openapi-starter-common/src/main/java/org/springdoc/core/providers/SpringDocJavadocProvider.java

@@ -28,7 +28,11 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import com.github.therapi.runtimejavadoc.ClassJavadoc;

springdoc-openapi-starter-webflux-api/pom.xml

@@ -29,11 +29,7 @@
 			<optional>true</optional>
 		</dependency>
 		<!-- Test dependencies -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-jackson</artifactId>
-			<scope>test</scope>
-		</dependency>
+
 	</dependencies>
 	<build>
 		<plugins>

springdoc-openapi-starter-webflux-ui/pom.xml

@@ -34,11 +34,6 @@
 			<artifactId>spring-boot-reactor-netty</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-jackson</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

springdoc-openapi-starter-webmvc-api/pom.xml

@@ -22,28 +22,23 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-web-server</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>jakarta.servlet</groupId>
+			<artifactId>jakarta.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<!-- Actuator dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-actuator-autoconfigure</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>jakarta.servlet</groupId>
-			<artifactId>jakarta.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
 		<!-- Test dependencies -->
 		<dependency>
 			<groupId>javax.money</groupId>
 			<artifactId>money-api</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-jackson</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

springdoc-openapi-starter-webmvc-ui/pom.xml

@@ -34,11 +34,6 @@
 			<artifactId>spring-boot-actuator-autoconfigure</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-restclient</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-tomcat</artifactId>

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/AbstractSpringDocActuatorTest.java

@@ -25,26 +25,30 @@
 package test.org.springdoc.ui;
 
 
+import java.net.http.HttpClient;
+
 import jakarta.annotation.PostConstruct;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.restclient.RestTemplateBuilder;
 import org.springframework.boot.web.server.test.LocalManagementPort;
-import org.springframework.web.client.RestTemplate;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
+import org.springframework.web.client.RestClient;
 
 public abstract class AbstractSpringDocActuatorTest extends AbstractCommonTest {
 
-	protected RestTemplate actuatorRestTemplate;
+	protected RestClient actuatorClient;
 
 	@LocalManagementPort
 	private int managementPort;
 
-	@Autowired
-	private RestTemplateBuilder restTemplateBuilder;
-
 	@PostConstruct
 	void init() {
-		actuatorRestTemplate = restTemplateBuilder
-				.rootUri("http://localhost:" + this.managementPort).build();
+		HttpClient jdkClient = HttpClient.newBuilder()
+				.followRedirects(HttpClient.Redirect.NORMAL) 
+				.build();
+		this.actuatorClient = RestClient.builder()
+				.requestFactory(new JdkClientHttpRequestFactory(jdkClient))
+				.baseUrl("http://localhost:" + managementPort)
+				.build();
 	}
+	
 }

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app13/SpringDocApp13Test.java

@@ -45,13 +45,19 @@ void testIndex() throws Exception {
 
 	@Test
 	void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);
+		String contentAsString = actuatorClient.get()
+				.uri("/application/swagger-ui")
+				.retrieve()
+				.body(String.class);
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui/swagger-config", String.class);
+		String contentAsString = actuatorClient.get()
+				.uri("/application/swagger-ui/swagger-config")
+				.retrieve()
+				.body(String.class);
 		String expected = getContent("results/app13-1.json");
 		assertEquals(expected, contentAsString, true);
 	}

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app14/SpringDocApp14Test.java

@@ -42,18 +42,26 @@ void testIndex() throws Exception {
 		String contentAsString = mvcResult.getResponse().getContentAsString();
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
-
 	@Test
 	void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui", String.class);
+		String contentAsString = actuatorClient.get()
+				.uri("/application/swagger-ui")
+				.retrieve()
+				.body(String.class);
+
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/application/swagger-ui/swagger-config", String.class);
+		String contentAsString = actuatorClient.get()
+				.uri("/application/swagger-ui/swagger-config")
+				.retrieve()
+				.body(String.class);
+
 		String expected = getContent("results/app14-1.json");
-		assertEquals(expected, contentAsString, true);
+
+		assertEquals(expected, contentAsString, true); // true = strict comparison
 	}
 
 	@SpringBootApplication

springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app15/SpringDocApp15Test.java

@@ -46,16 +46,26 @@ void testIndex() throws Exception {
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
+
 	@Test
 	void testIndexActuator() {
-		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui", String.class);
+		String contentAsString = actuatorClient.get()
+				.uri("/test/application/swagger-ui")
+				.retrieve()
+				.body(String.class);
+
 		assertTrue(contentAsString.contains("Swagger UI"));
 	}
 
 	@Test
 	void testIndexSwaggerConfig() throws Exception {
-		String contentAsString = actuatorRestTemplate.getForObject("/test/application/swagger-ui/swagger-config", String.class);
+		String contentAsString = actuatorClient.get()
+				.uri("/test/application/swagger-ui/swagger-config")
+				.retrieve()
+				.body(String.class);
+
 		String expected = getContent("results/app15-1.json");
+
 		assertEquals(expected, contentAsString, true);
 	}