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

Merge branch '4.0.x' into 4.1.x

Browse Source 
Closes gh-51599
This commit is contained in:
Andy Wilkinson
2026-09-07 08:26:42 +01:00
parent 58c321c8b8 4396a31e23
commit ea613dc511
149 changed files with 5 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/RestTemplateBuilderTests.java
-2
View File
@@ -87,11 +87,9 @@ class RestTemplateBuilderTests {
private final RestTemplateBuilder builder = new RestTemplateBuilder();
@Mock
@SuppressWarnings("NullAway.Init")
private HttpMessageConverter<Object> messageConverter;
@Mock
@SuppressWarnings("NullAway.Init")
private ClientHttpRequestInterceptor interceptor;
@Test
module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/RootUriTemplateHandlerTests.java
-1
View File
@@ -49,7 +49,6 @@ class RootUriTemplateHandlerTests {
private URI uri;
@Mock
@SuppressWarnings("NullAway.Init")
public UriTemplateHandler delegate;
public UriTemplateHandler handler;
module/spring-boot-restclient/src/test/java/org/springframework/boot/restclient/autoconfigure/AutoConfiguredRestClientSslTests.java
-3
View File
@@ -52,15 +52,12 @@ class AutoConfiguredRestClientSslTests {
.withConnectTimeout(Duration.ofSeconds(30));
@Mock
@SuppressWarnings("NullAway.Init")
private SslBundles sslBundles;
@Mock
@SuppressWarnings("NullAway.Init")
private ClientHttpRequestFactoryBuilder<ClientHttpRequestFactory> factoryBuilder;
@Mock
@SuppressWarnings("NullAway.Init")
private ClientHttpRequestFactory factory;
private AutoConfiguredRestClientSsl restClientSsl;