update sidecare enabled property, make eureka portion of config condi…

…tional on eureka on classpath so other DiscoveryClient impls can use it.
spring-cloud · Jan 27, 2015 · 614ec44 · 614ec44
1 parent d789829
commit 614ec44
Showing 1 changed file with 28 additions and 17 deletions.
diff --git a/...sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarConfiguration.java b/...sidecar/src/main/java/org/springframework/cloud/netflix/sidecar/SidecarConfiguration.java
@@ -16,42 +16,53 @@
 
 package org.springframework.cloud.netflix.sidecar;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.netflix.discovery.EurekaClientConfig;
+
 /**
  * @author Spencer Gibb
  */
 @Configuration
 @EnableConfigurationProperties
-@ConditionalOnProperty(value = "sidecar.enabled", matchIfMissing = true)
+@ConditionalOnProperty(value = "spring.cloud.netflix.sidecar.enabled", matchIfMissing = true)
 public class SidecarConfiguration {
 
-	@Value("${server.port:${SERVER_PORT:${PORT:8080}}}")
-	private int serverPort = 8080;
-
 	@Bean
 	public SidecarProperties sidecarProperties() {
 		return new SidecarProperties();
 	}
 
-	@Bean
+	@Configuration
-	public EurekaInstanceConfigBean eurekaInstanceConfigBean() {
+	@ConditionalOnClass(EurekaClientConfig.class)
-		EurekaInstanceConfigBean config = new EurekaInstanceConfigBean();
+	protected static class EurekaInstanceConfigBeanConfiguration {
-		int port = sidecarProperties().getPort();
+		@Autowired
-		config.setNonSecurePort(port);
+		private SidecarProperties sidecarProperties;
-		String scheme = config.getSecurePortEnabled() ? "https" : "http";
+
-		config.setStatusPageUrl(scheme + "://" + config.getHostname() + ":"
+		@Value("${server.port:${SERVER_PORT:${PORT:8080}}}")
-				+ this.serverPort + config.getStatusPageUrlPath());
+		private int serverPort = 8080;
-		config.setHealthCheckUrl(scheme + "://" + config.getHostname() + ":"
+
-				+ this.serverPort + config.getHealthCheckUrlPath());
+		@Bean
-		config.setHomePageUrl(scheme + "://" + config.getHostname() + ":" + port
+		public EurekaInstanceConfigBean eurekaInstanceConfigBean() {
-				+ config.getHomePageUrlPath());
+			EurekaInstanceConfigBean config = new EurekaInstanceConfigBean();
-		return config;
+			int port = sidecarProperties.getPort();
+			config.setNonSecurePort(port);
+			String scheme = config.getSecurePortEnabled() ? "https" : "http";
+			config.setStatusPageUrl(scheme + "://" + config.getHostname() + ":"
+					+ this.serverPort + config.getStatusPageUrlPath());
+			config.setHealthCheckUrl(scheme + "://" + config.getHostname() + ":"
+					+ this.serverPort + config.getHealthCheckUrlPath());
+			config.setHomePageUrl(scheme + "://" + config.getHostname() + ":" + port
+					+ config.getHomePageUrlPath());
+			return config;
+		}
 	}
 
 	@Bean