Commit 09f4d4b9 authored by izeye's avatar izeye Committed by Stephane Nicoll

Polish

See gh-25617
parent 11649bc1
...@@ -62,7 +62,7 @@ public class ToolchainPlugin implements Plugin<Project> { ...@@ -62,7 +62,7 @@ public class ToolchainPlugin implements Plugin<Project> {
} }
} }
public boolean isJavaVersionSupported(ToolchainExtension toolchain, JavaLanguageVersion toolchainVersion) { private boolean isJavaVersionSupported(ToolchainExtension toolchain, JavaLanguageVersion toolchainVersion) {
return toolchain.getMaximumCompatibleJavaVersion().map((version) -> version.canCompileOrRun(toolchainVersion)) return toolchain.getMaximumCompatibleJavaVersion().map((version) -> version.canCompileOrRun(toolchainVersion))
.getOrElse(true); .getOrElse(true);
} }
......
...@@ -27,9 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAu ...@@ -27,9 +27,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.web.WebEndpointAu
import org.springframework.boot.actuate.autoconfigure.web.jersey.JerseySameManagementContextConfiguration; import org.springframework.boot.actuate.autoconfigure.web.jersey.JerseySameManagementContextConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration; import org.springframework.boot.autoconfigure.jersey.JerseyAutoConfiguration;
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration;
import org.springframework.boot.logging.LogLevel;
import org.springframework.boot.test.context.FilteredClassLoader; import org.springframework.boot.test.context.FilteredClassLoader;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner; import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext;
...@@ -55,7 +53,6 @@ class JerseyWebEndpointIntegrationTests { ...@@ -55,7 +53,6 @@ class JerseyWebEndpointIntegrationTests {
JerseyWebEndpointManagementContextConfiguration.class)) JerseyWebEndpointManagementContextConfiguration.class))
.withUserConfiguration(ResourceConfigConfiguration.class) .withUserConfiguration(ResourceConfigConfiguration.class)
.withClassLoader(new FilteredClassLoader(DispatcherServlet.class)) .withClassLoader(new FilteredClassLoader(DispatcherServlet.class))
.withInitializer(new ConditionEvaluationReportLoggingListener(LogLevel.INFO))
.withPropertyValues("spring.jersey.type=filter", "server.port=0").run((context) -> { .withPropertyValues("spring.jersey.type=filter", "server.port=0").run((context) -> {
assertThat(context).hasNotFailed(); assertThat(context).hasNotFailed();
Set<Resource> resources = context.getBean(ResourceConfig.class).getResources(); Set<Resource> resources = context.getBean(ResourceConfig.class).getResources();
......
...@@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.rsocket; ...@@ -19,8 +19,6 @@ package org.springframework.boot.autoconfigure.rsocket;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.logging.ConditionEvaluationReportLoggingListener;
import org.springframework.boot.logging.LogLevel;
import org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer; import org.springframework.boot.rsocket.context.RSocketPortInfoApplicationContextInitializer;
import org.springframework.boot.rsocket.context.RSocketServerBootstrap; import org.springframework.boot.rsocket.context.RSocketServerBootstrap;
import org.springframework.boot.rsocket.server.RSocketServerCustomizer; import org.springframework.boot.rsocket.server.RSocketServerCustomizer;
...@@ -148,7 +146,6 @@ class RSocketServerAutoConfigurationTests { ...@@ -148,7 +146,6 @@ class RSocketServerAutoConfigurationTests {
@Test @Test
void whenSpringWebIsNotPresentThenEmbeddedServerConfigurationBacksOff() { void whenSpringWebIsNotPresentThenEmbeddedServerConfigurationBacksOff() {
contextRunner().withClassLoader(new FilteredClassLoader(ReactorResourceFactory.class)) contextRunner().withClassLoader(new FilteredClassLoader(ReactorResourceFactory.class))
.withInitializer(new ConditionEvaluationReportLoggingListener(LogLevel.INFO))
.withPropertyValues("spring.rsocket.server.port=0") .withPropertyValues("spring.rsocket.server.port=0")
.run((context) -> assertThat(context).doesNotHaveBean(RSocketServerFactory.class)); .run((context) -> assertThat(context).doesNotHaveBean(RSocketServerFactory.class));
} }
......
...@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; ...@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Christoph Dreis * @author Christoph Dreis
*/ */
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
public class TomEEDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests { class TomEEDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
@Container @Container
static WarDeploymentContainer container = new WarDeploymentContainer("tomee:8-jre-8.0.2-webprofile", static WarDeploymentContainer container = new WarDeploymentContainer("tomee:8-jre-8.0.2-webprofile",
......
...@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; ...@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Christoph Dreis * @author Christoph Dreis
*/ */
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
public class TomcatDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests { class TomcatDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
@Container @Container
static WarDeploymentContainer container = new WarDeploymentContainer("tomcat:9.0.37-jdk8-openjdk", static WarDeploymentContainer container = new WarDeploymentContainer("tomcat:9.0.37-jdk8-openjdk",
......
...@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers; ...@@ -25,7 +25,7 @@ import org.testcontainers.junit.jupiter.Testcontainers;
* @author Christoph Dreis * @author Christoph Dreis
*/ */
@Testcontainers(disabledWithoutDocker = true) @Testcontainers(disabledWithoutDocker = true)
public class WildflyDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests { class WildflyDeploymentIntegrationTests extends AbstractDeploymentIntegrationTests {
@Container @Container
static WarDeploymentContainer container = new WarDeploymentContainer("jboss/wildfly:20.0.1.Final", static WarDeploymentContainer container = new WarDeploymentContainer("jboss/wildfly:20.0.1.Final",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment