JAVA-31602 :- Upgrade spring-boot-mvc-2, spring-boot-mvc-5 to boot 3.2.2 (#16188)

* JAVA-31602 :- Upgrade spring-boot-mvc-2, spring-boot-mvc-5 to boot 3.2.2

* JAVA-31602 :- Upgrade spring-boot-mvc-2, spring-boot-mvc-5 to boot 3.2.2

* Revert parent pom to restrict build

* JAVA-31602 :- Upgrade spring-boot-mvc-2, spring-boot-mvc-5 to boot 3.2.2

* Fix version error

* JAVA-31602 :- Upgrade spring-boot-mvc-2, spring-boot-mvc-5 to boot 3.2.2

* Fix version error

* JAVA-31602 :- Upgrade spring-boot-mvc-2, spring-boot-mvc-5 to boot 3.2.2

* Fix version error

* Fix version error

* Enable in Parent POM

* Fix haslength approach

---------

Co-authored-by: Amit Pandey <amitpandey@cloud.upwork.com>
This commit is contained in:
Amit Pandey
2024-03-23 17:19:34 +05:30
committed by GitHub
parent 9cc307e108
commit 8bd2ca6893
10 changed files with 34 additions and 26 deletions
@@ -65,22 +65,17 @@
<layout>JAR</layout>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
</plugins>
</build>
<properties>
<spring-boot.version>3.2.2</spring-boot.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<spring.fox.version>3.0.0</spring.fox.version>
<start-class>com.baeldung.springboot.swagger.ArticleApplication</start-class>
<spring-cloud.version>2021.0.5</spring-cloud.version>
<spring-cloud.version>2023.0.0</spring-cloud.version>
<commons-configuration.version>1.10</commons-configuration.version>
<maven.compiler.release>17</maven.compiler.release>
</properties>
</project>
@@ -5,6 +5,9 @@ import jakarta.servlet.ServletInputStream;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.*;
import java.util.Collections;
import java.util.Enumeration;
import org.springframework.http.HttpHeaders;
public class EscapeHtmlRequestWrapper extends HttpServletRequestWrapper {
private String body = null;
@@ -64,4 +67,12 @@ public class EscapeHtmlRequestWrapper extends HttpServletRequestWrapper {
public BufferedReader getReader() throws IOException {
return new BufferedReader(new InputStreamReader(this.getInputStream()));
}
@Override
public Enumeration<String> getHeaders(String name) {
if(HttpHeaders.CONTENT_LENGTH.equals(name)) {
return Collections.enumeration(Collections.singletonList(String.valueOf(body.length())));
}
return super.getHeaders(name);
}
}
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -45,6 +46,7 @@ public class EscapeHtmlAspectIntegrationTest {
mockMvc.perform(MockMvcRequestBuilders.post(URI.create("/save"))
.contentType(MediaType.APPLICATION_JSON)
.header(HttpHeaders.CONTENT_LENGTH, 100)
.content(objectMapper.writeValueAsString(requestBody)))
.andExpect(MockMvcResultMatchers.status()
.isCreated())
@@ -1,5 +1,6 @@
package com.baeldung.modifyrequest;
import com.baeldung.modifyrequest.config.WebMvcConfiguration;
import com.baeldung.modifyrequest.controller.UserController;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test;
@@ -9,6 +10,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -21,7 +23,7 @@ import java.util.Map;
@ExtendWith(SpringExtension.class)
@AutoConfigureMockMvc
@WebMvcTest(UserController.class)
@WebMvcTest(value ={UserController.class, WebMvcConfiguration.class})
@ActiveProfiles("filterExample")
public class EscapeHtmlFilterIntegrationTest {
Logger logger = LoggerFactory.getLogger(EscapeHtmlFilterIntegrationTest.class);
@@ -44,6 +46,7 @@ public class EscapeHtmlFilterIntegrationTest {
mockMvc.perform(MockMvcRequestBuilders.post(URI.create("/save"))
.contentType(MediaType.APPLICATION_JSON)
.header(HttpHeaders.CONTENT_LENGTH, "100")
.content(objectMapper.writeValueAsString(requestBody))).andExpect(MockMvcResultMatchers.status()
.isCreated()).andExpect(MockMvcResultMatchers.content()
.json(objectMapper.writeValueAsString(expectedResponseBody)));