Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor HttpHeaders "Accept-Language" with Locale

Browse Source
This commit is contained in:
Rossen Stoyanchev
2017-04-11 06:58:27 -04:00
parent 23e35c0e1a
commit 3393c10d79
5 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
spring-web/src/main/java/org/springframework/http/HttpHeaders.java
View File

@@ -457,47 +457,43 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
}
/**
* Return the acceptable language ranges from the
* {@literal Accept-Language} header
* <p>If you only need the most preferred locale use
* {@link #getAcceptLanguageAsLocale()} or if you need to filter based on
* a list of supporeted locales you can pass the returned list to
* Return the language ranges from the {@literal "Accept-Language"} header.
* <p>If you only need sorted, preferred locales only use
* {@link #getAcceptLanguageAsLocales()} or if you need to filter based on
* a list of supported locales you can pass the returned list to
* {@link Locale#filter(List, Collection)}.
* @since 5.0
*/
public List<Locale.LanguageRange> getAcceptLanguage() {
String value = getFirst(ACCEPT_LANGUAGE);
if (value != null) {
return Locale.LanguageRange.parse(value);
}
return Collections.emptyList();
return value != null ? Locale.LanguageRange.parse(value) : Collections.emptyList();
}
/**
* A variant of {@link #setAcceptLanguage(List)} that sets the {@literal Accept-Language}
* header value to the specified locale.
* Variant of {@link #setAcceptLanguage(List)} using {@link Locale}'s.
* @since 5.0
*/
public void setAcceptLanguageAsLocale(Locale locale) {
setAcceptLanguage(Collections.singletonList(new Locale.LanguageRange(locale.toLanguageTag())));
public void setAcceptLanguageAsLocales(List<Locale> locales) {
setAcceptLanguage(locales.stream()
.map(locale -> new Locale.LanguageRange(locale.toLanguageTag()))
.collect(Collectors.toList()));
}
/**
* A variant of {@link #getAcceptLanguage()} that converts each
* {@link java.util.Locale.LanguageRange} to a {@link Locale} and returns
* the first one on the list.
* {@link java.util.Locale.LanguageRange} to a {@link Locale}.
* @return the locales or an empty list
* @since 5.0
*/
public Locale getAcceptLanguageAsLocale() {
public List<Locale> getAcceptLanguageAsLocales() {
List<Locale.LanguageRange> ranges = getAcceptLanguage();
if (ranges.isEmpty()) {
return null;
return Collections.emptyList();
}
return ranges.stream()
.map(range -> Locale.forLanguageTag(range.getRange()))
.filter(locale -> StringUtils.hasText(locale.getDisplayName()))
.findFirst()
.orElse(null);
.collect(Collectors.toList());
}
/**