Merge branch '1.4.x' into 1.5.x

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/CachePublicMetrics.java

@@ -45,10 +45,19 @@ public class CachePublicMetrics implements PublicMetrics {
 	@Autowired
 	private Collection<CacheStatisticsProvider<?>> statisticsProviders;
 
+	/**
+	 * Create a new {@link CachePublicMetrics} instance.
+	 * @deprecated as of 1.5.4 in favor of {@link #CachePublicMetrics(Map, Collection)}
+	 */
 	@Deprecated
 	public CachePublicMetrics() {
 	}
 
+	/**
+	 * Create a new {@link CachePublicMetrics} instance.
+	 * @param cacheManagers the cache managers
+	 * @param statisticsProviders the statistics providers
+	 */
 	public CachePublicMetrics(Map<String, CacheManager> cacheManagers,
 			Collection<CacheStatisticsProvider<?>> statisticsProviders) {
 		this.cacheManagers = cacheManagers;

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/CachePublicMetricsTests.java

@@ -78,7 +78,6 @@ public class CachePublicMetricsTests {
 				entry("cache.anotherCacheManager_foo.size", 0L));
 	}
 
-
 	private Map<String, Number> metrics(CachePublicMetrics cpm) {
 		Collection<Metric<?>> metrics = cpm.metrics();
 		assertThat(metrics).isNotNull();