Commit 850088de authored by Phillip Webb's avatar Phillip Webb

Merge branch '2.4.x'

Closes gh-26823
parents f798f265 d5264664
...@@ -66,7 +66,7 @@ public class CompositeHealth extends HealthComponent { ...@@ -66,7 +66,7 @@ public class CompositeHealth extends HealthComponent {
@JsonInclude(Include.NON_EMPTY) @JsonInclude(Include.NON_EMPTY)
@JsonProperty @JsonProperty
Map<String, HealthComponent> getDetails() { public Map<String, HealthComponent> getDetails() {
return this.details; return this.details;
} }
......
...@@ -20,6 +20,7 @@ import java.util.Collections; ...@@ -20,6 +20,7 @@ import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -80,4 +81,17 @@ class CompositeHealthTests { ...@@ -80,4 +81,17 @@ class CompositeHealthTests {
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}"); + "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}");
} }
@Test // gh-26797
void serializeV2WithJacksonAndDisabledCanOverrideAccessModifiersReturnsValidJson() throws Exception {
Map<String, HealthComponent> components = new LinkedHashMap<>();
components.put("db1", Health.up().build());
components.put("db2", Health.down().withDetail("a", "b").build());
CompositeHealth health = new CompositeHealth(ApiVersion.V2, Status.UP, components);
ObjectMapper mapper = new ObjectMapper();
mapper.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
String json = mapper.writeValueAsString(health);
assertThat(json).isEqualTo("{\"status\":\"UP\",\"details\":{\"db1\":{\"status\":\"UP\"},"
+ "\"db2\":{\"status\":\"DOWN\",\"details\":{\"a\":\"b\"}}}}");
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment