From 2a16dc158c5efdfbd9e1b6ce5a7e76ec7aea8b11 Mon Sep 17 00:00:00 2001
From: sam-gardner <53271849+sam-gardner@users.noreply.github.com>
Date: Fri, 15 Mar 2024 07:45:46 +0000
Subject: [PATCH] [JAVA-28828] Fix spring-boot-3-2 build and integration tests
 (#16038)

---
 spring-boot-modules/pom.xml                                | 2 +-
 spring-boot-modules/spring-boot-3-2/pom.xml                | 7 ++++++-
 .../com/baeldung/restclient/RestClientIntegrationTest.java | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index 4504aff083..8087c2cd6b 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -97,7 +97,7 @@
         <module>spring-boot-3-observation</module>
         <module>spring-boot-3-test-pitfalls</module>
         <module>spring-boot-3-testcontainers</module>
-        <!-- <module>spring-boot-3-2</module>--> <!-- JAVA-28828 -->
+        <module>spring-boot-3-2</module>
         <module>spring-boot-resilience4j</module>
         <module>spring-boot-properties</module>
         <module>spring-boot-properties-2</module>
diff --git a/spring-boot-modules/spring-boot-3-2/pom.xml b/spring-boot-modules/spring-boot-3-2/pom.xml
index 29ad9898fb..29d9332ca5 100644
--- a/spring-boot-modules/spring-boot-3-2/pom.xml
+++ b/spring-boot-modules/spring-boot-3-2/pom.xml
@@ -196,6 +196,11 @@
             <groupId>io.zipkin.reporter2</groupId>
             <artifactId>zipkin-sender-urlconnection</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.swagger.core.v3</groupId>
+            <artifactId>swagger-core</artifactId>
+            <version>2.2.20</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>
@@ -290,7 +295,7 @@
     <properties>
         <start-class>com.baeldung.restclient.RestClientApplication</start-class>
         <mapstruct.version>1.6.0.Beta1</mapstruct.version>
-        <springdoc.version>2.0.0</springdoc.version>
+        <springdoc.version>2.3.0</springdoc.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <mockserver.version>5.14.0</mockserver.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
diff --git a/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java b/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java
index 3e12215bcb..5650d2dd22 100644
--- a/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java
+++ b/spring-boot-modules/spring-boot-3-2/src/test/java/com/baeldung/restclient/RestClientIntegrationTest.java
@@ -15,12 +15,14 @@ import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.web.client.RestClient;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+@TestPropertySource(locations="classpath:connectiondetails/application-r2dbc.properties")
 public class RestClientIntegrationTest {
 
 	@LocalServerPort
@@ -110,7 +112,7 @@ public class RestClientIntegrationTest {
 						.uri(uriBase + "/articles/1234")
 						.retrieve()
 						.onStatus(status -> status.value() == 404, (request, response) -> { throw new ArticleNotFoundException(); })
-						.body(new ParameterizedTypeReference<>() {});
+						.body(new ParameterizedTypeReference<String>() {});
 		}).isInstanceOf(ArticleNotFoundException.class);
 	}