root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

MockHttpServletRequest preserves original Accept-Language header value 

Issue: SPR-17566
This commit is contained in:
Juergen Hoeller 2018-12-04 22:07:43 +01:00
parent d3cdecc621
commit 9efea7eb73
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
View File

@ -1013,12 +1013,14 @@ public class MockHttpServletRequest implements HttpServletRequest {
try { try {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString()); headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString());
setPreferredLocales(headers.getAcceptLanguageAsLocales()); List<Locale> locales = headers.getAcceptLanguageAsLocales();
this.locales.clear();
this.locales.addAll(locales);
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
// Invalid Accept-Language format -> store plain header instead // Invalid Accept-Language format -> just store plain header
doAddHeaderValue(name, value, true);
} }
doAddHeaderValue(name, value, true);
} }
else { else {
doAddHeaderValue(name, value, false); doAddHeaderValue(name, value, false);

1
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletRequestTests.java
View File

@ -341,6 +341,7 @@ public class MockHttpServletRequestTests {
List<Locale> actual = Collections.list(request.getLocales()); List<Locale> actual = Collections.list(request.getLocales());
assertEquals(Arrays.asList(Locale.forLanguageTag("fr-ch"), Locale.forLanguageTag("fr"), assertEquals(Arrays.asList(Locale.forLanguageTag("fr-ch"), Locale.forLanguageTag("fr"),
Locale.forLanguageTag("en"), Locale.forLanguageTag("de")), actual); Locale.forLanguageTag("en"), Locale.forLanguageTag("de")), actual);
assertEquals(headerValue, request.getHeader("Accept-Language"));
} }
@Test @Test

8
spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletRequest.java
View File

@ -1013,12 +1013,14 @@ public class MockHttpServletRequest implements HttpServletRequest {
try { try {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString()); headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString());
setPreferredLocales(headers.getAcceptLanguageAsLocales()); List<Locale> locales = headers.getAcceptLanguageAsLocales();
this.locales.clear();
this.locales.addAll(locales);
} }
catch (IllegalArgumentException ex) { catch (IllegalArgumentException ex) {
// Invalid Accept-Language format -> store plain header instead // Invalid Accept-Language format -> just store plain header
doAddHeaderValue(name, value, true);
} }
doAddHeaderValue(name, value, true);
} }
else { else {
doAddHeaderValue(name, value, false); doAddHeaderValue(name, value, false);