update the format

Author: polarbear567

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/system/DiskSpaceHealthIndicatorProperties.java

@@ -59,6 +59,7 @@ public void setPath(List<File> path) {
 			Assert.isTrue(filePath.exists(), () -> "Path '" + filePath + "' does not exist");
 			Assert.isTrue(filePath.canRead(), () -> "Path '" + filePath + "' cannot be read");
 		});
+		path.add(0, new File("."));
 		this.path = path;
 	}
 

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

@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.system;
 
 import java.io.File;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -29,6 +28,7 @@
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.actuate.health.Status;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.unit.DataSize;
 
 /**
@@ -63,7 +63,7 @@ public DiskSpaceHealthIndicator(List<File> path, DataSize threshold) {
 	@Override
 	protected void doHealthCheck(Health.Builder builder) throws Exception {
 		boolean status = true;
-		Map<File, Long> diskFreeInBytesMap = new HashMap<>();
+		Map<File, Long> diskFreeInBytesMap = new LinkedHashMap<>();
 		for (File file : this.path) {
 			long diskFreeInBytes = file.getUsableSpace();
 			diskFreeInBytesMap.put(file, diskFreeInBytes);
@@ -74,19 +74,25 @@ protected void doHealthCheck(Health.Builder builder) throws Exception {
 				status = false;
 			}
 		}
-
 		if (status) {
 			builder.up();
 		}
-
 		Map<String, Map<String, Long>> details = new LinkedHashMap<>();
 		diskFreeInBytesMap.forEach((file, diskFreeInBytes) -> {
-			Map<String, Long> detail = new LinkedHashMap<>();
-			detail.put("total", file.getTotalSpace());
-			detail.put("free", diskFreeInBytes);
-			details.put(file.getPath(), detail);
+			if (".".equals(file.getPath())) {
+				builder.withDetail("total", file.getTotalSpace()).withDetail("free", diskFreeInBytes)
+						.withDetail("threshold", this.threshold.toBytes());
+			}
+			else {
+				Map<String, Long> detail = new LinkedHashMap<>();
+				detail.put("total", file.getTotalSpace());
+				detail.put("free", diskFreeInBytes);
+				details.put(file.getPath(), detail);
+			}
 		});
-		builder.withDetails(details).withDetail("threshold", this.threshold.toBytes());
+		if (!CollectionUtils.isEmpty(details)) {
+			builder.withDetail("paths", details);
+		}
 	}
 
 }

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/system/DiskSpaceHealthIndicatorTests.java

@@ -69,7 +69,6 @@ void setUp() {
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void diskSpaceIsUp() {
 		long freeSpace = THRESHOLD.toBytes() + 10;
 		this.fileMocks.forEach((fileMock) -> {
@@ -78,14 +77,12 @@ void diskSpaceIsUp() {
 			Health health = this.healthIndicator.health();
 			assertThat(health.getStatus()).isEqualTo(Status.UP);
 			assertThat(health.getDetails().get("threshold")).isEqualTo(THRESHOLD.toBytes());
-			Map<String, Long> details = (Map) health.getDetails().get(fileMock.getPath());
-			assertThat(details.get("free")).isEqualTo(freeSpace);
-			assertThat(details.get("total")).isEqualTo(TOTAL_SPACE.toBytes());
+			assertThat(health.getDetails().get("free")).isEqualTo(freeSpace);
+			assertThat(health.getDetails().get("total")).isEqualTo(TOTAL_SPACE.toBytes());
 		});
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
 	void diskSpaceIsDown() {
 		long freeSpace = THRESHOLD.toBytes() - 10;
 		this.fileMocks.forEach((fileMock) -> {
@@ -94,9 +91,8 @@ void diskSpaceIsDown() {
 			Health health = this.healthIndicator.health();
 			assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 			assertThat(health.getDetails().get("threshold")).isEqualTo(THRESHOLD.toBytes());
-			Map<String, Long> details = (Map) health.getDetails().get(fileMock.getPath());
-			assertThat(details.get("free")).isEqualTo(freeSpace);
-			assertThat(details.get("total")).isEqualTo(TOTAL_SPACE.toBytes());
+			assertThat(health.getDetails().get("free")).isEqualTo(freeSpace);
+			assertThat(health.getDetails().get("total")).isEqualTo(TOTAL_SPACE.toBytes());
 		});
 	}