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

Merge remote-tracking branch 'origin/2.2.x'

Browse Source
This commit is contained in:
Ryan Baxter
2020-04-02 11:09:04 -04:00
parent 51e8bfbb0c 5ed5bc9253
commit bcffbd98d4
2 changed files with 59 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-commons/src/main/java/org/springframework/cloud/commons/util/IdUtils.java
View File

@@ -26,6 +26,11 @@ public final class IdUtils {
private static final String SEPARATOR = ":";
// @checkstyle:off
public static final String DEFAULT_SERVICE_ID_STRING = "${vcap.application.name:${spring.application.name:application}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:0}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}";
// @checkstyle:on
private IdUtils() {
throw new IllegalStateException("Can't instantiate a utility class");
}
@@ -55,6 +60,23 @@ public final class IdUtils {
return combineParts(namePart, SEPARATOR, indexPart);
}
/**
* Gets the resolved service id.
* @param resolver A property resolved
* @return A unique id that can be used to uniquely identify a service
*/
public static String getResolvedServiceId(PropertyResolver resolver) {
return resolver.resolvePlaceholders(getUnresolvedServiceId());
}
/**
* Gets an the unresolved service id.
* @return The combination of properties to create a unique service id
*/
public static String getUnresolvedServiceId() {
return DEFAULT_SERVICE_ID_STRING;
}
public static String combineParts(String firstPart, String separator,
String secondPart) {
String combined = null;

37
spring-cloud-commons/src/test/java/org/springframework/cloud/commons/util/IdUtilsTests.java
View File

@@ -111,4 +111,41 @@ public class IdUtilsTests {
.as("instanceId was wrong");
}
@Test
public void testUnresolvedServiceId() {
then(IdUtils.DEFAULT_SERVICE_ID_STRING)
.isEqualTo(IdUtils.getUnresolvedServiceId());
}
@Test
public void testServiceIdDefaults() {
this.env.setProperty("cachedrandom.application.value", "123abc");
then("application:0:123abc").isEqualTo(IdUtils.getResolvedServiceId(this.env));
}
@Test
public void testVCAPServiceId() {
env.setProperty("vcap.application.name", "vcapname");
env.setProperty("vcap.application.instance_index", "vcapindex");
env.setProperty("vcap.application.instance_id", "vcapid");
then("vcapname:vcapindex:vcapid").isEqualTo(IdUtils.getResolvedServiceId(env));
}
@Test
public void testSpringServiceId() {
env.setProperty("spring.application.name", "springname");
env.setProperty("spring.application.index", "springindex");
env.setProperty("cachedrandom.springname.value", "123abc");
then("springname:springindex:123abc")
.isEqualTo(IdUtils.getResolvedServiceId(env));
}
@Test
public void testServerPortServiceId() {
env.setProperty("spring.application.name", "springname");
env.setProperty("server.port", "1234");
env.setProperty("cachedrandom.springname.value", "123abc");
then("springname:1234:123abc").isEqualTo(IdUtils.getResolvedServiceId(env));
}
}