From 5b8b46185308a1172f3b8330a775eb6603f0837a Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Fri, 1 Apr 2016 18:01:48 -0600 Subject: [PATCH] Default appName to 'application'. --- .../cloud/client/discovery/AbstractDiscoveryLifecycle.java | 2 +- .../cloud/client/discovery/AbstractDiscoveryLifecycleTests.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java index e3e997b3..c9ef3243 100644 --- a/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java +++ b/spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycle.java @@ -170,7 +170,7 @@ public abstract class AbstractDiscoveryLifecycle implements DiscoveryLifecycle, * @return the app name, currently the spring.application.name property */ protected String getAppName() { - return this.environment.getProperty("spring.application.name"); + return this.environment.getProperty("spring.application.name", "application"); } @Override diff --git a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycleTests.java b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycleTests.java index 2e4de9fb..306d9e21 100644 --- a/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycleTests.java +++ b/spring-cloud-commons/src/test/java/org/springframework/cloud/client/discovery/AbstractDiscoveryLifecycleTests.java @@ -37,6 +37,7 @@ public class AbstractDiscoveryLifecycleTests { assertEquals("Lifecycle port is wrong", port, lifecycle.getPort().get()); assertTrue("Lifecycle not running", lifecycle.isRunning()); assertTrue("Lifecycle not registered", lifecycle.isRegistered()); + assertEquals("Lifecycle appName is wrong", "application", lifecycle.getAppName()); } @EnableAutoConfiguration