From 8b199c5c73d5c8a7a33dcc17ceabdabb07882d87 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@gopivotal.com>
Date: Fri, 11 Jul 2014 16:59:32 +0100
Subject: [PATCH] Use Environment for defaulting app name and port

---
 README.md                                     | 39 +++++++++++++++++++
 .../eureka/EurekaClientAutoConfiguration.java |  1 +
 .../eureka/EurekaInstanceConfigBean.java      |  4 ++
 src/test/resources/application.yml            | 11 ------
 4 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 00000000..a50dbd30
--- /dev/null
+++ b/README.md
@@ -0,0 +1,39 @@
+Ths project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
+and binding to the Spring Environment and other Spring programming model idioms.
+
+# Eureka Clients
+
+Example eureka client:
+
+```
+@Configuration
+@ComponentScan
+@EnableAutoConfiguration
+@RestController
+public class Application {
+
+	@RequestMapping("/")
+	public String home() {
+		return "Hello world";
+	}
+	
+	public static void main(String[] args) {
+		new SpringApplicationBuilder(Application.class).web(true).run(args);
+	}
+
+}
+
+```
+
+(i.e. utterly normal Spring Boot app). Configuration is required to locate the Eureka server. Example:
+
+```
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8080/v2/
+      default.defaultZone: http://localhost:8080/v2/
+```
+
+The default application name, virtual host and non-secure port are taken from the `Environment` is 
+`${spring.application.name}`, `${spring.application.name}.mydomain.net` and `${server.port}` respectively.
diff --git a/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java b/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
index 39172187..88774dd3 100644
--- a/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
+++ b/src/main/java/org/springframework/platform/netflix/eureka/EurekaClientAutoConfiguration.java
@@ -38,6 +38,7 @@ public class EurekaClientAutoConfiguration implements ApplicationListener<Contex
 
 	@Autowired
 	private EurekaClientConfigBean clientConfig;
+
 	@Autowired
 	private EurekaInstanceConfigBean instanceConfig;
 	
diff --git a/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java b/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java
index 9df9746c..611989a7 100644
--- a/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java
+++ b/src/main/java/org/springframework/platform/netflix/eureka/EurekaInstanceConfigBean.java
@@ -27,6 +27,7 @@ import lombok.Setter;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import com.netflix.appinfo.DataCenterInfo;
@@ -45,12 +46,14 @@ public class EurekaInstanceConfigBean implements EurekaInstanceConfig {
 	@Getter(AccessLevel.PRIVATE) @Setter(AccessLevel.PRIVATE)
 	private String[] hostInfo = initHostInfo();
 
+	@Value("${spring.application.name:unkown}")
     private String appname = "unknown";
 
     private String appGroupName;
     
     private boolean instanceEnabledOnit;
 
+	@Value("${server.port:80}")
     private int nonSecurePort = 80;
 
     private int securePort = 443;
@@ -63,6 +66,7 @@ public class EurekaInstanceConfigBean implements EurekaInstanceConfig {
 
     private int leaseExpirationDurationInSeconds = 90;
 
+	@Value("${spring.application.name:unkown}.mydomain.net")
     private String virtualHostName;
 
     private String secureVirtualHostName;
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index edd82742..1f6f88d5 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -8,14 +8,3 @@ eureka:
     serviceUrl:
       defaultZone: http://localhost:8080/v2/
       default.defaultZone: http://localhost:8080/v2/
-    region: default
-    availabilityZones:
-      us-east-1: default
-    preferSameZoneEureka: true
-    useDnsForFetchingServiceUrls: false
-  instance:
-    nonSecurePort: ${server.port}
-    appname: ${spring.application.name}
-    virtualHostName: ${spring.application.name}.mydomain.net
-    statusPageUrlPath: /info
-    healthCheckUrlPath: /health
\ No newline at end of file