Merge branch '1.5.x'

Author: snicoll

spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java

@@ -46,7 +46,7 @@ public DiskSpaceHealthIndicator(DiskSpaceHealthIndicatorProperties properties) {
 	@Override
 	protected void doHealthCheck(Health.Builder builder) throws Exception {
 		File path = this.properties.getPath();
-		long diskFreeInBytes = path.getFreeSpace();
+		long diskFreeInBytes = path.getUsableSpace();
 		if (diskFreeInBytes >= this.properties.getThreshold()) {
 			builder.up();
 		}

spring-boot-actuator/src/test/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorTests.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.
@@ -56,7 +56,7 @@ public void setUp() throws Exception {
 
 	@Test
 	public void diskSpaceIsUp() throws Exception {
-		given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES + 10);
+		given(this.fileMock.getUsableSpace()).willReturn(THRESHOLD_BYTES + 10);
 		given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
 		Health health = this.healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.UP);
@@ -67,7 +67,7 @@ public void diskSpaceIsUp() throws Exception {
 
 	@Test
 	public void diskSpaceIsDown() throws Exception {
-		given(this.fileMock.getFreeSpace()).willReturn(THRESHOLD_BYTES - 10);
+		given(this.fileMock.getUsableSpace()).willReturn(THRESHOLD_BYTES - 10);
 		given(this.fileMock.getTotalSpace()).willReturn(THRESHOLD_BYTES * 10);
 		Health health = this.healthIndicator.health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);