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

Optimize HttpHeaders.getAcceptLanguageAsLocales 

The HttpHeaders.getAcceptLanguageAsLocales was incurring overhead from
using a Stream, as well as calling the fairly expensive
Locale.getDisplayName method.

Switch to using an ArrayList, and skipping over wildcard ranges to avoid
needing to check the display name.

Closes gh-32318
This commit is contained in:
Patrick Strawderman 2024-02-20 17:16:56 -08:00 committed by Arjen Poutsma
parent d45c0e6b8a
commit beb415dfa3
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,10 +527,14 @@ public class HttpHeaders implements MultiValueMap<String, String>, Serializable
if (ranges.isEmpty()) { if (ranges.isEmpty()) {
return Collections.emptyList(); return Collections.emptyList();
} }
return ranges.stream()
.map(range -> Locale.forLanguageTag(range.getRange())) List<Locale> locales = new ArrayList<>(ranges.size());
.filter(locale -> StringUtils.hasText(locale.getDisplayName())) for (Locale.LanguageRange range : ranges) {
.toList(); if (!range.getRange().startsWith("*")) {
locales.add(Locale.forLanguageTag(range.getRange()));
}
}
return locales;
} }
/** /**

13
spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
View File

@ -471,22 +471,27 @@ class HttpHeadersTests {
@Test @Test
void acceptLanguage() { void acceptLanguage() {
String headerValue = "fr-ch, fr;q=0.9, en-*;q=0.8, de;q=0.7, *;q=0.5"; String headerValue = "fr-ch, fr;q=0.9, en-*;q=0.8, de;q=0.7, *-us;q=0.6, *;q=0.5";
headers.setAcceptLanguage(Locale.LanguageRange.parse(headerValue)); headers.setAcceptLanguage(Locale.LanguageRange.parse(headerValue));
assertThat(headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE)).isEqualTo(headerValue); assertThat(headers.getFirst(HttpHeaders.ACCEPT_LANGUAGE)).isEqualTo(headerValue);
List<Locale.LanguageRange> expectedRanges = Arrays.asList( List<Locale.LanguageRange> expectedRanges = List.of(
new Locale.LanguageRange("fr-ch"), new Locale.LanguageRange("fr-ch"),
new Locale.LanguageRange("fr", 0.9), new Locale.LanguageRange("fr", 0.9),
new Locale.LanguageRange("en-*", 0.8), new Locale.LanguageRange("en-*", 0.8),
new Locale.LanguageRange("de", 0.7), new Locale.LanguageRange("de", 0.7),
new Locale.LanguageRange("*-us", 0.6),
new Locale.LanguageRange("*", 0.5) new Locale.LanguageRange("*", 0.5)
); );
assertThat(headers.getAcceptLanguage()).isEqualTo(expectedRanges); assertThat(headers.getAcceptLanguage()).isEqualTo(expectedRanges);
assertThat(headers.getAcceptLanguageAsLocales()).element(0).isEqualTo(Locale.forLanguageTag("fr-ch")); assertThat(headers.getAcceptLanguageAsLocales()).isEqualTo(List.of(
Locale.forLanguageTag("fr-ch"),
Locale.forLanguageTag("fr"),
Locale.forLanguageTag("en"),
Locale.forLanguageTag("de")));
headers.setAcceptLanguageAsLocales(Collections.singletonList(Locale.FRANCE)); headers.setAcceptLanguageAsLocales(Collections.singletonList(Locale.FRANCE));
assertThat(headers.getAcceptLanguageAsLocales()).element(0).isEqualTo(Locale.FRANCE); assertThat(headers.getAcceptLanguageAsLocales()).first().isEqualTo(Locale.FRANCE);
} }
@Test // SPR-15603 @Test // SPR-15603