root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Polish

This commit is contained in:
Phillip Webb 2025-09-28 21:39:52 -07:00
parent 352925bbe8
commit 36732bd74a
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/checkstyle/import-control.xml
View File

@ -91,8 +91,6 @@
<disallow pkg="jakarta.servlet" /> <disallow pkg="jakarta.servlet" />
<!-- Common --> <!-- Common -->
<subpackage name="client">
</subpackage>
<subpackage name="context"> <subpackage name="context">
<allow pkg="org.springframework.context" /> <allow pkg="org.springframework.context" />
<subpackage name="servlet"> <subpackage name="servlet">

3
module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/RootUriTemplateHandler.java
View File

@ -62,7 +62,8 @@ public class RootUriTemplateHandler implements UriTemplateHandler {
} }
String apply(String uriTemplate) { String apply(String uriTemplate) {
if (StringUtils.startsWithIgnoreCase(uriTemplate, "/")) { String rootUri = getRootUri();
if (rootUri != null && StringUtils.startsWithIgnoreCase(uriTemplate, "/")) {
return getRootUri() + uriTemplate; return getRootUri() + uriTemplate;
} }
return uriTemplate; return uriTemplate;

2
module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/RestClientAutoConfiguration.java
View File

@ -34,6 +34,7 @@ import org.springframework.boot.restclient.RestClientCustomizer;
import org.springframework.boot.ssl.SslBundles; import org.springframework.boot.ssl.SslBundles;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Scope; import org.springframework.context.annotation.Scope;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
@ -96,6 +97,7 @@ public final class RestClientAutoConfiguration {
return restClientBuilderConfigurer.configure(RestClient.builder()); return restClientBuilderConfigurer.configure(RestClient.builder());
} }
@Configuration(proxyBeanMethods = false)
@ConditionalOnClass(HttpMessageConverters.class) @ConditionalOnClass(HttpMessageConverters.class)
static class HttpMessageConvertersConfiguration { static class HttpMessageConvertersConfiguration {