From 014bbcca82f462ada157ed242ee79310a3ca0ad8 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 25 Aug 2026 11:41:12 -0700 Subject: [PATCH] Polish LdapHealthIndicator See gh-51441 --- .../boot/ldap/health/LdapHealthIndicator.java | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/health/LdapHealthIndicator.java b/module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/health/LdapHealthIndicator.java index e25e4f69652..b2e03465d6b 100644 --- a/module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/health/LdapHealthIndicator.java +++ b/module/spring-boot-ldap/src/main/java/org/springframework/boot/ldap/health/LdapHealthIndicator.java @@ -16,9 +16,6 @@ package org.springframework.boot.ldap.health; -import javax.naming.NamingException; -import javax.naming.directory.DirContext; - import org.jspecify.annotations.Nullable; import org.springframework.boot.health.contributor.AbstractHealthIndicator; @@ -37,7 +34,8 @@ import org.springframework.util.Assert; */ public class LdapHealthIndicator extends AbstractHealthIndicator { - private static final ContextExecutor<@Nullable String> versionContextExecutor = new VersionContextExecutor(); + private static final ContextExecutor<@Nullable String> versionContextExecutor = ( + dirContext) -> (String) dirContext.getEnvironment().get("java.naming.ldap.version"); private final LdapOperations ldapOperations; @@ -49,24 +47,11 @@ public class LdapHealthIndicator extends AbstractHealthIndicator { @Override protected void doHealthCheck(Health.Builder builder) throws Exception { - String version = this.ldapOperations.executeReadOnly(versionContextExecutor); builder.up(); + String version = this.ldapOperations.executeReadOnly(versionContextExecutor); if (version != null) { builder.withDetail("version", version); } } - private static final class VersionContextExecutor implements ContextExecutor<@Nullable String> { - - @Override - public @Nullable String executeWithContext(DirContext ctx) throws NamingException { - Object version = ctx.getEnvironment().get("java.naming.ldap.version"); - if (version != null) { - return (String) version; - } - return null; - } - - } - }