From 1c1b963862d5122c2ceca0db1a04e539f60200b3 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Thu, 29 Mar 2018 09:57:05 +0200
Subject: [PATCH] Polish

---
 ...ZipkinRestTemplateSenderConfiguration.java | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
index f31aed60a..3ba24e0c2 100644
--- a/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
+++ b/spring-cloud-sleuth-zipkin/src/main/java/org/springframework/cloud/sleuth/zipkin2/sender/ZipkinRestTemplateSenderConfiguration.java
@@ -43,32 +43,40 @@ class ZipkinRestTemplateSenderConfiguration {
 
 	@Configuration
 	@ConditionalOnMissingClass("org.springframework.cloud.client.loadbalancer.LoadBalancerClient")
-	@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false")
 	static class DefaultZipkinUrlExtractorConfiguration {
 		@Autowired(required = false) LoadBalancerClient client;
 
 		@Bean
 		@ConditionalOnMissingBean
 		ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
-			return new ZipkinLoadBalancer() {
-				@Override public URI instance() {
-					return URI.create(zipkinProperties.getBaseUrl());
-				}
-			};
+			return new NoOpZipkinLoadBalancer(zipkinProperties);
 		}
 	}
 
 	@Configuration
 	@ConditionalOnClass(LoadBalancerClient.class)
-	@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true)
 	static class DiscoveryClientZipkinUrlExtractorConfiguration {
 
-		@Autowired(required = false) LoadBalancerClient client;
+		@Configuration
+		@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "true", matchIfMissing = true)
+		static class ZipkinClientLoadBalancedConfiguration {
+			@Autowired(required = false) LoadBalancerClient client;
 
-		@Bean
-		@ConditionalOnMissingBean
-		ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(ZipkinProperties zipkinProperties) {
-			return new LoadBalancerClientZipkinLoadBalancer(this.client, zipkinProperties);
+			@Bean
+			@ConditionalOnMissingBean
+			ZipkinLoadBalancer loadBalancerClientZipkinLoadBalancer(ZipkinProperties zipkinProperties) {
+				return new LoadBalancerClientZipkinLoadBalancer(this.client, zipkinProperties);
+			}
+		}
+
+		@Configuration
+		@ConditionalOnProperty(value = "spring.zipkin.discoveryClientEnabled", havingValue = "false")
+		static class ZipkinClientNoOpConfiguration {
+			@Bean
+			@ConditionalOnMissingBean
+			ZipkinLoadBalancer noOpLoadBalancer(final ZipkinProperties zipkinProperties) {
+				return new NoOpZipkinLoadBalancer(zipkinProperties);
+			}
 		}
 	}
 
@@ -133,3 +141,16 @@ class ZipkinRestTemplateWrapper extends RestTemplate {
 interface ZipkinUrlExtractor {
 	URI zipkinUrl(ZipkinProperties zipkinProperties);
 }
+
+class NoOpZipkinLoadBalancer implements ZipkinLoadBalancer {
+
+	private final ZipkinProperties zipkinProperties;
+
+	NoOpZipkinLoadBalancer(ZipkinProperties zipkinProperties) {
+		this.zipkinProperties = zipkinProperties;
+	}
+
+	@Override public URI instance() {
+		return URI.create(this.zipkinProperties.getBaseUrl());
+	}
+}
\ No newline at end of file