From 383910e034b8a9ec88615f8592a62f82664b7e59 Mon Sep 17 00:00:00 2001 From: Daniel Hopper Date: Fri, 8 Jan 2016 16:54:29 -0500 Subject: [PATCH] Allow service that will be defined to have the name customizable but defaulting to the Application Name --- .../discovery/ConsulDiscoveryProperties.java | 3 + .../consul/discovery/ConsulLifecycle.java | 6 ++ ...ulLifecycleCustomizedServiceNameTests.java | 69 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedServiceNameTests.java diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java index 0f519a77..a12e532b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulDiscoveryProperties.java @@ -89,6 +89,9 @@ public class ConsulDiscoveryProperties { private int catalogServicesWatchTimeout = 2; + /** Unique service id */ + private String serviceId; + /** Unique service instance id */ private String instanceId; diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java index 7c6dc56b..ccd913ca 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/discovery/ConsulLifecycle.java @@ -182,6 +182,12 @@ public class ConsulLifecycle extends AbstractDiscoveryLifecycle { protected boolean isEnabled() { return this.properties.getLifecycle().isEnabled(); } + + @Override + protected String getAppName() { + String appName = properties.getServiceId(); + return StringUtils.isEmpty(appName) ? super.getAppName() : appName; + } /** * @return the serviceId of the Management Service diff --git a/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedServiceNameTests.java b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedServiceNameTests.java new file mode 100644 index 00000000..453248e0 --- /dev/null +++ b/spring-cloud-consul-discovery/src/test/java/org/springframework/cloud/consul/discovery/ConsulLifecycleCustomizedServiceNameTests.java @@ -0,0 +1,69 @@ +/* + * Copyright 2013-2015 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.cloud.consul.discovery; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; + +import java.util.Map; + +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.boot.test.WebIntegrationTest; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.ecwid.consul.v1.ConsulClient; +import com.ecwid.consul.v1.Response; +import com.ecwid.consul.v1.agent.model.Service; + +/** + * @author Spencer Gibb + */ +@RunWith(SpringJUnit4ClassRunner.class) +@FixMethodOrder(MethodSorters.NAME_ASCENDING) +@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) +public class ConsulLifecycleCustomizedServiceNameTests { + + @Autowired + ConsulLifecycle lifecycle; + + @Autowired + ConsulClient consul; + + @Autowired + ApplicationContext context; + + @Test + public void contextLoads() { + Response> response = consul.getAgentServices(); + Map services = response.getValue(); + Service service = services.get("myTestService1"); + assertNotNull("service was null", service); + assertNotEquals("service port is 0", 0, service.getPort().intValue()); + assertEquals("service id was wrong", "myTestService1", service.getId()); + assertEquals("service name was wrong", "myprefix-myTestService", service.getService()); + } +} \ No newline at end of file