Registering the exception handlers with different priorities.

Author: alimate

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/ExampleWebExceptionHandler.java

@@ -17,11 +17,8 @@
 
 import reactor.core.publisher.Mono;
 
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
-import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.http.HttpStatus;
-import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.WebExceptionHandler;
 
@@ -31,9 +28,7 @@
  * @author Madhura Bhave
  * @author Ali Dehghani
  */
-@Component
-@ConditionalOnProperty(name = "custom-error-handler.enable")
-public class ExampleWebExceptionHandler implements ErrorWebExceptionHandler {
+public class ExampleWebExceptionHandler implements WebExceptionHandler {
 
 	@Override
 	public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebFluxTestAllControllersIntegrationTests.java

@@ -21,6 +21,10 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.reactive.server.WebTestClient;
@@ -33,7 +37,7 @@
  */
 @RunWith(SpringRunner.class)
 @WithMockUser
-@WebFluxTest(properties = "custom-error-handler.enable=true")
+@WebFluxTest
 public class WebFluxTestAllControllersIntegrationTests {
 
 	@Autowired
@@ -61,4 +65,19 @@ public void shouldFindJsonController() {
 		this.webClient.get().uri("/json").exchange().expectStatus().isOk();
 	}
 
+	/**
+	 * A test configuration to register a custom exception handler. Since the registered
+	 * handler has the highest possible priority, the default exception handler provided
+	 * by the Spring Boot will not get a chance to handle exceptions.
+	 */
+	@TestConfiguration
+	static class TestConfig {
+
+		@Bean
+		@Order(Ordered.HIGHEST_PRECEDENCE)
+		ExampleWebExceptionHandler exampleWebExceptionHandler() {
+			return new ExampleWebExceptionHandler();
+		}
+	}
+
 }

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/reactive/webclient/WebFluxTestWithDefaultErrorHandlerTests.java

@@ -21,6 +21,8 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.context.annotation.Bean;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit4.SpringRunner;
@@ -53,4 +55,18 @@ public void defaultWebExceptionHandling() {
 		// @formatter:on
 	}
 
+	/**
+	 * Registers an exception handler with the default priority, so the default handler
+	 * provided by Spring Boot will be called first.
+	 */
+	@TestConfiguration
+	static class TestConfig {
+
+		@Bean
+		ExampleWebExceptionHandler exampleWebExceptionHandler() {
+			return new ExampleWebExceptionHandler();
+		}
+
+	}
+
 }