From cde4f0d68841d7cb786bb69b7edacbc800fbca12 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 7 Jun 2019 13:11:46 -0700 Subject: [PATCH] Fix checkstyle violations --- .../ControllerEndpointDiscovererTests.java | 5 ++-- .../ServletEndpointDiscovererTests.java | 5 ++-- .../packagestest/one/FirstConfiguration.java | 1 - ...verContainerInvocationContextProvider.java | 24 ++++++++++--------- .../EmbeddedServletContainerTest.java | 15 ++++++------ src/checkstyle/checkstyle-suppressions.xml | 1 + .../nohttp-checkstyle-suppressions.xml | 2 +- 7 files changed, 27 insertions(+), 26 deletions(-) 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 f7f37e5510c..eff9298e38c 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 @@ -122,9 +122,8 @@ class ControllerEndpointDiscovererTests { @Test void getEndpointWhenEndpointHasOperationsShouldThrowException() { - this.contextRunner.withUserConfiguration(TestControllerWithOperation.class) - .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() - .isThrownBy(discoverer::getEndpoints) + this.contextRunner.withUserConfiguration(TestControllerWithOperation.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 70136e05a28..9c169d22903 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 @@ -105,9 +105,8 @@ class ServletEndpointDiscovererTests { @Test void getEndpointWhenEndpointHasOperationsShouldThrowException() { - this.contextRunner.withUserConfiguration(TestServletEndpointWithOperation.class) - .run(assertDiscoverer((discoverer) -> assertThatIllegalStateException() - .isThrownBy(discoverer::getEndpoints) + this.contextRunner.withUserConfiguration(TestServletEndpointWithOperation.class).run( + assertDiscoverer((discoverer) -> assertThatIllegalStateException().isThrownBy(discoverer::getEndpoints) .withMessageContaining("ServletEndpoints must not declare operations"))); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java index 5f85e951088..5a2286d4bd0 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/packagestest/one/FirstConfiguration.java @@ -16,7 +16,6 @@ package org.springframework.boot.autoconfigure.packagestest.one; -import org.springframework.boot.autoconfigure.AutoConfigurationPackagesTests; import org.springframework.boot.autoconfigure.AutoConfigurationPackagesTests.TestRegistrar; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java index 4f753493b29..02a71a8dde5 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -75,15 +75,17 @@ class EmbeddedServerContainerInvocationContextProvider EmbeddedServletContainerTest annotation = context.getRequiredTestClass() .getAnnotation(EmbeddedServletContainerTest.class); return CONTAINERS.stream() - .map((container) -> new ApplicationBuilder(this.tempDir, annotation.packaging(), container)) - .flatMap((builder) -> { - return Stream.of(annotation.launchers()) - .map((launcherClass) -> ReflectionUtils.newInstance(launcherClass, builder, buildOutput)) - .map((launcher) -> new EmbeddedServletContainerInvocationContext( - StringUtils.capitalize(builder.getContainer()) + ": " - + launcher.getDescription(builder.getPackaging()), - launcher)); - }); + .map((container) -> new ApplicationBuilder(this.tempDir, annotation.packaging(), + container)) + .flatMap( + (builder) -> Stream + .of(annotation.launchers()).map( + (launcherClass) -> ReflectionUtils.newInstance(launcherClass, builder, + buildOutput)) + .map((launcher) -> new EmbeddedServletContainerInvocationContext( + StringUtils.capitalize(builder.getContainer()) + ": " + + launcher.getDescription(builder.getPackaging()), + launcher))); } @Override @@ -135,7 +137,7 @@ class EmbeddedServerContainerInvocationContextProvider } - private static class RestTemplateParameterResolver implements ParameterResolver { + private static final class RestTemplateParameterResolver implements ParameterResolver { private final AbstractApplicationLauncher launcher; diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerTest.java b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerTest.java index 425710f2d39..d258b79917f 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerTest.java +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerTest.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -16,19 +16,20 @@ package org.springframework.boot.context.embedded; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.junit.jupiter.api.extension.ExtendWith; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - /** - * @author awilkinson + * Annotation used to configure servlet container tests. + * + * @author Andy Wilkinson */ -@Retention(RUNTIME) -@Target(TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) @ExtendWith(EmbeddedServerContainerInvocationContextProvider.class) public @interface EmbeddedServletContainerTest { diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml index c610d9183d0..e003a0cdb3a 100644 --- a/src/checkstyle/checkstyle-suppressions.xml +++ b/src/checkstyle/checkstyle-suppressions.xml @@ -3,6 +3,7 @@ "-//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 index 863c36178ae..e9e5c6e528a 100644 --- a/src/checkstyle/nohttp-checkstyle-suppressions.xml +++ b/src/checkstyle/nohttp-checkstyle-suppressions.xml @@ -6,7 +6,7 @@ - +