Update LocaleContextResolver to implement LocaleResolver

This commit updates LocaleContextResolver to implement LocaleResolver using default methods, which simplifies AbstractLocaleContextResolver and aligns it more closely with AbstractLocaleResolver.

Author: vpavic

spring-webmvc/src/main/java/org/springframework/web/servlet/LocaleContextResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -22,12 +22,16 @@
 import jakarta.servlet.http.HttpServletResponse;
 
 import org.springframework.context.i18n.LocaleContext;
+import org.springframework.context.i18n.SimpleLocaleContext;
 import org.springframework.lang.Nullable;
 
 /**
  * Extension of {@link LocaleResolver}, adding support for a rich locale context
  * (potentially including locale and time zone information).
  *
+ * <p>Also provides pre-implemented versions of {@link #resolveLocale} and {@link #setLocale},
+ * delegating to {@link #resolveLocaleContext} and {@link #setLocaleContext}.
+ *
  * @author Juergen Hoeller
  * @since 4.0
  * @see org.springframework.context.i18n.LocaleContext
@@ -73,4 +77,15 @@ public interface LocaleContextResolver extends LocaleResolver {
 	void setLocaleContext(HttpServletRequest request, @Nullable HttpServletResponse response,
 			@Nullable LocaleContext localeContext);
 
+	@Override
+	default Locale resolveLocale(HttpServletRequest request) {
+		Locale locale = resolveLocaleContext(request).getLocale();
+		return (locale != null ? locale : request.getLocale());
+	}
+
+	@Override
+	default void setLocale(HttpServletRequest request, @Nullable HttpServletResponse response, @Nullable Locale locale) {
+		setLocaleContext(request, response, (locale != null ? new SimpleLocaleContext(locale) : null));
+	}
+
 }

spring-webmvc/src/main/java/org/springframework/web/servlet/i18n/AbstractLocaleContextResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2022 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.
@@ -16,23 +16,15 @@
 
 package org.springframework.web.servlet.i18n;
 
-import java.util.Locale;
 import java.util.TimeZone;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.context.i18n.SimpleLocaleContext;
 import org.springframework.lang.Nullable;
 import org.springframework.web.servlet.LocaleContextResolver;
 
 /**
  * Abstract base class for {@link LocaleContextResolver} implementations.
  * Provides support for a default locale and a default time zone.
  *
- * <p>Also provides pre-implemented versions of {@link #resolveLocale} and {@link #setLocale},
- * delegating to {@link #resolveLocaleContext} and {@link #setLocaleContext}.
- *
  * @author Juergen Hoeller
  * @since 4.0
  * @see #setDefaultLocale
@@ -59,16 +51,4 @@ public TimeZone getDefaultTimeZone() {
 		return this.defaultTimeZone;
 	}
 
-
-	@Override
-	public Locale resolveLocale(HttpServletRequest request) {
-		Locale locale = resolveLocaleContext(request).getLocale();
-		return (locale != null ? locale : request.getLocale());
-	}
-
-	@Override
-	public void setLocale(HttpServletRequest request, @Nullable HttpServletResponse response, @Nullable Locale locale) {
-		setLocaleContext(request, response, (locale != null ? new SimpleLocaleContext(locale) : null));
-	}
-
 }