From 8c89ec48b73124fcbafce335102d21b72c5b7fe3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 16 Sep 2016 14:54:13 +0200 Subject: [PATCH] Added EurekaClientConfigBean --- .../contract/stubrunner/spring/cloud/eureka/Eureka.java | 3 ++- .../eureka/StubRunnerSpringCloudEurekaAutoConfiguration.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/Eureka.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/Eureka.java index c4b73be470..ddd176de26 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/Eureka.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/Eureka.java @@ -52,11 +52,12 @@ public class Eureka { final EurekaClientConfigBean clientConfig; final EurekaTransport transport; - public Eureka(InetUtils inetUtils, CloudEurekaClient eurekaClient) { + public Eureka(InetUtils inetUtils, EurekaClientConfigBean eurekaClientConfigBean, CloudEurekaClient eurekaClient) { this.inetUtils = inetUtils; this.eurekaClient = eurekaClient; this.clientConfig = new EurekaClientConfigBean(); this.clientConfig.setRegisterWithEureka(false); // turn off registering with eureka, let apps send heartbeats. + this.clientConfig.setServiceUrl(eurekaClientConfigBean.getServiceUrl()); this.transport = createTransport(); } diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfiguration.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfiguration.java index 78108111df..411e8d9b52 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfiguration.java @@ -27,6 +27,7 @@ import org.springframework.cloud.contract.stubrunner.spring.cloud.StubMapperProp import org.springframework.cloud.contract.stubrunner.spring.cloud.StubsRegistrar; import org.springframework.cloud.netflix.eureka.CloudEurekaClient; import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration; +import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -57,7 +58,7 @@ public class StubRunnerSpringCloudEurekaAutoConfiguration { @Bean(name = "eurekaRegistrar") public Eureka eureka(InetUtils inetUtils, ApplicationInfoManager manager, - EurekaClientConfig config, ApplicationContext applicationContext) { - return new Eureka(inetUtils, new CloudEurekaClient(manager, config, applicationContext)); + EurekaClientConfig config, ApplicationContext applicationContext, EurekaClientConfigBean eurekaClientConfigBean) { + return new Eureka(inetUtils, eurekaClientConfigBean, new CloudEurekaClient(manager, config, applicationContext)); } }