From eba7f0dac3165915adb32d5e99c9e89ddce4715c Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 3 Nov 2014 12:41:00 -0700
Subject: [PATCH] move SpringClientFactory bean creation to
 RibbonAutoConfiguration where it should have been in the first place.

fixes gh-35
---
 .../eureka/EurekaClientConfiguration.java     |  5 -----
 .../ribbon/RibbonAutoConfiguration.java       | 20 +++++++++----------
 .../eureka/RibbonEurekaAutoConfiguration.java |  2 ++
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
index 46dc535c..85acb3dd 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java
@@ -141,11 +141,6 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
         return new EurekaDiscoveryClient();
     }
 
-    @Bean
-    public SpringClientFactory springClientFactory() {
-        return new SpringClientFactory();
-    }
-
 	@Bean
 	protected ApplicationListener<EmbeddedServletContainerInitializedEvent> containerPortInitializer() {
 		return new ApplicationListener<EmbeddedServletContainerInitializedEvent>() {
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
index ff910e65..107496d7 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java
@@ -6,7 +6,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
@@ -15,6 +15,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;
 
+import com.netflix.client.IClient;
 import com.netflix.loadbalancer.BaseLoadBalancer;
 
 /**
@@ -23,20 +24,19 @@ import com.netflix.loadbalancer.BaseLoadBalancer;
  * @author Dave Syer
  */
 @Configuration
-@ConditionalOnBean(SpringClientFactory.class)
+@ConditionalOnClass(IClient.class)
 @AutoConfigureAfter(EurekaClientAutoConfiguration.class)
 public class RibbonAutoConfiguration {
 
 	@Autowired(required = false)
 	private List<BaseLoadBalancer> balancers = Collections.emptyList();
 
-	@Autowired
-	private RibbonClientPreprocessor clientPreprocessor;
-	
-	@Autowired
-	private SpringClientFactory springClientFactory;
+    @Bean
+    public SpringClientFactory springClientFactory() {
+        return new SpringClientFactory();
+    }
 
-	@Bean
+    @Bean
 	@ConditionalOnMissingBean(RestTemplate.class)
 	public RestTemplate restTemplate(RibbonInterceptor ribbonInterceptor) {
 		RestTemplate restTemplate = new RestTemplate();
@@ -48,8 +48,8 @@ public class RibbonAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(LoadBalancerClient.class)
-	public LoadBalancerClient loadBalancerClient() {
-		return new RibbonLoadBalancerClient(clientPreprocessor, springClientFactory, balancers);
+	public LoadBalancerClient loadBalancerClient(RibbonClientPreprocessor clientPreprocessor) {
+		return new RibbonLoadBalancerClient(clientPreprocessor, springClientFactory(), balancers);
 	}
 
 	@Bean
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
index d03a4a4e..5d1d2071 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java
@@ -17,6 +17,7 @@ package org.springframework.cloud.netflix.ribbon.eureka;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -36,6 +37,7 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
 @Configuration
 @EnableConfigurationProperties
 @ConditionalOnClass(DiscoveryEnabledNIWSServerList.class)
+@ConditionalOnBean(SpringClientFactory.class)
 @ConditionalOnExpression("${ribbon.eureka.enabled:true}")
 @AutoConfigureAfter(RibbonAutoConfiguration.class)
 public class RibbonEurekaAutoConfiguration {