Skip to content

Commit a5a0ad2

Browse files
committed
Merge pull request #48274 from Nhahan
* pr/48274: Polish "Relax conditions to create HttpService client with RestClient" Relax conditions to create HttpService client with RestClient Closes gh-48274
2 parents 2336cdd + 4feb1fa commit a5a0ad2

File tree

2 files changed

+0
-43
lines changed

2 files changed

+0
-43
lines changed

module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/service/HttpServiceClientAutoConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
3030
import org.springframework.boot.ssl.SslBundles;
3131
import org.springframework.context.annotation.Bean;
32-
import org.springframework.context.annotation.Conditional;
3332
import org.springframework.core.io.ResourceLoader;
3433
import org.springframework.web.client.RestClient;
3534
import org.springframework.web.client.support.RestClientAdapter;
@@ -46,7 +45,6 @@
4645
@AutoConfiguration(after = { ImperativeHttpClientAutoConfiguration.class, RestClientAutoConfiguration.class })
4746
@ConditionalOnClass(RestClientAdapter.class)
4847
@ConditionalOnBean(HttpServiceProxyRegistry.class)
49-
@Conditional(NotReactiveWebApplicationCondition.class)
5048
@EnableConfigurationProperties(HttpServiceClientProperties.class)
5149
public final class HttpServiceClientAutoConfiguration {
5250

module/spring-boot-restclient/src/main/java/org/springframework/boot/restclient/autoconfigure/service/NotReactiveWebApplicationCondition.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)