Merge branch 'fitzoh-master'

Author: spencergibb

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/annotation/LoadBalancerClientConfiguration.java

@@ -16,7 +16,6 @@
 
 package org.springframework.cloud.loadbalancer.annotation;
 
-import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -26,16 +25,11 @@
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
-import org.springframework.cloud.loadbalancer.cache.LoadBalancerCacheManager;
-import org.springframework.cloud.loadbalancer.core.CachingServiceInstanceSupplier;
-import org.springframework.cloud.loadbalancer.core.DiscoveryClientServiceInstanceSupplier;
 import org.springframework.cloud.loadbalancer.core.ReactorLoadBalancer;
 import org.springframework.cloud.loadbalancer.core.RoundRobinLoadBalancer;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSupplier;
 import org.springframework.cloud.loadbalancer.core.ServiceInstanceListSuppliers;
-import org.springframework.cloud.loadbalancer.core.ServiceInstanceSupplier;
 import org.springframework.cloud.loadbalancer.support.LoadBalancerClientFactory;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -101,23 +95,6 @@ public ServiceInstanceListSupplier healthCheckDiscoveryClientServiceInstanceList
 					.withHealthChecks().withCaching().build(context);
 		}
 
-		@Bean
-		@ConditionalOnBean(ReactiveDiscoveryClient.class)
-		@ConditionalOnMissingBean
-		public ServiceInstanceSupplier discoveryClientServiceInstanceSupplier(
-				ReactiveDiscoveryClient discoveryClient, Environment env,
-				ApplicationContext context) {
-			DiscoveryClientServiceInstanceSupplier delegate = new DiscoveryClientServiceInstanceSupplier(
-					discoveryClient, env);
-			ObjectProvider<LoadBalancerCacheManager> cacheManagerProvider = context
-					.getBeanProvider(LoadBalancerCacheManager.class);
-			if (cacheManagerProvider.getIfAvailable() != null) {
-				return new CachingServiceInstanceSupplier(delegate,
-						cacheManagerProvider.getIfAvailable());
-			}
-			return delegate;
-		}
-
 	}
 
 	@Configuration(proxyBeanMethods = false)
@@ -158,23 +135,6 @@ public ServiceInstanceListSupplier healthCheckDiscoveryClientServiceInstanceList
 					.withHealthChecks().withCaching().build(context);
 		}
 
-		@Bean
-		@ConditionalOnBean(DiscoveryClient.class)
-		@ConditionalOnMissingBean
-		public ServiceInstanceSupplier discoveryClientServiceInstanceSupplier(
-				DiscoveryClient discoveryClient, Environment env,
-				ApplicationContext context) {
-			DiscoveryClientServiceInstanceSupplier delegate = new DiscoveryClientServiceInstanceSupplier(
-					discoveryClient, env);
-			ObjectProvider<LoadBalancerCacheManager> cacheManagerProvider = context
-					.getBeanProvider(LoadBalancerCacheManager.class);
-			if (cacheManagerProvider.getIfAvailable() != null) {
-				return new CachingServiceInstanceSupplier(delegate,
-						cacheManagerProvider.getIfAvailable());
-			}
-			return delegate;
-		}
-
 	}
 
 }

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/core/CachingServiceInstanceSupplier.java

@@ -43,25 +43,10 @@ public class RoundRobinLoadBalancer implements ReactorServiceInstanceLoadBalance
 
 	private final AtomicInteger position;
 
-	@Deprecated
-	private ObjectProvider<ServiceInstanceSupplier> serviceInstanceSupplier;
-
 	private ObjectProvider<ServiceInstanceListSupplier> serviceInstanceListSupplierProvider;
 
 	private final String serviceId;
 
-	/**
-	 * @param serviceId id of the service for which to choose an instance
-	 * @param serviceInstanceSupplier a provider of {@link ServiceInstanceSupplier} that
-	 * will be used to get available instances
-	 * @deprecated Use {@link #RoundRobinLoadBalancer(ObjectProvider, String)}} instead.
-	 */
-	@Deprecated
-	public RoundRobinLoadBalancer(String serviceId,
-			ObjectProvider<ServiceInstanceSupplier> serviceInstanceSupplier) {
-		this(serviceId, serviceInstanceSupplier, new Random().nextInt(1000));
-	}
-
 	/**
 	 * @param serviceInstanceListSupplierProvider a provider of
 	 * {@link ServiceInstanceListSupplier} that will be used to get available instances
@@ -87,39 +72,15 @@ public RoundRobinLoadBalancer(
 		this.position = new AtomicInteger(seedPosition);
 	}
 
-	/**
-	 * @param serviceId id of the service for which to choose an instance
-	 * @param serviceInstanceSupplier a provider of {@link ServiceInstanceSupplier} that
-	 * will be used to get available instances
-	 * @param seedPosition Round Robin element position marker
-	 * @deprecated Use {@link #RoundRobinLoadBalancer(ObjectProvider, String, int)}}
-	 * instead.
-	 */
-	@Deprecated
-	public RoundRobinLoadBalancer(String serviceId,
-			ObjectProvider<ServiceInstanceSupplier> serviceInstanceSupplier,
-			int seedPosition) {
-		this.serviceId = serviceId;
-		this.serviceInstanceSupplier = serviceInstanceSupplier;
-		this.position = new AtomicInteger(seedPosition);
-	}
-
 	@SuppressWarnings("rawtypes")
 	@Override
 	// see original
 	// https://github.com/Netflix/ocelli/blob/master/ocelli-core/
 	// src/main/java/netflix/ocelli/loadbalancer/RoundRobinLoadBalancer.java
 	public Mono<Response<ServiceInstance>> choose(Request request) {
-		// TODO: move supplier to Request?
-		// Temporary conditional logic till deprecated members are removed.
-		if (serviceInstanceListSupplierProvider != null) {
-			ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider
-					.getIfAvailable(NoopServiceInstanceListSupplier::new);
-			return supplier.get().next().map(this::getInstanceResponse);
-		}
-		ServiceInstanceSupplier supplier = this.serviceInstanceSupplier
-				.getIfAvailable(NoopServiceInstanceSupplier::new);
-		return supplier.get().collectList().map(this::getInstanceResponse);
+		ServiceInstanceListSupplier supplier = serviceInstanceListSupplierProvider
+				.getIfAvailable(NoopServiceInstanceListSupplier::new);
+		return supplier.get().next().map(this::getInstanceResponse);
 	}
 
 	private Response<ServiceInstance> getInstanceResponse(