diff --git a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml index f7bfa256..6dfc1e05 100644 --- a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml +++ b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway-integration-tests - 2.2.8.BUILD-SNAPSHOT + 3.0.3-SNAPSHOT .. diff --git a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/src/test/java/org/springframework/cloud/gateway/sample/MvcFailureAnalyzerApplicationTests.java b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/src/test/java/org/springframework/cloud/gateway/sample/MvcFailureAnalyzerApplicationTests.java index 0cf93f6e..73a6d309 100644 --- a/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/src/test/java/org/springframework/cloud/gateway/sample/MvcFailureAnalyzerApplicationTests.java +++ b/spring-cloud-gateway-integration-tests/mvc-failure-analyzer/src/test/java/org/springframework/cloud/gateway/sample/MvcFailureAnalyzerApplicationTests.java @@ -35,10 +35,8 @@ public class MvcFailureAnalyzerApplicationTests { @Test public void contextLoads(CapturedOutput output) { - assertThatThrownBy( - () -> new SpringApplication(MvcFailureAnalyzerApplication.class) - .run("--server.port=0")).hasRootCauseInstanceOf( - MvcFoundOnClasspathException.class); + assertThatThrownBy(() -> new SpringApplication(MvcFailureAnalyzerApplication.class).run("--server.port=0")) + .hasRootCauseInstanceOf(MvcFoundOnClasspathException.class); assertThat(output).contains("Spring MVC found on classpath", "Please remove spring-boot-starter-web dependency"); } diff --git a/spring-cloud-gateway-integration-tests/pom.xml b/spring-cloud-gateway-integration-tests/pom.xml index dfda11d9..751baaf1 100644 --- a/spring-cloud-gateway-integration-tests/pom.xml +++ b/spring-cloud-gateway-integration-tests/pom.xml @@ -16,7 +16,7 @@ org.springframework.cloud spring-cloud-gateway - 2.2.8.BUILD-SNAPSHOT + 3.0.3-SNAPSHOT .. diff --git a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/MvcFoundOnClasspathFailureAnalyzer.java b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/MvcFoundOnClasspathFailureAnalyzer.java index 17c8828f..5a0cb97a 100644 --- a/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/MvcFoundOnClasspathFailureAnalyzer.java +++ b/spring-cloud-gateway-server/src/main/java/org/springframework/cloud/gateway/support/MvcFoundOnClasspathFailureAnalyzer.java @@ -19,12 +19,10 @@ package org.springframework.cloud.gateway.support; import org.springframework.boot.diagnostics.AbstractFailureAnalyzer; import org.springframework.boot.diagnostics.FailureAnalysis; -public class MvcFoundOnClasspathFailureAnalyzer - extends AbstractFailureAnalyzer { +public class MvcFoundOnClasspathFailureAnalyzer extends AbstractFailureAnalyzer { @Override - protected FailureAnalysis analyze(Throwable rootFailure, - MvcFoundOnClasspathException cause) { + protected FailureAnalysis analyze(Throwable rootFailure, MvcFoundOnClasspathException cause) { String message = "Spring MVC found on classpath, which is incompatible with Spring Cloud Gateway."; String action = "Please remove spring-boot-starter-web dependency."; return new FailureAnalysis(message, action, cause);