From db89ee6904e5c7444d4f03cb6bfe63c824fabbf1 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 14 Sep 2022 13:49:03 -0700 Subject: [PATCH] Deprecate spring.mvc.ignore-default-model-on-redirect property Closes gh-32381 --- .../autoconfigure/web/servlet/WebMvcAutoConfiguration.java | 7 ++++++- .../boot/autoconfigure/web/servlet/WebMvcProperties.java | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index 9de37735f21..fd2d801cc8b 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -413,9 +413,14 @@ public class WebMvcAutoConfiguration { @Qualifier("mvcValidator") Validator validator) { RequestMappingHandlerAdapter adapter = super.requestMappingHandlerAdapter(contentNegotiationManager, conversionService, validator); + setIgnoreDefaultModelOnRedirect(adapter); + return adapter; + } + + @SuppressWarnings("deprecation") + private void setIgnoreDefaultModelOnRedirect(RequestMappingHandlerAdapter adapter) { adapter.setIgnoreDefaultModelOnRedirect( this.mvcProperties == null || this.mvcProperties.isIgnoreDefaultModelOnRedirect()); - return adapter; } @Override diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java index 92e42caff67..1a16006bbcc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java @@ -130,10 +130,13 @@ public class WebMvcProperties { return this.format; } + @Deprecated + @DeprecatedConfigurationProperty(reason = "Deprecated for removal in Spring MVC") public boolean isIgnoreDefaultModelOnRedirect() { return this.ignoreDefaultModelOnRedirect; } + @Deprecated public void setIgnoreDefaultModelOnRedirect(boolean ignoreDefaultModelOnRedirect) { this.ignoreDefaultModelOnRedirect = ignoreDefaultModelOnRedirect; }