Skip to content

fix(#5525): Make StatusInfo payload respect the sorting coming from the health payload for the provided details #5526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdprete wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(#5525): Make StatusInfo payload respect the sorting coming from the health payload for the provided details #5526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/StatusInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.Serializable;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

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

public static StatusInfo valueOf(String statusCode, @Nullable Map<String, ?> details) {
Expand Down
23 changes: 19 additions & 4 deletions ...n-server/src/test/java/de/codecentric/boot/admin/server/domain/values/StatusInfoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@
package de.codecentric.boot.admin.server.domain.values;

import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static de.codecentric.boot.admin.server.domain.values.StatusInfo.STATUS_DOWN;
import static de.codecentric.boot.admin.server.domain.values.StatusInfo.STATUS_OFFLINE;
Expand Down Expand Up @@ -117,13 +120,25 @@ void factory_methods_with_details() {
assertThat(restricted.isRestricted()).isTrue();
}

@Test
void when_first_level_key_is_components() {
@ParameterizedTest
@ValueSource(strings = { "components", "details" })
void when_first_level_key_expected_nested_details(String key) {
Map<String, Object> details = singletonMap("foo", "bar");
Map<String, Object> map = new HashMap<>();
map.put("status", "UP");
map.put("components", singletonMap("foo", "bar"));
map.put(key, details);

assertThat(StatusInfo.from(map)).isEqualTo(StatusInfo.ofUp(singletonMap("foo", "bar")));
assertThat(StatusInfo.from(map)).isEqualTo(StatusInfo.ofUp(details));
}

@Test
void should_preserve_details_order() {
Map<String, Object> details = new LinkedHashMap<>();
details.put("a", "x");
details.put("c", "z");
details.put("b", "y");

assertThat(StatusInfo.valueOf("UP", details).getDetails()).isEqualTo(details);
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions ...-admin-server/src/test/java/de/codecentric/boot/admin/server/notify/MailNotifierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;

Expand Down Expand Up @@ -93,9 +93,9 @@ void setup() {

@Test
void should_send_mail_using_default_template() throws IOException, MessagingException {
Map<String, Object> details = new HashMap<>();
details.put("Simple Value", 1234);
Map<String, Object> details = new LinkedHashMap<>();
details.put("Complex Value", singletonMap("Nested Simple Value", "99!"));
details.put("Simple Value", 1234);

StepVerifier.create(notifier.notify(
new InstanceStatusChangedEvent(instance.getId(), instance.getVersion(), StatusInfo.ofDown(details))))
Expand Down