From 48c1d7ba2ca635edd1a267e93d57bdebd9642fa0 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 20 Dec 2017 17:06:19 +0100 Subject: [PATCH] Updated code' --- .../StubRunnerSpringCloudEurekaAutoConfiguration.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) 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 b900c5aadd..df6f3a2381 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 @@ -26,7 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.bind.RelaxedPropertyResolver; import org.springframework.cloud.commons.util.InetUtils; import org.springframework.cloud.contract.stubrunner.StubConfiguration; import org.springframework.cloud.contract.stubrunner.StubRunning; @@ -80,13 +79,11 @@ public class StubRunnerSpringCloudEurekaAutoConfiguration { @Bean(initMethod = "registerStubs") public StubsRegistrar cloudStubsRegistrar(StubRunning stubRunning, Eureka eureka, StubMapperProperties stubMapperProperties, InetUtils inetUtils, EurekaInstanceConfigBean eurekaInstanceConfigBean) { - final RelaxedPropertyResolver resolver = new RelaxedPropertyResolver( - CloudConfig.this.environment); return new EurekaStubsRegistrar(stubRunning, eureka, stubMapperProperties, inetUtils, eurekaInstanceConfigBean) { @Override protected String hostName(Map.Entry entry) { String hostname = - resolver.getProperty("application.hostname") + - "-" + entry.getValue() + "." + resolver.getProperty("application.domain"); + CloudConfig.this.environment.getProperty("application.hostname") + + "-" + entry.getValue() + "." + CloudConfig.this.environment.getProperty("application.domain"); log.info("Registering stub [" + entry.getKey().getArtifactId() + "] with hostname [" + hostname + "]"); return hostname; }