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

AcceptHeaderLocaleResolver falls back to language-only match among its supported locales

Browse Source 
Issue: SPR-16457
This commit is contained in:
Juergen Hoeller
2018-02-02 12:41:59 +01:00
parent c5a33d62dd
commit 4dc964544f
2 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.StringUtils;
import org.springframework.web.servlet.LocaleResolver; import org.springframework.web.servlet.LocaleResolver;
/** /**
@@ -117,13 +118,25 @@ public class AcceptHeaderLocaleResolver implements LocaleResolver {
@Nullable @Nullable
private Locale findSupportedLocale(HttpServletRequest request) { private Locale findSupportedLocale(HttpServletRequest request) {
Enumeration<Locale> requestLocales = request.getLocales(); Enumeration<Locale> requestLocales = request.getLocales();
List<Locale> supported = getSupportedLocales();
Locale languageMatch = null;
while (requestLocales.hasMoreElements()) { while (requestLocales.hasMoreElements()) {
Locale locale = requestLocales.nextElement(); Locale locale = requestLocales.nextElement();
if (getSupportedLocales().contains(locale)) { if (supported.contains(locale)) {
// Full match: typically language + country
return locale; return locale;
} }
else if (languageMatch == null) {
// Let's try to find a language-only match as a fallback
for (Locale candidate : supported) {
if (!StringUtils.hasLength(candidate.getCountry()) &&
candidate.getLanguage().equals(locale.getLanguage())) {
languageMatch = candidate;
}
}
}
} }
return null; return languageMatch;
} }
@Override @Override

20
spring-webmvc/src/test/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolverTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -36,28 +36,34 @@ import static org.junit.Assert.*;
*/ */
public class AcceptHeaderLocaleResolverTests { public class AcceptHeaderLocaleResolverTests {
private AcceptHeaderLocaleResolver resolver = new AcceptHeaderLocaleResolver(); private final AcceptHeaderLocaleResolver resolver = new AcceptHeaderLocaleResolver();
@Test @Test
public void resolve() throws Exception { public void resolve() {
assertEquals(CANADA, this.resolver.resolveLocale(request(CANADA))); assertEquals(CANADA, this.resolver.resolveLocale(request(CANADA)));
assertEquals(US, this.resolver.resolveLocale(request(US, CANADA))); assertEquals(US, this.resolver.resolveLocale(request(US, CANADA)));
} }
@Test @Test
public void resolvePreferredSupported() throws Exception { public void resolvePreferredSupported() {
this.resolver.setSupportedLocales(Collections.singletonList(CANADA)); this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
assertEquals(CANADA, this.resolver.resolveLocale(request(US, CANADA))); assertEquals(CANADA, this.resolver.resolveLocale(request(US, CANADA)));
} }
@Test @Test
public void resolvePreferredNotSupported() throws Exception { public void resolvePreferredNotSupported() {
this.resolver.setSupportedLocales(Collections.singletonList(CANADA)); this.resolver.setSupportedLocales(Collections.singletonList(CANADA));
assertEquals(US, this.resolver.resolveLocale(request(US, UK))); assertEquals(US, this.resolver.resolveLocale(request(US, UK)));
} }
@Test
@Test
public void resolvePreferredAgainstLanguageOnly() {
this.resolver.setSupportedLocales(Collections.singletonList(ENGLISH));
assertEquals(ENGLISH, this.resolver.resolveLocale(request(GERMANY, US, UK)));
}
@Test
public void resolvePreferredNotSupportedWithDefault() { public void resolvePreferredNotSupportedWithDefault() {
this.resolver.setSupportedLocales(Arrays.asList(US, JAPAN)); this.resolver.setSupportedLocales(Arrays.asList(US, JAPAN));
this.resolver.setDefaultLocale(Locale.JAPAN); this.resolver.setDefaultLocale(Locale.JAPAN);
@@ -69,7 +75,7 @@ public class AcceptHeaderLocaleResolverTests {
} }
@Test @Test
public void defaultLocale() throws Exception { public void defaultLocale() {
this.resolver.setDefaultLocale(JAPANESE); this.resolver.setDefaultLocale(JAPANESE);
MockHttpServletRequest request = new MockHttpServletRequest(); MockHttpServletRequest request = new MockHttpServletRequest();
assertEquals(JAPANESE, this.resolver.resolveLocale(request)); assertEquals(JAPANESE, this.resolver.resolveLocale(request));