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

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2020-04-09 11:49:35 +02:00
parent 8682a5d89a
commit de0d06fab5
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@@ -8,8 +8,8 @@ plugins {
id 'de.undercouch.download' version '4.0.0'
id 'com.gradle.build-scan' version '3.2'
id "com.jfrog.artifactory" version '4.12.0' apply false
id "io.freefair.aspectj" version "4.1.1" apply false
id "com.github.ben-manes.versions" version "0.24.0"
id "io.freefair.aspectj" version '4.1.1' apply false
id "com.github.ben-manes.versions" version '0.24.0'
}
apply from: "$rootDir/gradle/build-scan-user-data.gradle"

6
spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -39,6 +39,7 @@ import org.springframework.web.server.ServerWebExchange;
* @author Sebastien Deleuze
* @author Juergen Hoeller
* @since 5.0
* @see HttpHeaders#getAcceptLanguageAsLocales()
*/
public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver {
@@ -76,6 +77,7 @@ public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver
/**
* The configured default locale, if any.
* <p>This method may be overridden in subclasses.
*/
@Nullable
public Locale getDefaultLocale() {
@@ -128,7 +130,7 @@ public class AcceptHeaderLocaleContextResolver implements LocaleContextResolver
return languageMatch;
}
final Locale defaultLocale = getDefaultLocale();
Locale defaultLocale = getDefaultLocale();
return (defaultLocale != null ? defaultLocale : requestLocales.get(0));
}

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -84,6 +84,7 @@ public class AcceptHeaderLocaleResolver implements LocaleResolver {
/**
* The configured default locale, if any.
* <p>This method may be overridden in subclasses.
* @since 4.3
*/
@Nullable