diff --git a/pom.xml b/pom.xml index 5965283366..65fd404a50 100644 --- a/pom.xml +++ b/pom.xml @@ -60,14 +60,28 @@ src/checkstyle/checkstyle-suppressions.xml true main.basedir=${main.basedir} - ./ - **/* - .git/**/*,target/**/* check + + nohttp-checkstyle-validation + validate + + ${disable.checks} + src/checkstyle/nohttp-checkstyle.xml + src/checkstyle/nohttp-checkstyle-suppressions.xml + main.basedir=${main.basedir} + ${basedir} + **/* + .git/**/*,target/**/,**/.flattened-pom.xml + + + check + + false + diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java index 726fdec144..f7f37e5510 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ControllerEndpointDiscovererTests.java @@ -39,7 +39,7 @@ import org.springframework.context.annotation.Import; import org.springframework.validation.annotation.Validated; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** * Tests for {@link ControllerEndpointDiscoverer}. @@ -123,7 +123,7 @@ class ControllerEndpointDiscovererTests { @Test void getEndpointWhenEndpointHasOperationsShouldThrowException() { this.contextRunner.withUserConfiguration(TestControllerWithOperation.class) - .run(assertDiscoverer((discoverer) -> assertThatExceptionOfType(IllegalStateException.class) + .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() .isThrownBy(discoverer::getEndpoints) .withMessageContaining("ControllerEndpoints must not declare operations"))); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java index 515ae926e3..70136e05a2 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/web/annotation/ServletEndpointDiscovererTests.java @@ -48,7 +48,7 @@ import org.springframework.context.annotation.Import; import org.springframework.validation.annotation.Validated; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.assertj.core.api.Assertions.assertThatIllegalStateException; /** * Tests for {@link ServletEndpointDiscoverer}. @@ -106,7 +106,7 @@ class ServletEndpointDiscovererTests { @Test void getEndpointWhenEndpointHasOperationsShouldThrowException() { this.contextRunner.withUserConfiguration(TestServletEndpointWithOperation.class) - .run(assertDiscoverer((discoverer) -> assertThatExceptionOfType(IllegalStateException.class) + .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() .isThrownBy(discoverer::getEndpoints) .withMessageContaining("ServletEndpoints must not declare operations"))); } @@ -114,21 +114,21 @@ class ServletEndpointDiscovererTests { @Test void getEndpointWhenEndpointNotASupplierShouldThrowException() { this.contextRunner.withUserConfiguration(TestServletEndpointNotASupplier.class) - .run(assertDiscoverer((discoverer) -> assertThatExceptionOfType(IllegalStateException.class) + .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() .isThrownBy(discoverer::getEndpoints).withMessageContaining("must be a supplier"))); } @Test void getEndpointWhenEndpointSuppliesWrongTypeShouldThrowException() { this.contextRunner.withUserConfiguration(TestServletEndpointSupplierOfWrongType.class) - .run(assertDiscoverer((discoverer) -> assertThatExceptionOfType(IllegalStateException.class) + .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() .isThrownBy(discoverer::getEndpoints).withMessageContaining("must supply an EndpointServlet"))); } @Test void getEndpointWhenEndpointSuppliesNullShouldThrowException() { this.contextRunner.withUserConfiguration(TestServletEndpointSupplierOfNull.class) - .run(assertDiscoverer((discoverer) -> assertThatExceptionOfType(IllegalStateException.class) + .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() .isThrownBy(discoverer::getEndpoints).withMessageContaining("must not supply null"))); } diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index c395aef12c..c610d9183d 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -3,14 +3,6 @@ "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "https://checkstyle.org/dtds/suppressions_1_2.dtd"> - - - - - - - - diff --git a/src/checkstyle/nohttp-checkstyle-suppressions.xml b/src/checkstyle/nohttp-checkstyle-suppressions.xml new file mode 100644 index 0000000000..863c36178a --- /dev/null +++ b/src/checkstyle/nohttp-checkstyle-suppressions.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/src/checkstyle/nohttp-checkstyle.xml b/src/checkstyle/nohttp-checkstyle.xml new file mode 100644 index 0000000000..3865174ebf --- /dev/null +++ b/src/checkstyle/nohttp-checkstyle.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/checkstyle/nohttp-whitelist.txt b/src/checkstyle/nohttp-whitelist.txt index 2c6f8a3b61..5110787383 100644 --- a/src/checkstyle/nohttp-whitelist.txt +++ b/src/checkstyle/nohttp-whitelist.txt @@ -1,2 +1,8 @@ -^http://livereload.com/protocols/official-7.* +^http://docs.groovy-lang.org.* ^http://exslt.org/common.* +^http://groovy-lang.org.* +^http://hsqldb.org.* +^http://livereload.com/.* +^http://www.jdotsoft.com.* +^http://spockframework.org.* +^http://ganglia.sourceforge.net.*