From ff0580ebb436ba64b7d5453ef77023a58d5c5ab4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 12 May 2026 11:58:44 -0700 Subject: [PATCH] Polish "Fix self-referential parentId in MappingsEndpoint" See gh-50373 --- .../boot/actuate/web/mappings/MappingsEndpoint.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java index 062b66c68e9..119c5a4b7cf 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/MappingsEndpoint.java @@ -29,6 +29,7 @@ import org.springframework.context.ApplicationContext; * {@link Endpoint @Endpoint} to expose HTTP request mappings. * * @author Andy Wilkinson + * @author Lee JiWon * @since 2.0.0 */ @Endpoint(id = "mappings") @@ -58,8 +59,8 @@ public class MappingsEndpoint { Map mappings = new HashMap<>(); this.descriptionProviders.forEach( (provider) -> mappings.put(provider.getMappingName(), provider.describeMappings(applicationContext))); - return new ContextMappingsDescriptor(mappings, - (applicationContext.getParent() != null) ? applicationContext.getParent().getId() : null); + ApplicationContext parent = applicationContext.getParent(); + return new ContextMappingsDescriptor(mappings, (parent != null) ? parent.getId() : null); } /**