From b45bfa2c248623c1000d9a0899ef302b99972d50 Mon Sep 17 00:00:00 2001
From: Adrian Cole <acole@pivotal.io>
Date: Wed, 13 Jan 2016 12:01:06 +0800
Subject: [PATCH] Adds notes about fields in types explicitly new'ed

---
 .../cloud/sleuth/stream/DiscoveryClientHostLocator.java     | 2 ++
 .../cloud/sleuth/stream/ServerPropertiesHostLocator.java    | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/DiscoveryClientHostLocator.java b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/DiscoveryClientHostLocator.java
index 04c18558f..d22c21a10 100644
--- a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/DiscoveryClientHostLocator.java
+++ b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/DiscoveryClientHostLocator.java
@@ -21,6 +21,7 @@ import java.net.InetAddress;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.sleuth.Span;
+import org.springframework.util.Assert;
 
 /**
  * An {@link HostLocator} that tries to find local service information from a
@@ -35,6 +36,7 @@ public class DiscoveryClientHostLocator implements HostLocator {
 
 	public DiscoveryClientHostLocator(DiscoveryClient client) {
 		this.client = client;
+		Assert.notNull(this.client, "client");
 	}
 
 	@Override
diff --git a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/ServerPropertiesHostLocator.java b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/ServerPropertiesHostLocator.java
index 8f3d85272..c3ea0984e 100644
--- a/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/ServerPropertiesHostLocator.java
+++ b/spring-cloud-sleuth-stream/src/main/java/org/springframework/cloud/sleuth/stream/ServerPropertiesHostLocator.java
@@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
 import org.springframework.cloud.sleuth.Span;
 import org.springframework.context.event.EventListener;
+import org.springframework.util.Assert;
 
 /**
  * @author Dave Syer
@@ -27,14 +28,15 @@ import org.springframework.context.event.EventListener;
  */
 public class ServerPropertiesHostLocator implements HostLocator {
 
-	private final ServerProperties serverProperties;
+	private final ServerProperties serverProperties; // Nullable
 	private final String appName;
-	private Integer port;
+	private Integer port; // Lazy assigned
 
 	public ServerPropertiesHostLocator(ServerProperties serverProperties,
 			String appName) {
 		this.serverProperties = serverProperties;
 		this.appName = appName;
+		Assert.notNull(this.appName, "appName");
 	}
 
 	@Override