Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Deprecate support for theme" changes

Browse Source 
See gh-29202
This commit is contained in:
Johnny Lim
2022-09-26 07:24:19 +09:00
committed by Stephane Nicoll
parent f31eb2dcf9
commit 907c96b21e
6 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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";

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

@@ -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 {

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

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