[JAVA-28959] Upgrade to spring-resttemplate-2 module to Spring Boot 3 (#15775)

spring-web-modules/spring-resttemplate-2/pom.xml

@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -32,8 +32,8 @@
             <artifactId>spring-boot-starter-jetty</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient</artifactId>
+            <artifactId>httpclient5</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
@@ -55,6 +55,28 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <version>${rest-assured.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
     </dependencies>
 
+    <properties>
+        <start-class>com.baeldung.compress.SpringCompressRequestApplication</start-class>
+        <rest-assured.version>3.3.0</rest-assured.version>
+        <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+        <jetty.version>11.0.15</jetty.version>
+    </properties>
+
 </project>

spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/resttemplate/json/consumer/service/UserConsumerServiceImpl.java

@@ -5,7 +5,7 @@ import com.baeldung.resttemplate.json.model.User;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
@@ -64,7 +64,7 @@ public class UserConsumerServiceImpl implements UserConsumerService {
         User[] userArray = responseEntity.getBody();
         //we can get more info if we need :
         MediaType contentType = responseEntity.getHeaders().getContentType();
-        HttpStatus statusCode = responseEntity.getStatusCode();
+        HttpStatusCode statusCode = responseEntity.getStatusCode();
 
         return Arrays.stream(userArray)
           .flatMap(user -> user.getAddressList().stream())

spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectController.java

@@ -1,6 +1,6 @@
 package com.baeldung.sampleapp.web.controller.redirect;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;

spring-web-modules/spring-resttemplate-2/src/main/java/com/baeldung/sampleapp/web/controller/redirect/RedirectParamController.java

@@ -1,6 +1,6 @@
 package com.baeldung.sampleapp.web.controller.redirect;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/compress/MessageControllerUnitTest.java

@@ -6,7 +6,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;

spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/resttemplate/proxy/RestTemplateCustomizerLiveTest.java

@@ -6,13 +6,10 @@ import static org.junit.Assert.assertThat;
 
 import java.net.Proxy;
 
-import org.apache.http.HttpException;
+import org.apache.hc.client5.http.classic.HttpClient;
-import org.apache.http.HttpHost;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
-import org.apache.http.HttpRequest;
+import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
-import org.apache.http.client.HttpClient;
+import org.apache.hc.core5.http.HttpHost;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
-import org.apache.http.protocol.HttpContext;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -56,12 +53,7 @@ public class RestTemplateCustomizerLiveTest {
         public void customize(RestTemplate restTemplate) {
             HttpHost proxy = new HttpHost(PROXY_SERVER_HOST, PROXY_SERVER_PORT);
             HttpClient httpClient = HttpClientBuilder.create()
-                .setRoutePlanner(new DefaultProxyRoutePlanner(proxy) {
+                .setRoutePlanner(new DefaultProxyRoutePlanner(proxy))
-                    @Override
-                    public HttpHost determineProxy(HttpHost target, HttpRequest request, HttpContext context) throws HttpException {
-                        return super.determineProxy(target, request, context);
-                    }
-                })
                 .build();
             restTemplate.setRequestFactory(new HttpComponentsClientHttpRequestFactory(httpClient));
         }

spring-web-modules/spring-resttemplate-2/src/test/java/com/baeldung/web/controller/redirect/RedirectControllerIntegrationTest.java

@@ -55,7 +55,9 @@ public class RedirectControllerIntegrationTest {
 
     @Test
     public void whenRedirectOnUrlWithUsingRedirectView_thenStatusRedirectionAndRedirectedOnUrlAndAddedAttributeToFlashScope() throws Exception {
-        mockMvc.perform(get("/redirectWithRedirectView")).andExpect(status().is3xxRedirection()).andExpect(model().attribute("attribute", equalTo("redirectWithRedirectView"))).andExpect(redirectedUrl("redirectedUrl?attribute=redirectWithRedirectView"));
+        mockMvc.perform(get("/redirectWithRedirectView"))
+            .andExpect(status().is3xxRedirection())
+            .andExpect(redirectedUrl("redirectedUrl"));
     }
 
     @Test