Merge pull request #22750 from Lopfest

* pr/22750:
  Polish "Fix include exception handling in DefaultErrorAttributes"
  Fix include exception handling in DefaultErrorAttributes

Closes gh-22750

Author: philwebb

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java

@@ -86,7 +86,7 @@ public DefaultErrorAttributes(boolean includeException) {
 	@Override
 	public Map<String, Object> getErrorAttributes(ServerRequest request, ErrorAttributeOptions options) {
 		Map<String, Object> errorAttributes = getErrorAttributes(request, options.isIncluded(Include.STACK_TRACE));
-		if (this.includeException != null) {
+		if (Boolean.TRUE.equals(this.includeException)) {
 			options = options.including(Include.EXCEPTION);
 		}
 		if (!options.isIncluded(Include.EXCEPTION)) {

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributes.java

@@ -108,7 +108,7 @@ private void storeErrorAttributes(HttpServletRequest request, Exception ex) {
 	@Override
 	public Map<String, Object> getErrorAttributes(WebRequest webRequest, ErrorAttributeOptions options) {
 		Map<String, Object> errorAttributes = getErrorAttributes(webRequest, options.isIncluded(Include.STACK_TRACE));
-		if (this.includeException != null) {
+		if (Boolean.TRUE.equals(this.includeException)) {
 			options = options.including(Include.EXCEPTION);
 		}
 		if (!options.isIncluded(Include.EXCEPTION)) {

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributesTests.java

@@ -164,6 +164,19 @@ void includeException() {
 		assertThat(attributes.get("message")).isEqualTo("Test");
 	}
 
+	@Test
+	@SuppressWarnings("deprecation")
+	void excludeExceptionWithDeprecatedConstructor() {
+		RuntimeException error = new RuntimeException("Test");
+		this.errorAttributes = new DefaultErrorAttributes(false);
+		MockServerHttpRequest request = MockServerHttpRequest.get("/test").build();
+		ServerRequest serverRequest = buildServerRequest(request, error);
+		Map<String, Object> attributes = this.errorAttributes.getErrorAttributes(serverRequest,
+				ErrorAttributeOptions.of());
+		assertThat(this.errorAttributes.getError(serverRequest)).isSameAs(error);
+		assertThat(attributes.get("exception")).isNull();
+	}
+
 	@Test
 	void processResponseStatusException() {
 		RuntimeException nested = new RuntimeException("Test");

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/error/DefaultErrorAttributesTests.java

@@ -231,6 +231,17 @@ void withExceptionAttribute() {
 		assertThat(attributes.get("message")).isEqualTo("Test");
 	}
 
+	@Test
+	@SuppressWarnings("deprecation")
+	void excludeExceptionAttributeWithDeprecatedConstructor() {
+		DefaultErrorAttributes errorAttributes = new DefaultErrorAttributes(false);
+		RuntimeException ex = new RuntimeException("Test");
+		this.request.setAttribute("javax.servlet.error.exception", ex);
+		Map<String, Object> attributes = errorAttributes.getErrorAttributes(this.webRequest,
+				ErrorAttributeOptions.of());
+		assertThat(attributes.get("exception")).isNull();
+	}
+
 	@Test
 	void withStackTraceAttribute() {
 		RuntimeException ex = new RuntimeException("Test");