From 60da9035962461052268ecaf01db489a2e9582a7 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Thu, 16 Oct 2025 09:51:40 +0200 Subject: [PATCH] Add nullability annotations to tests in smoke-test/spring-boot-smoke-test-tomcat-multi-connectors See gh-47263 --- .../build.gradle | 4 ++++ .../SampleTomcatTwoConnectorsApplicationTests.java | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle index a5c731de6b1..260581e2e93 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle +++ b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/build.gradle @@ -27,3 +27,7 @@ dependencies { testImplementation(project(":starter:spring-boot-starter-webmvc-test")) testImplementation("org.apache.httpcomponents.client5:httpclient5") } + +tasks.named("compileTestJava") { + options.nullability.checking = "tests" +} diff --git a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java index 114b0e10506..9f2f9bba732 100644 --- a/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-tomcat-multi-connectors/src/test/java/smoketest/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java @@ -30,6 +30,7 @@ import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.boot.tomcat.TomcatWebServer; import org.springframework.boot.web.server.AbstractConfigurableWebServerFactory; +import org.springframework.boot.web.server.Ssl; import org.springframework.boot.web.server.context.WebServerInitializedEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.annotation.Import; @@ -63,7 +64,9 @@ class SampleTomcatTwoConnectorsApplicationTests { @Test void testSsl() { - assertThat(this.webServerFactory.getSsl().isEnabled()).isTrue(); + Ssl ssl = this.webServerFactory.getSsl(); + assertThat(ssl).isNotNull(); + assertThat(ssl.isEnabled()).isTrue(); } @Test