Merge pull request #29202 from izeye

* pr/29202:
  Polish "Deprecate support for theme" changes

Closes gh-29202

spring-web/src/main/java/org/springframework/web/context/support/AbstractRefreshableWebApplicationContext.java

@@ -57,7 +57,7 @@ import org.springframework.web.context.ServletContextAware;
  * {@link org.springframework.context.support.AbstractApplicationContext},
  * this class detects a bean of type {@link org.springframework.ui.context.ThemeSource}
  * in the context, under the special bean name "themeSource".
- * Theme support is deprecated as of 6.0
+ * Theme support is deprecated as of 6.0 with no direct replacement.
  *
  * <p><b>This is the web context to be subclassed for a different bean definition format.</b>
  * Such a context implementation can be specified as "contextClass" context-param

spring-web/src/main/java/org/springframework/web/context/support/GenericWebApplicationContext.java

@@ -52,7 +52,7 @@ import org.springframework.web.context.ServletContextAware;
  * <p>In addition to the special beans detected by
  * {@link org.springframework.context.support.AbstractApplicationContext AbstractApplicationContext},
  * this class detects a {@link ThemeSource} bean in the context, with the name "themeSource".
- * Theme support is deprecated as of 6.0
+ * Theme support is deprecated as of 6.0 with no direct replacement.
  *
  * <p>If you wish to register annotated <em>component classes</em> with a
  * {@code GenericWebApplicationContext}, you can use an

spring-web/src/main/java/org/springframework/web/context/support/StaticWebApplicationContext.java

@@ -50,7 +50,7 @@ import org.springframework.web.context.ServletContextAware;
  * {@link org.springframework.context.support.AbstractApplicationContext},
  * this class detects a bean of type {@link org.springframework.ui.context.ThemeSource}
  * in the context, under the special bean name "themeSource".
- * Theme support is deprecated as of 6.0
+ * Theme support is deprecated as of 6.0 with no direct replacement.
  *
  * @author Rod Johnson
  * @author Juergen Hoeller

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

@@ -169,7 +169,10 @@ public class DispatcherServlet extends FrameworkServlet {
 	/** Well-known name for the LocaleResolver object in the bean factory for this namespace. */
 	public static final String LOCALE_RESOLVER_BEAN_NAME = "localeResolver";
 
-	/** Well-known name for the ThemeResolver object in the bean factory for this namespace. */
+	/**
+	 * Well-known name for the ThemeResolver object in the bean factory for this namespace.
+	 * @deprecated as of 6.0, with no direct replacement
+	 */
 	@Deprecated
 	public static final String THEME_RESOLVER_BEAN_NAME = "themeResolver";
 
@@ -227,6 +230,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	/**
 	 * Request attribute to hold the current ThemeResolver, retrievable by views.
 	 * @see org.springframework.web.servlet.support.RequestContextUtils#getThemeResolver
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public static final String THEME_RESOLVER_ATTRIBUTE = DispatcherServlet.class.getName() + ".THEME_RESOLVER";
@@ -234,6 +238,7 @@ public class DispatcherServlet extends FrameworkServlet {
 	/**
 	 * Request attribute to hold the current ThemeSource, retrievable by views.
 	 * @see org.springframework.web.servlet.support.RequestContextUtils#getThemeSource
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public static final String THEME_SOURCE_ATTRIBUTE = DispatcherServlet.class.getName() + ".THEME_SOURCE";

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

@@ -409,6 +409,7 @@ public class RequestContext {
 	 * Determine the fallback theme for this context.
 	 * <p>The default implementation returns the default theme (with name "theme").
 	 * @return the fallback theme (never {@code null})
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	protected org.springframework.ui.context.Theme getFallbackTheme() {
@@ -447,6 +448,7 @@ public class RequestContext {
 	 * {@link org.springframework.web.servlet.ThemeResolver ThemeResolver}.
 	 * @param themeName the name of the new theme
 	 * @see org.springframework.web.servlet.ThemeResolver#setThemeName
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public void changeTheme(String themeName) {
@@ -740,6 +742,7 @@ public class RequestContext {
 	 * @param code the code of the message
 	 * @param defaultMessage the String to return if the lookup fails
 	 * @return the message
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(String code, String defaultMessage) {
@@ -755,6 +758,7 @@ public class RequestContext {
 	 * @param args arguments for the message, or {@code null} if none
 	 * @param defaultMessage the String to return if the lookup fails
 	 * @return the message
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(String code, @Nullable Object[] args, String defaultMessage) {
@@ -770,6 +774,7 @@ public class RequestContext {
 	 * @param args arguments for the message as a List, or {@code null} if none
 	 * @param defaultMessage the String to return if the lookup fails
 	 * @return the message
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(String code, @Nullable List<?> args, String defaultMessage) {
@@ -785,6 +790,7 @@ public class RequestContext {
 	 * @param code the code of the message
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(String code) throws NoSuchMessageException {
@@ -799,6 +805,7 @@ public class RequestContext {
 	 * @param args arguments for the message, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(String code, @Nullable Object[] args) throws NoSuchMessageException {
@@ -813,6 +820,7 @@ public class RequestContext {
 	 * @param args arguments for the message as a List, or {@code null} if none
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(String code, @Nullable List<?> args) throws NoSuchMessageException {
@@ -826,6 +834,7 @@ public class RequestContext {
 	 * @param resolvable the MessageSourceResolvable
 	 * @return the message
 	 * @throws org.springframework.context.NoSuchMessageException if not found
+	 * @deprecated as of 6.0, with no direct replacement
 	 */
 	@Deprecated
 	public String getThemeMessage(MessageSourceResolvable resolvable) throws NoSuchMessageException {

spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/InterceptorRegistryTests.java

@@ -57,7 +57,6 @@ public class InterceptorRegistryTests {
 
 	private final HandlerInterceptor interceptor1 = new LocaleChangeInterceptor();
 
-	@Deprecated
 	private final HandlerInterceptor interceptor2 = new ThemeChangeInterceptor();
 
 	private TestWebRequestInterceptor webInterceptor1;