diff --git a/build.gradle b/build.gradle
index b4edf701a0..408d236a1c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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"
diff --git a/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java b/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
index a5147eca11..cde909cf19 100644
--- a/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/server/i18n/AcceptHeaderLocaleContextResolver.java
@@ -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));
 	}
 
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
index 45ebf396d2..2e59931e97 100644
--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
+++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AcceptHeaderLocaleResolver.java
@@ -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