From 7f39d5a865998789c8ecdb64ff3e867b6165dd9a Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@pivotal.io>
Date: Tue, 31 Jan 2017 00:46:40 +0100
Subject: [PATCH] Remove usage of Assert.notNull(Object)

This commit updates the Spring Boot codebase to adapt to the removal of
`Assert.notNull(Object)` in SPR-15196.

See gh-8140
---
 .../boot/actuate/metrics/statsd/StatsdMetricWriter.java       | 2 +-
 .../condition/ConditionalOnMissingBeanTests.java              | 4 ++--
 .../boot/bind/PropertiesConfigurationFactory.java             | 4 ++--
 .../springframework/boot/bind/YamlConfigurationFactory.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java
index 292dd46b5b2..004c8d2306e 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java
@@ -72,7 +72,7 @@ public class StatsdMetricWriter implements MetricWriter, Closeable {
 	 * @param client StatsD client to write metrics with
 	 */
 	public StatsdMetricWriter(StatsDClient client) {
-		Assert.notNull(client);
+		Assert.notNull(client, "Client must not be null");
 		this.client = client;
 	}
 
diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
index 090bb1067ec..ae3f8a51df9 100644
--- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
+++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java
@@ -580,7 +580,7 @@ public class ConditionalOnMissingBeanTests {
 	public static class ExampleFactoryBean implements FactoryBean<ExampleBean> {
 
 		public ExampleFactoryBean(String value) {
-			Assert.state(!value.contains("$"));
+			Assert.state(!value.contains("$"), "value should not contain '$'");
 		}
 
 		@Override
@@ -603,7 +603,7 @@ public class ConditionalOnMissingBeanTests {
 	public static class NonspecificFactoryBean implements FactoryBean<Object> {
 
 		public NonspecificFactoryBean(String value) {
-			Assert.state(!value.contains("$"));
+			Assert.state(!value.contains("$"), "value should not contain '$'");
 		}
 
 		@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
index 68212b6d24f..79bab599757 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/PropertiesConfigurationFactory.java
@@ -89,7 +89,7 @@ public class PropertiesConfigurationFactory<T>
 	 * @see #PropertiesConfigurationFactory(Class)
 	 */
 	public PropertiesConfigurationFactory(T target) {
-		Assert.notNull(target);
+		Assert.notNull(target, "Target object must not be null");
 		this.target = target;
 	}
 
@@ -100,7 +100,7 @@ public class PropertiesConfigurationFactory<T>
 	 */
 	@SuppressWarnings("unchecked")
 	public PropertiesConfigurationFactory(Class<?> type) {
-		Assert.notNull(type);
+		Assert.notNull(type, "Target type must not be null");
 		this.target = (T) BeanUtils.instantiateClass(type);
 	}
 
diff --git a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
index 8311e96d3f2..fc27b860db3 100644
--- a/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
+++ b/spring-boot/src/main/java/org/springframework/boot/bind/YamlConfigurationFactory.java
@@ -73,7 +73,7 @@ public class YamlConfigurationFactory<T>
 	 * @param type the root type
 	 */
 	public YamlConfigurationFactory(Class<?> type) {
-		Assert.notNull(type);
+		Assert.notNull(type, "Root type must not be null");
 		this.type = type;
 	}