create SpringClientFactory for ribbon to not fail on client creation if…

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfiguration.java

@@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
 import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.cloud.netflix.EurekaDiscoverClient;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.servo.ServoMetricReader;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.SmartLifecycle;
@@ -140,7 +140,12 @@ public class EurekaClientConfiguration implements SmartLifecycle, Ordered {
 
     @Bean
     public DiscoveryClient discoveryClient() {
-        return new EurekaDiscoverClient();
+        return new EurekaDiscoveryClient();
+    }
+
+    @Bean
+    public SpringClientFactory springClientFactory() {
+        return new SpringClientFactory();
     }
 
 	@Bean

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/EurekaDiscoverClient.java → spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java

-package org.springframework.cloud.netflix;
+package org.springframework.cloud.netflix.eureka;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
@@ -8,7 +8,7 @@ import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 /**
  * @author Spencer Gibb
  */
-public class EurekaDiscoverClient implements DiscoveryClient {
+public class EurekaDiscoveryClient implements DiscoveryClient {
 
     @Autowired
     private EurekaInstanceConfigBean config;

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java

@@ -15,9 +15,7 @@
  */
 package org.springframework.cloud.netflix.hystrix;
 
-import org.springframework.context.annotation.AdviceMode;
 import org.springframework.context.annotation.Import;
-import org.springframework.core.Ordered;
 
 import java.lang.annotation.*;
 
@@ -27,34 +25,6 @@ import java.lang.annotation.*;
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Import(HystrixConfigurationSelector.class)
+@Import(HystrixConfiguration.class)
 public @interface EnableHystrix {
-
-	/**
-     * Indicate whether subclass-based (CGLIB) proxies are to be created ({@code true}) as
-     * opposed to standard Java interface-based proxies ({@code false}). The default is
-     * {@code false}. <strong>Applicable only if {@link #mode()} is set to
-     * {@link org.springframework.context.annotation.AdviceMode#PROXY}</strong>.
-     * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
-     * Spring-managed beans requiring proxying, not just those marked with
-     * {@code @Transactional}. For example, other beans marked with Spring's
-     * {@code @Async} annotation will be upgraded to subclass proxying at the same
-     * time. This approach has no negative impact in practice unless one is explicitly
-     * expecting one type of proxy vs another, e.g. in tests.
-     */
-    boolean proxyTargetClass() default false;
-
-    /**
-     * Indicate how transactional advice should be applied. The default is
-     * {@link org.springframework.context.annotation.AdviceMode#PROXY}.
-     * @see org.springframework.context.annotation.AdviceMode
-     */
-    AdviceMode mode() default AdviceMode.PROXY;
-
-    /**
-     * Indicate the ordering of the execution of the transaction advisor
-     * when multiple advices are applied at a specific joinpoint.
-     * The default is {@link org.springframework.core.Ordered#LOWEST_PRECEDENCE}.
-     */
-    int order() default Ordered.LOWEST_PRECEDENCE;
 }
\ No newline at end of file

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfiguration.java

@@ -29,6 +29,7 @@ import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.actuate.metrics.GaugeService;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.SmartLifecycle;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -65,7 +66,7 @@ public class HystrixConfiguration implements ImportAware {
 	}
 
 	@Bean
-	// TODO: add enable/disable
+    @ConditionalOnExpression("${hystrix.stream.endpoint.enabled:true}")
 	// TODO: make it @ConditionalOnWebApp (need a nested class)
 	public HystrixStreamEndpoint hystrixStreamEndpoint() {
 		return new HystrixStreamEndpoint();
@@ -81,20 +82,6 @@ public class HystrixConfiguration implements ImportAware {
 						+ importMetadata.getClassName());
 	}
 
-	@Autowired(required = false)
-	void setConfigurers(Collection<HystrixConfigurer> configurers) {
-		if (CollectionUtils.isEmpty(configurers)) {
-			return;
-		}
-		if (configurers.size() > 1) {
-			throw new IllegalStateException(
-					"Only one HystrixConfigurer may exist");
-		}
-		// TODO: create CircuitBreakerConfigurer API
-		// CircuitBreakerConfigurer configurer = configurers.iterator().next();
-		// this.txManager = configurer.annotationDrivenTransactionManager();
-	}
-
 	@Configuration
 	@ConditionalOnClass(GaugeService.class)
 	protected static class HystrixMetricsPollerConfiguration implements SmartLifecycle {

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurationSelector.java

-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cloud.netflix.hystrix;
-
-import org.springframework.context.annotation.AdviceMode;
-import org.springframework.context.annotation.AdviceModeImportSelector;
-import org.springframework.context.annotation.AutoProxyRegistrar;
-
-/**
- * @author Spencer Gibb
- */
-public class HystrixConfigurationSelector extends AdviceModeImportSelector<EnableHystrix> {
-    
-	/**
-     * The name of the AspectJ transaction management @{@code Configuration} class.
-     */
-    private static final String TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME =
-            "org.springframework.transaction.aspectj.AspectJTransactionManagementConfiguration";
-
-    @Override
-    protected String[] selectImports(AdviceMode adviceMode) {
-        switch (adviceMode) {
-            case PROXY:
-                return new String[]{AutoProxyRegistrar.class.getName(), HystrixConfiguration.class.getName()};
-            case ASPECTJ:
-                return new String[]{TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME};
-            default:
-                return null;
-        }
-    }
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConfigurer.java

-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cloud.netflix.hystrix;
-
-/**
- * @author Spencer Gibb
- */
-public interface HystrixConfigurer {
-}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java

@@ -8,7 +8,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
 
-import com.netflix.client.ClientFactory;
 import com.netflix.loadbalancer.BaseLoadBalancer;
 import com.netflix.loadbalancer.ILoadBalancer;
 import com.netflix.loadbalancer.Server;
@@ -22,6 +21,9 @@ public class RibbonLoadBalancerClient implements LoadBalancerClient {
 	@Autowired
 	private ServerListInitializer serverListInitializer;
 
+    @Autowired
+    private SpringClientFactory clientFactory;
+
 	private Map<String, ILoadBalancer> balancers = new HashMap<String, ILoadBalancer>();
 
 	public RibbonLoadBalancerClient(List<BaseLoadBalancer> balancers) {
@@ -35,7 +37,7 @@ public class RibbonLoadBalancerClient implements LoadBalancerClient {
 		serverListInitializer.initialize(serviceId);
 		ILoadBalancer loadBalancer = this.balancers.get(serviceId);
 		if (loadBalancer == null) {
-			loadBalancer = ClientFactory.getNamedLoadBalancer(serviceId);
+			loadBalancer = clientFactory.getNamedLoadBalancer(serviceId);
 		}
 		Server server = loadBalancer.chooseServer("default");
 		if (server == null) {

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonInitializer.java

@@ -6,9 +6,9 @@ import static com.netflix.client.config.CommonClientConfigKey.NFLoadBalancerRule
 import static com.netflix.client.config.CommonClientConfigKey.NIWSServerListClassName;
 import static com.netflix.client.config.CommonClientConfigKey.NIWSServerListFilterClassName;
 
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.ribbon.ServerListInitializer;
 
-import com.netflix.client.ClientFactory;
 import com.netflix.config.ConfigurationManager;
 import com.netflix.config.DeploymentContext.ContextKey;
 import com.netflix.discovery.EurekaClientConfig;
@@ -28,17 +28,19 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
  */
 public class EurekaRibbonInitializer implements ServerListInitializer {
 
-	private EurekaClientConfig client;
+	private EurekaClientConfig clientConfig;
+    private SpringClientFactory clientFactory;
 
-	public EurekaRibbonInitializer(EurekaClientConfig client) {
-		this.client = client;
-	}
+    public EurekaRibbonInitializer(EurekaClientConfig clientConfig, SpringClientFactory clientFactory) {
+		this.clientConfig = clientConfig;
+        this.clientFactory = clientFactory;
+    }
 
 	@Override
 	public void initialize(String serviceId) {
-		if (client != null
+		if (clientConfig != null
 				&& ConfigurationManager.getDeploymentContext().getValue(ContextKey.zone) == null) {
-			String[] zones = client.getAvailabilityZones(client.getRegion());
+			String[] zones = clientConfig.getAvailabilityZones(clientConfig.getRegion());
 			String zone = zones != null && zones.length > 0 ? zones[0] : null;
 			if (zone != null) {
 				// You can set this with archaius.deployment.* (maybe requires
@@ -58,7 +60,7 @@ public class EurekaRibbonInitializer implements ServerListInitializer {
 		setProp(serviceId, NIWSServerListFilterClassName.key(),
 				ZonePreferenceServerListFilter.class.getName());
 		setProp(serviceId, EnableZoneAffinity.key(), "true");
-		ILoadBalancer loadBalancer = ClientFactory.getNamedLoadBalancer(serviceId);
+		ILoadBalancer loadBalancer = clientFactory.getNamedLoadBalancer(serviceId);
 		wrapServerList(loadBalancer);
 	}
 
@@ -71,6 +73,7 @@ public class EurekaRibbonInitializer implements ServerListInitializer {
 				// This is optional: you can use the native Eureka AWS features as long as
 				// the server zone is populated. TODO: find a way to back off if AWS
 				// metadata *is* available.
+                // @see com.netflix.appinfo.AmazonInfo.Builder
 				dynamic.setServerListImpl(new DomainExtractingServerList(list));
 			}
 		}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/eureka/RibbonEurekaAutoConfiguration.java

@@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
 import org.springframework.cloud.netflix.ribbon.ServerListInitializer;
 import org.springframework.context.annotation.Bean;
@@ -40,10 +41,10 @@ import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
 public class RibbonEurekaAutoConfiguration {
 	
 	@Autowired(required=false)
-	private EurekaClientConfig client;
+	private EurekaClientConfig clientConfig;
 
     @Bean
-    public ServerListInitializer serverListInitializer() {
-        return new EurekaRibbonInitializer(client);
+    public ServerListInitializer serverListInitializer(SpringClientFactory clientFactory) {
+        return new EurekaRibbonInitializer(clientConfig, clientFactory);
     }
 }

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/route/RibbonRoutingFilter.java

@@ -16,13 +16,13 @@ import org.apache.commons.io.IOUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.actuate.trace.TraceRepository;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.ribbon.ServerListInitializer;
 import org.springframework.cloud.netflix.zuul.RibbonCommand;
 import org.springframework.cloud.netflix.zuul.SpringFilter;
 import org.springframework.util.StringUtils;
 
 import com.netflix.client.ClientException;
-import com.netflix.client.ClientFactory;
 import com.netflix.client.http.HttpRequest.Verb;
 import com.netflix.client.http.HttpResponse;
 import com.netflix.hystrix.exception.HystrixRuntimeException;
@@ -71,10 +71,9 @@ public class RibbonRoutingFilter extends SpringFilter {
 
 		String serviceId = (String) context.get("serviceId");
 
-        //TODO: should this be an interface or just config?
         getBean(ServerListInitializer.class).initialize(serviceId);
 
-		RestClient restClient = (RestClient) ClientFactory.getNamedClient(serviceId);
+		RestClient restClient = getBean(SpringClientFactory.class).namedClient(serviceId, RestClient.class);
 
 		String uri = request.getRequestURI();
 		if (context.get("requestURI") != null) {

spring-cloud-netflix-core/src/test/java/org/springframework/cloud/netflix/ribbon/eureka/EurekaRibbonInitializerTests.java

@@ -21,9 +21,9 @@ import static org.junit.Assert.assertTrue;
 
 import org.junit.After;
 import org.junit.Test;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
 import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
 
-import com.netflix.client.ClientFactory;
 import com.netflix.config.ConfigurationManager;
 import com.netflix.config.DeploymentContext.ContextKey;
 import com.netflix.loadbalancer.ILoadBalancer;
@@ -45,10 +45,11 @@ public class EurekaRibbonInitializerTests {
 	public void basicConfigurationCreatedForLoadBalancer() {
 		EurekaClientConfigBean client = new EurekaClientConfigBean();
 		client.getAvailabilityZones().put(client.getRegion(), "foo");
-		EurekaRibbonInitializer initializer = new EurekaRibbonInitializer(
-				client);
+        SpringClientFactory clientFactory = new SpringClientFactory();
+        EurekaRibbonInitializer initializer = new EurekaRibbonInitializer(
+				client, clientFactory);
 		initializer.initialize("service");
-		ILoadBalancer balancer = ClientFactory.getNamedLoadBalancer("service");
+		ILoadBalancer balancer = clientFactory.getNamedLoadBalancer("service");
 		assertNotNull(balancer);
 		@SuppressWarnings("unchecked")
 		ZoneAwareLoadBalancer<Server> aware = (ZoneAwareLoadBalancer<Server>) balancer;