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

#491 - Stubs are registered to consul with localhost

Browse Source
This commit is contained in:
rbrody
2017-12-10 14:18:39 +02:00
parent 9a297437d8
commit 32e5f84dec
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/ConsulStubsRegistrar.java
View File

@@ -67,9 +67,9 @@ public class ConsulStubsRegistrar implements StubsRegistrar {
protected NewService newService(StubConfiguration stubConfiguration, Integer port) {
NewService newService = new NewService();
newService.setAddress(StringUtils.hasText(consulDiscoveryProperties.getHostname()) ?
consulDiscoveryProperties.getHostname() :
inetUtils.findFirstNonLoopbackAddress().getHostName());
newService.setAddress(StringUtils.hasText(this.consulDiscoveryProperties.getHostname()) ?
this.consulDiscoveryProperties.getHostname() :
this.inetUtils.findFirstNonLoopbackAddress().getHostName());
newService.setId(stubConfiguration.getArtifactId());
newService.setName(name(stubConfiguration));
newService.setPort(port);

18
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/consul/StubRunnerSpringCloudConsulAutoConfiguration.java
View File

@@ -39,18 +39,18 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration
@AutoConfigureAfter(value = {StubRunnerConfiguration.class,
ConsulServiceRegistryAutoConfiguration.class})
ConsulServiceRegistryAutoConfiguration.class})
@ConditionalOnClass(ConsulClient.class)
@ConditionalOnStubbedDiscoveryDisabled
@ConditionalOnProperty(value = "stubrunner.cloud.consul.enabled", matchIfMissing = true)
public class StubRunnerSpringCloudConsulAutoConfiguration {
@Bean(initMethod = "registerStubs")
public StubsRegistrar stubsRegistrar(StubRunning stubRunning, ConsulClient consulClient,
StubMapperProperties stubMapperProperties,
ConsulDiscoveryProperties consulDiscoveryProperties,
InetUtils inetUtils) {
return new ConsulStubsRegistrar(stubRunning, consulClient, stubMapperProperties,
consulDiscoveryProperties, inetUtils);
}
@Bean(initMethod = "registerStubs")
public StubsRegistrar stubsRegistrar(StubRunning stubRunning, ConsulClient consulClient,
StubMapperProperties stubMapperProperties,
ConsulDiscoveryProperties consulDiscoveryProperties,
InetUtils inetUtils) {
return new ConsulStubsRegistrar(stubRunning, consulClient, stubMapperProperties,
consulDiscoveryProperties, inetUtils);
}
}