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

Merge pull request #131 from split3/feature/service-name-refactor

Browse Source 
Refactoring serviceId to serviceName
This commit is contained in:
Spencer Gibb
2016-01-20 15:55:33 -07:00
parent abb6e8ab5d a0301fd9d0
commit 91ac920a70
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java
View File

@@ -91,8 +91,8 @@ public class ConsulDiscoveryProperties {
private int catalogServicesWatchTimeout = 2;
/** Unique service id */
private String serviceId;
/** Service name */
private String serviceName;
/** Unique service instance id */
private String instanceId;

2
spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java
View File

@@ -185,7 +185,7 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle {
@Override
protected String getAppName() {
String appName = properties.getServiceId();
String appName = properties.getServiceName();
return StringUtils.isEmpty(appName) ? super.getAppName() : appName;
}

2
spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedServiceNameTests.java
View File

@@ -44,7 +44,7 @@ import com.ecwid.consul.v1.agent.model.Service;
@SpringApplicationConfiguration(classes = TestPropsConfig.class)
@WebIntegrationTest(value = { "spring.application.name=myTestService",
"spring.cloud.consul.discovery.instanceId=myTestService1",
"spring.cloud.consul.discovery.serviceId=myprefix-${spring.application.name}"}, randomPort = true)
"spring.cloud.consul.discovery.serviceName=myprefix-${spring.application.name}"}, randomPort = true)
public class ConsulLifecycleCustomizedServiceNameTests {
@Autowired