Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix checkstyle violations

Browse Source
This commit is contained in:
Phillip Webb
2019-06-07 13:11:46 -07:00
parent 4c21dc1c31
commit cde4f0d688
7 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServerContainerInvocationContextProvider.java
View File

@@ -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;

15
spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/src/test/java/org/springframework/boot/context/embedded/EmbeddedServletContainerTest.java
View File

@@ -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 {