Merge branch '2.2.x'

Author: philwebb

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/CompositeHandlerExceptionResolver.java

@@ -19,7 +19,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -52,15 +51,13 @@ public ModelAndView resolveException(HttpServletRequest request, HttpServletResp
 		if (this.resolvers == null) {
 			this.resolvers = extractResolvers();
 		}
-		Optional<ModelAndView> modelAndView = this.resolvers.stream()
+		ModelAndView resolved = this.resolvers.stream()
 				.map((resolver) -> resolver.resolveException(request, response, handler, ex)).filter(Objects::nonNull)
-				.findFirst();
-		modelAndView.ifPresent((mav) -> {
-			if (mav.isEmpty()) {
-				request.setAttribute("javax.servlet.error.exception", ex);
-			}
-		});
-		return modelAndView.orElse(null);
+				.findFirst().orElse(null);
+		if (resolved != null && resolved.isEmpty()) {
+			request.setAttribute("javax.servlet.error.exception", ex);
+		}
+		return resolved;
 	}
 
 	private List<HandlerExceptionResolver> extractResolvers() {

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/servlet/WebMvcEndpointChildContextConfigurationIntegrationTests.java

@@ -136,7 +136,7 @@ private ContextConsumer<AssertableWebApplicationContext> withWebTestClient(Consu
 
 	@SuppressWarnings("unchecked")
 	private Map<String, ?> getResponseBody(ClientResponse response) {
-		return (Map<String, ?>) response.bodyToMono(Map.class).block();
+		return response.bodyToMono(Map.class).block();
 	}
 
 	@Endpoint(id = "fail")

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ServerProperties.java

@@ -538,7 +538,12 @@ public void setRedirectContextRoot(Boolean redirectContextRoot) {
 			this.redirectContextRoot = redirectContextRoot;
 		}
 
-		public boolean getUseRelativeRedirects() {
+		@Deprecated
+		public Boolean getUseRelativeRedirects() {
+			return this.useRelativeRedirects;
+		}
+
+		public boolean isUseRelativeRedirects() {
 			return this.useRelativeRedirects;
 		}
 

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizer.java

@@ -54,7 +54,7 @@ public void customize(TomcatServletWebServerFactory factory) {
 		if (tomcatProperties.getRedirectContextRoot() != null) {
 			customizeRedirectContextRoot(factory, tomcatProperties.getRedirectContextRoot());
 		}
-		customizeUseRelativeRedirects(factory, tomcatProperties.getUseRelativeRedirects());
+		customizeUseRelativeRedirects(factory, tomcatProperties.isUseRelativeRedirects());
 		factory.setDisableMBeanRegistry(!tomcatProperties.getMbeanregistry().isEnabled());
 	}