SpringCloud/spring-cloud-netflix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ready for submission

Browse Source
This commit is contained in:
Haytham Mohamed
2020-04-17 02:10:31 -05:00
parent 7db58f7d16
commit dff3b91bef
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
View File

@@ -43,9 +43,8 @@ public class DiscoveryClientOptionalArgsConfiguration {
@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
@ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class },
search = SearchStrategy.CURRENT)
@ConditionalOnProperty(prefix = "eureka.client",
name = { "webclientSupport", "webclient-support" }, matchIfMissing = true,
havingValue = "false")
@ConditionalOnProperty(prefix = "eureka.client", name = { "webclient-support" },
matchIfMissing = true, havingValue = "false")
public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() {
logger.info("Eureka HTTP Client uses RestTemplate.");
return new RestTemplateDiscoveryClientOptionalArgs();
@@ -57,8 +56,8 @@ public class DiscoveryClientOptionalArgsConfiguration {
value = { AbstractDiscoveryClientOptionalArgs.class,
RestTemplateDiscoveryClientOptionalArgs.class },
search = SearchStrategy.CURRENT)
@ConditionalOnProperty(prefix = "eureka.client",
name = { "webclientSupport", "webclient-support" }, havingValue = "true")
@ConditionalOnProperty(prefix = "eureka.client", name = { "webclient-support" },
havingValue = "true")
public WebClientDiscoveryClientOptionalArgs webClientDiscoveryClientOptionalArgs() {
logger.info("Eureka HTTP Client uses WebClient.");
return new WebClientDiscoveryClientOptionalArgs();

4
spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
View File

@@ -45,7 +45,7 @@ public class EurekaHttpClientsOptionalArgsConfigurationTest {
public void contextLoadsWithRestTemplate() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
.web(WebApplicationType.NONE).sources(EurekaSampleApplication.class)
.properties(new String[] { "eureka.client.webclientSupport=false" })
.properties(new String[] { "eureka.client.webclient-support=false" })
.run()) {
assertThat(context.getBean(RestTemplateDiscoveryClientOptionalArgs.class))
.isNotNull();
@@ -62,7 +62,7 @@ public class EurekaHttpClientsOptionalArgsConfigurationTest {
public void contextLoadsWithWebClient() {
try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
.web(WebApplicationType.NONE).sources(EurekaSampleApplication.class)
.properties(new String[] { "eureka.client.webclientSupport=true" })
.properties(new String[] { "eureka.client.webclient-support=true" })
.run()) {
assertThat(context.getBean(WebClientDiscoveryClientOptionalArgs.class))
.isNotNull();