spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Add nullability annotations to tests in module/spring-boot-webservices

Browse Source 
See gh-47263
This commit is contained in:
Moritz Halbritter
2025-10-16 11:24:40 +02:00
parent 9d5c7a15f3
commit ff83723d99
4 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-webservices/build.gradle
+4
View File
@@ -41,3 +41,7 @@ dependencies {
testRuntimeOnly("io.projectreactor.netty:reactor-netty-http")
testRuntimeOnly("org.apache.httpcomponents.client5:httpclient5")
}
tasks.named("compileTestJava") {
options.nullability.checking = "tests"
}
module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/autoconfigure/WebServicesPropertiesTests.java
+6 -3
View File
@@ -16,6 +16,7 @@
package org.springframework.boot.webservices.autoconfigure;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
@@ -29,23 +30,25 @@ class WebServicesPropertiesTests {
private WebServicesProperties properties;
@BeforeEach
void setUp() {
this.properties = new WebServicesProperties();
}
@Test
void pathMustNotBeEmpty() {
this.properties = new WebServicesProperties();
assertThatIllegalArgumentException().isThrownBy(() -> this.properties.setPath(""))
.withMessageContaining("'path' must have length greater than 1");
}
@Test
void pathMustHaveLengthGreaterThanOne() {
this.properties = new WebServicesProperties();
assertThatIllegalArgumentException().isThrownBy(() -> this.properties.setPath("/"))
.withMessageContaining("'path' must have length greater than 1");
}
@Test
void customPathMustBeginWithASlash() {
this.properties = new WebServicesProperties();
assertThatIllegalArgumentException().isThrownBy(() -> this.properties.setPath("custom"))
.withMessageContaining("'path' must start with '/'");
}
module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/client/WebServiceMessageSenderFactoryTests.java
+2 -2
View File
@@ -94,6 +94,7 @@ class WebServiceMessageSenderFactoryTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void httpWithFactoryAndSettingsWhenFactoryIsNullThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> WebServiceMessageSenderFactory.http(null, null))
.withMessage("'requestFactoryBuilder' must not be null");
@@ -113,8 +114,7 @@ class WebServiceMessageSenderFactoryTests {
private ClientHttpRequestFactory getRequestFactory(WebServiceMessageSender sender) {
assertThat(sender).isInstanceOf(ClientHttpRequestMessageSender.class);
ClientHttpRequestFactory requestFactory = ((ClientHttpRequestMessageSender) sender).getRequestFactory();
return requestFactory;
return ((ClientHttpRequestMessageSender) sender).getRequestFactory();
}
}
module/spring-boot-webservices/src/test/java/org/springframework/boot/webservices/client/WebServiceTemplateBuilderTests.java
+17 -1
View File
@@ -62,9 +62,11 @@ class WebServiceTemplateBuilderTests {
private final WebServiceTemplateBuilder builder = new WebServiceTemplateBuilder();
@Mock
@SuppressWarnings("NullAway.Init")
private WebServiceMessageSender messageSender;
@Mock
@SuppressWarnings("NullAway.Init")
private ClientInterceptor interceptor;
@Test
@@ -100,6 +102,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void messageSendersWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.messageSenders((WebServiceMessageSender[]) null))
@@ -107,6 +110,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void messageSendersCollectionWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.messageSenders((Collection<? extends WebServiceMessageSender>) null))
@@ -128,6 +132,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalMessageSendersWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalMessageSenders((WebServiceMessageSender[]) null))
@@ -135,6 +140,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalMessageSendersCollectionWhenSendersAreAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(
@@ -159,12 +165,14 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void interceptorsWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException().isThrownBy(() -> this.builder.interceptors((ClientInterceptor[]) null))
.withMessageContaining("'interceptors' must not be null");
}
@Test
@SuppressWarnings("NullAway") // Test null check
void interceptorsCollectionWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.interceptors((Collection<? extends ClientInterceptor>) null))
@@ -186,6 +194,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalInterceptorsWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalInterceptors((ClientInterceptor[]) null))
@@ -193,6 +202,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalInterceptorsCollectionWhenInterceptorsAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalInterceptors((Set<ClientInterceptor>) null))
@@ -219,6 +229,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void customizersWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.customizers((WebServiceTemplateCustomizer[]) null))
@@ -226,6 +237,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void customizersCollectionWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.customizers((Collection<? extends WebServiceTemplateCustomizer>) null))
@@ -259,6 +271,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalCustomizersWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(() -> this.builder.additionalCustomizers((WebServiceTemplateCustomizer[]) null))
@@ -266,6 +279,7 @@ class WebServiceTemplateBuilderTests {
}
@Test
@SuppressWarnings("NullAway") // Test null check
void additionalCustomizersCollectionWhenCustomizersAreNullShouldThrowException() {
assertThatIllegalArgumentException()
.isThrownBy(
@@ -336,7 +350,9 @@ class WebServiceTemplateBuilderTests {
void setDefaultUri() {
URI uri = URI.create("http://localhost:8080");
WebServiceTemplate webServiceTemplate = this.builder.setDefaultUri(uri.toString()).build();
assertThat(webServiceTemplate.getDestinationProvider().getDestination()).isEqualTo(uri);
DestinationProvider destinationProvider = webServiceTemplate.getDestinationProvider();
assertThat(destinationProvider).isNotNull();
assertThat(destinationProvider.getDestination()).isEqualTo(uri);
}
@Test