Merge branch '3.1.x'

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

@@ -27,9 +27,9 @@ 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}}";
+	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:8080}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}";
 
-	public static final String DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING = "${vcap.application.name:${spring.application.name:application}:${spring.profiles.active}}:${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}}";
+	public static final String DEFAULT_SERVICE_ID_WITH_ACTIVE_PROFILES_STRING = "${vcap.application.name:${spring.application.name:application}:${spring.profiles.active}}:${vcap.application.instance_index:${spring.application.index:${local.server.port:${server.port:8080}}}}:${vcap.application.instance_id:${cachedrandom.${vcap.application.name:${spring.application.name:application}}.value}}";
 
 	// @checkstyle:on
 

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

@@ -125,7 +125,7 @@ public class IdUtilsTests {
 	@Test
 	public void testServiceIdDefaults() {
 		this.env.setProperty("cachedrandom.application.value", "123abc");
-		then("application:0:123abc").isEqualTo(IdUtils.getResolvedServiceId(this.env));
+		then("application:8080:123abc").isEqualTo(IdUtils.getResolvedServiceId(this.env));
 	}
 
 	@Test