spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-10-07 17:59:02 +00:00
Code Issues Projects Releases Wiki Activity

Add nullability annotations to module/spring-boot-restclient-test

Browse Source 
See gh-46587
This commit is contained in:
Moritz Halbritter
2025-08-06 10:13:38 +02:00
parent d0dd8c86c6
commit 80b1de20ee
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/MockServerRestClientCustomizer.java
+3 -1
View File
@@ -21,6 +21,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
import org.jspecify.annotations.Nullable;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.restclient.RestClientCustomizer;
import org.springframework.http.client.BufferingClientHttpRequestFactory;
@@ -133,7 +135,7 @@ public class MockServerRestClientCustomizer implements RestClientCustomizer {
return this.expectationManagers;
}
public MockRestServiceServer getServer(RestClient.Builder restClientBuilder) {
public @Nullable MockRestServiceServer getServer(RestClient.Builder restClientBuilder) {
return this.servers.get(restClientBuilder);
}
module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/MockServerRestTemplateCustomizer.java
+3 -1
View File
@@ -21,6 +21,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
import org.jspecify.annotations.Nullable;
import org.springframework.beans.BeanUtils;
import org.springframework.boot.restclient.RestTemplateBuilder;
import org.springframework.boot.restclient.RestTemplateCustomizer;
@@ -147,7 +149,7 @@ public class MockServerRestTemplateCustomizer implements RestTemplateCustomizer
return this.expectationManagers;
}
public MockRestServiceServer getServer(RestTemplate restTemplate) {
public @Nullable MockRestServiceServer getServer(RestTemplate restTemplate) {
return this.servers.get(restTemplate);
}
module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/RootUriRequestExpectationManager.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class RootUriRequestExpectationManager implements RequestExpectationManag
RequestExpectationManager expectationManager) {
Assert.notNull(restTemplate, "'restTemplate' must not be null");
UriTemplateHandler templateHandler = restTemplate.getUriTemplateHandler();
if (templateHandler instanceof RootUriTemplateHandler rootHandler) {
if (templateHandler instanceof RootUriTemplateHandler rootHandler && rootHandler.getRootUri() != null) {
return new RootUriRequestExpectationManager(rootHandler.getRootUri(), expectationManager);
}
return expectationManager;
module/spring-boot-restclient-test/src/main/java/org/springframework/boot/restclient/test/package-info.java
+3
View File
@@ -17,4 +17,7 @@
/**
* RestClient and RestTemplate test utilities.
*/
@NullMarked
package org.springframework.boot.restclient.test;
import org.jspecify.annotations.NullMarked;