Merge branch '1.4.x' into 1.5.x

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ShellProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -120,7 +120,7 @@ public class ShellProperties {
 	}
 
 	public void setDisabledCommands(String[] disabledCommands) {
-		Assert.notEmpty(disabledCommands);
+		Assert.notEmpty(disabledCommands, "disabledCommands must not be empty");
 		this.disabledCommands = disabledCommands;
 	}
 
@@ -129,7 +129,7 @@ public class ShellProperties {
 	}
 
 	public void setDisabledPlugins(String[] disabledPlugins) {
-		Assert.notEmpty(disabledPlugins);
+		Assert.notEmpty(disabledPlugins, "disabledPlugins must not be empty");
 		this.disabledPlugins = disabledPlugins;
 	}
 

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/statsd/StatsdMetricWriter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -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;
 	}
 

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/trace/WebRequestTraceFilterTests.java

@@ -244,7 +244,6 @@ public class WebRequestTraceFilterTests {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	public void filterAddsTimeTaken() throws Exception {
 		MockHttpServletRequest request = spy(new MockHttpServletRequest("GET", "/foo"));
 		MockHttpServletResponse response = new MockHttpServletResponse();