From 6df1a7874a50a3149278dd9fa4c0fba8c7bd85b6 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Tue, 19 Dec 2017 13:56:16 -0500 Subject: [PATCH] MockHttpServletResponse uses correct language header Issue: SPR-16311 --- .../mock/web/MockHttpServletResponse.java | 10 +++++----- .../mock/web/test/MockHttpServletResponse.java | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java index 5433cee745..75720f2e3a 100644 --- a/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java +++ b/spring-test/src/main/java/org/springframework/mock/web/MockHttpServletResponse.java @@ -311,7 +311,7 @@ public class MockHttpServletResponse implements HttpServletResponse { @Override public void setLocale(Locale locale) { this.locale = locale; - doAddHeaderValue(HttpHeaders.ACCEPT_LANGUAGE, locale.toLanguageTag(), true); + doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, locale.toLanguageTag(), true); } @Override @@ -591,11 +591,11 @@ public class MockHttpServletResponse implements HttpServletResponse { Integer.parseInt(value.toString())); return true; } - else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(name)) { + else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) { HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString()); - List locales = headers.getAcceptLanguageAsLocales(); - this.locale = (!locales.isEmpty() ? locales.get(0) : Locale.getDefault()); + headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString()); + Locale language = headers.getContentLanguage(); + this.locale = language != null ? language : Locale.getDefault(); return true; } else { diff --git a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java index c79dad7a3c..0f555dfb67 100644 --- a/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java +++ b/spring-web/src/test/java/org/springframework/mock/web/test/MockHttpServletResponse.java @@ -303,7 +303,7 @@ public class MockHttpServletResponse implements HttpServletResponse { @Override public void setLocale(Locale locale) { this.locale = locale; - doAddHeaderValue(HttpHeaders.ACCEPT_LANGUAGE, locale.toLanguageTag(), true); + doAddHeaderValue(HttpHeaders.CONTENT_LANGUAGE, locale.toLanguageTag(), true); } @Override @@ -579,11 +579,11 @@ public class MockHttpServletResponse implements HttpServletResponse { Integer.parseInt(value.toString())); return true; } - else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(name)) { + else if (HttpHeaders.CONTENT_LANGUAGE.equalsIgnoreCase(name)) { HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.ACCEPT_LANGUAGE, value.toString()); - List locales = headers.getAcceptLanguageAsLocales(); - this.locale = (!locales.isEmpty() ? locales.get(0) : Locale.getDefault()); + headers.add(HttpHeaders.CONTENT_LANGUAGE, value.toString()); + Locale language = headers.getContentLanguage(); + this.locale = language != null ? language : Locale.getDefault(); return true; } else {