NOTE: The {@code @RequestMapping} annotation will only be processed if a diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java index 30fcf58818..70b15a2f73 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/MvcNamespaceUtils.java @@ -235,7 +235,7 @@ public abstract class MvcNamespaceUtils { * Registers an {@link FixedThemeResolver} under a well-known name * unless already registered. */ - @Deprecated + @SuppressWarnings("deprecation") private static void registerThemeResolver(ParserContext context, @Nullable Object source) { if (!containsBeanInHierarchy(context, DispatcherServlet.THEME_RESOLVER_BEAN_NAME)) { RootBeanDefinition beanDef = new RootBeanDefinition(org.springframework.web.servlet.theme.FixedThemeResolver.class); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java index e72b7a88f1..811c01b2c9 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContext.java @@ -78,6 +78,7 @@ public class RequestContext { * Only applies to non-DispatcherServlet requests. *
Same as AbstractThemeResolver's default, but not linked in here to avoid package interdependencies. * @see org.springframework.web.servlet.theme.AbstractThemeResolver#ORIGINAL_DEFAULT_THEME_NAME + * @deprecated as of 6.0, with no direct replacement */ @Deprecated public static final String DEFAULT_THEME_NAME = "theme"; @@ -389,6 +390,7 @@ public class RequestContext { /** * Return the current theme (never {@code null}). *
Resolved lazily for more efficiency when theme support is not being used. + * @deprecated as of 6.0, with no direct replacement */ @Deprecated public org.springframework.ui.context.Theme getTheme() { @@ -426,6 +428,7 @@ public class RequestContext { * storing the new theme name through the configured {@link ThemeResolver}. * @param theme the new theme * @see ThemeResolver#setThemeName + * @deprecated as of 6.0, with no direct replacement */ @Deprecated public void changeTheme(@Nullable org.springframework.ui.context.Theme theme) { diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java index 9b8f05c3a6..b77ed1b3db 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java @@ -182,6 +182,7 @@ public abstract class RequestContextUtils { * DispatcherServlet. * @param request current HTTP request * @return the current ThemeResolver, or {@code null} if not found + * @deprecated as of 6.0, with no direct replacement */ @Nullable @Deprecated @@ -194,6 +195,7 @@ public abstract class RequestContextUtils { * DispatcherServlet. * @param request current HTTP request * @return the current ThemeSource + * @deprecated as of 6.0, with no direct replacement */ @Nullable @Deprecated @@ -207,6 +209,7 @@ public abstract class RequestContextUtils { * @param request current HTTP request * @return the current theme, or {@code null} if not found * @see #getThemeResolver + * @deprecated as of 6.0, with no direct replacement */ @Nullable @Deprecated