fix(#2068): polling health status does not include details (#2070)

codecentric · Jul 19, 2022 · 10d5c14 · 10d5c14
1 parent c7c20f0
commit 10d5c14
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/...admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/StatusInfo.java b/...admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/StatusInfo.java
@@ -124,7 +124,20 @@ public static Comparator<String> severity() {
 
 	@SuppressWarnings("unchecked")
 	public static StatusInfo from(Map<String, ?> body) {
-		return StatusInfo.valueOf((String) (body).get("status"), (Map<String, ?>) body.get("details"));
+		Map<String, ?> details = Collections.emptyMap();
+
+		/*
+		 * Key "details" is present when accessing Spring Boot Actuator Health
+		 * using Accept-Header {@link org.springframework.boot.actuate.endpoint.ApiVersion#V2}.
+		 */
+		if (body.containsKey("details")) {
+			details = (Map<String, ?>) body.get("details");
+		}
+		else if (body.containsKey("components")) {
+			details = (Map<String, ?>) body.get("components");
+		}
+
+		return StatusInfo.valueOf((String) body.get("status"), details);
 	}
 
 }
diff --git a/...n-server/src/test/java/de/codecentric/boot/admin/server/domain/values/StatusInfoTest.java b/...n-server/src/test/java/de/codecentric/boot/admin/server/domain/values/StatusInfoTest.java
@@ -79,6 +79,15 @@ public void from_map_should_return_same_result() {
 		assertThat(StatusInfo.from(map)).isEqualTo(StatusInfo.ofUp(singletonMap("foo", "bar")));
 	}
 
+	@Test
+	public void when_first_level_key_is_components() {
+		Map<String, Object> map = new HashMap<>();
+		map.put("status", "UP");
+		map.put("components", singletonMap("foo", "bar"));
+
+		assertThat(StatusInfo.from(map)).isEqualTo(StatusInfo.ofUp(singletonMap("foo", "bar")));
+	}
+
 	@Test
 	public void should_sort_by_status_order() {
 		List<String> unordered = asList(STATUS_OUT_OF_SERVICE, STATUS_UNKNOWN, STATUS_OFFLINE, STATUS_DOWN, STATUS_UP,