Update AcceptHeaderLocaleResolver to extend AbstractLocaleResolver

This commit updates AcceptHeaderLocaleResolver to extend
AbstractLocaleResolver, which allows the removal of defaultLocale
managing code in AcceptHeaderLocaleResolver.

See gh-27609
This commit is contained in:
Vedran Pavic
2021-10-25 09:11:53 +02:00
committed by Sam Brannen
parent 73acab7635
commit 9a0eb8db28

View File

@@ -41,13 +41,10 @@ import org.springframework.web.servlet.LocaleResolver;
* @since 27.02.2003
* @see jakarta.servlet.http.HttpServletRequest#getLocale()
*/
public class AcceptHeaderLocaleResolver implements LocaleResolver {
public class AcceptHeaderLocaleResolver extends AbstractLocaleResolver {
private final List<Locale> supportedLocales = new ArrayList<>(4);
@Nullable
private Locale defaultLocale;
/**
* Configure supported locales to check against the requested locales
@@ -69,29 +66,6 @@ public class AcceptHeaderLocaleResolver implements LocaleResolver {
return this.supportedLocales;
}
/**
* Configure a fixed default locale to fall back on if the request does not
* have an "Accept-Language" header.
* <p>By default this is not set in which case when there is no "Accept-Language"
* header, the default locale for the server is used as defined in
* {@link HttpServletRequest#getLocale()}.
* @param defaultLocale the default locale to use
* @since 4.3
*/
public void setDefaultLocale(@Nullable Locale defaultLocale) {
this.defaultLocale = defaultLocale;
}
/**
* The configured default locale, if any.
* <p>This method may be overridden in subclasses.
* @since 4.3
*/
@Nullable
public Locale getDefaultLocale() {
return this.defaultLocale;
}
@Override
public Locale resolveLocale(HttpServletRequest request) {