Skip to content

Commit 5ec68bb

Browse files
Cosimo Damiano PreteCosimo Damiano Prete
authored andcommitted
fix(#5525): Make StatusInfo payload respect the sorting coming from the health payload for the provided details
1 parent 9dd5a52 commit 5ec68bb

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/StatusInfo.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import java.io.Serializable;
2020
import java.util.Collections;
2121
import java.util.Comparator;
22-
import java.util.HashMap;
22+
import java.util.LinkedHashMap;
2323
import java.util.List;
2424
import java.util.Map;
2525

@@ -58,7 +58,7 @@ public final class StatusInfo implements Serializable {
5858
private StatusInfo(String status, @Nullable Map<String, ?> details) {
5959
Assert.hasText(status, "'status' must not be empty.");
6060
this.status = status.toUpperCase();
61-
this.details = (details != null) ? new HashMap<>(details) : Collections.emptyMap();
61+
this.details = (details != null && !details.isEmpty()) ? new LinkedHashMap<>(details) : Collections.emptyMap();
6262
}
6363

6464
public static StatusInfo valueOf(String statusCode, @Nullable Map<String, ?> details) {

spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/notify/MailNotifierTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.io.IOException;
2121
import java.nio.charset.StandardCharsets;
2222
import java.util.HashMap;
23+
import java.util.LinkedHashMap;
2324
import java.util.Map;
2425
import java.util.Properties;
2526

@@ -93,7 +94,7 @@ void setup() {
9394

9495
@Test
9596
void should_send_mail_using_default_template() throws IOException, MessagingException {
96-
Map<String, Object> details = new HashMap<>();
97+
Map<String, Object> details = new LinkedHashMap<>();
9798
details.put("Simple Value", 1234);
9899
details.put("Complex Value", singletonMap("Nested Simple Value", "99!"));
99100

0 commit comments

Comments
 (0)