Skip to content

Commit 3ecbbce

Browse files
philwebbwilkinsona
authored andcommitted
Order endpoint properties alphabetically
Closes gh-46227
1 parent b19403c commit 3ecbbce

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jackson/JacksonEndpointAutoConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.boot.actuate.autoconfigure.endpoint.jackson;
1818

1919
import com.fasterxml.jackson.annotation.JsonInclude.Include;
20+
import com.fasterxml.jackson.databind.MapperFeature;
2021
import com.fasterxml.jackson.databind.ObjectMapper;
2122
import com.fasterxml.jackson.databind.SerializationFeature;
2223

@@ -43,6 +44,7 @@ public class JacksonEndpointAutoConfiguration {
4344
@ConditionalOnClass({ ObjectMapper.class, Jackson2ObjectMapperBuilder.class })
4445
public EndpointObjectMapper endpointObjectMapper() {
4546
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()
47+
.featuresToEnable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
4648
.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS,
4749
SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS)
4850
.serializationInclusion(Include.NON_NULL)

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-actuator/src/test/java/smoketest/actuator/AbstractManagementPortAndPathSampleActuatorApplicationTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void testHealth() {
6767
ResponseEntity<String> entity = new TestRestTemplate().withBasicAuth("user", "password")
6868
.getForEntity("http://localhost:" + this.managementPort + "/admin/health", String.class);
6969
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
70-
assertThat(entity.getBody()).isEqualTo("{\"status\":\"UP\",\"groups\":[\"comp\",\"live\",\"ready\"]}");
70+
assertThat(entity.getBody()).isEqualTo("{\"groups\":[\"comp\",\"live\",\"ready\"],\"status\":\"UP\"}");
7171
}
7272

7373
@Test
@@ -76,7 +76,7 @@ void testGroupWithComposite() {
7676
.getForEntity("http://localhost:" + this.managementPort + "/admin/health/comp", String.class);
7777
assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK);
7878
assertThat(entity.getBody()).contains(
79-
"components\":{\"a\":{\"status\":\"UP\",\"details\":{\"hello\":\"spring-a\"}},\"c\":{\"status\":\"UP\",\"details\":{\"hello\":\"spring-c\"}}");
79+
"components\":{\"a\":{\"details\":{\"hello\":\"spring-a\"},\"status\":\"UP\"},\"c\":{\"details\":{\"hello\":\"spring-c\"},\"status\":\"UP\"}}");
8080
}
8181

8282
@Test

0 commit comments

Comments
 (0)