From daed512076796bb1de51f0d04ff5ca2ebdd3c322 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 13 May 2020 11:36:24 -0700 Subject: [PATCH] Restore getUseRelativeRedirects in deprecated form Restore the `getUseRelativeRedirects` method with a `Boolean` object result and introduce `isUseRelativeRedirects` for the primitive boolean variant. See gh-20796 --- .../boot/autoconfigure/web/ServerProperties.java | 7 ++++++- .../servlet/TomcatServletWebServerFactoryCustomizer.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java index d3a548c650..b379fa7b83 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java @@ -537,7 +537,12 @@ public class ServerProperties { this.redirectContextRoot = redirectContextRoot; } - public boolean getUseRelativeRedirects() { + @Deprecated + public Boolean getUseRelativeRedirects() { + return this.useRelativeRedirects; + } + + public boolean isUseRelativeRedirects() { return this.useRelativeRedirects; } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java index 3b4184f461..ba55a6f785 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java @@ -54,7 +54,7 @@ public class TomcatServletWebServerFactoryCustomizer if (tomcatProperties.getRedirectContextRoot() != null) { customizeRedirectContextRoot(factory, tomcatProperties.getRedirectContextRoot()); } - customizeUseRelativeRedirects(factory, tomcatProperties.getUseRelativeRedirects()); + customizeUseRelativeRedirects(factory, tomcatProperties.isUseRelativeRedirects()); factory.setDisableMBeanRegistry(!tomcatProperties.getMbeanregistry().isEnabled()); }