From 489336255a5f5d86d22fe4e67876f9844ae320b5 Mon Sep 17 00:00:00 2001 From: Moritz Halbritter Date: Mon, 6 Oct 2025 12:28:30 +0200 Subject: [PATCH] Add nullability annotations to tests in module/spring-boot-ldap See gh-47263 --- module/spring-boot-ldap/build.gradle | 8 ++++++++ .../embedded/EmbeddedLdapAutoConfigurationTests.java | 8 +++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/module/spring-boot-ldap/build.gradle b/module/spring-boot-ldap/build.gradle index fb35c08ae4f..6619f3879b7 100644 --- a/module/spring-boot-ldap/build.gradle +++ b/module/spring-boot-ldap/build.gradle @@ -51,3 +51,11 @@ dependencies { testRuntimeOnly("ch.qos.logback:logback-classic") testRuntimeOnly("org.apache.commons:commons-pool2") } + +tasks.named("compileTestJava") { + options.nullability.checking = "tests" +} + +tasks.named("compileDockerTestJava") { + options.nullability.checking = "tests" +} diff --git a/module/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java b/module/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java index 581ab966f8c..14b4d020638 100644 --- a/module/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java +++ b/module/spring-boot-ldap/src/test/java/org/springframework/boot/ldap/autoconfigure/embedded/EmbeddedLdapAutoConfigurationTests.java @@ -26,6 +26,7 @@ import com.unboundid.ldap.sdk.BindResult; import com.unboundid.ldap.sdk.DN; import com.unboundid.ldap.sdk.LDAPConnection; import com.unboundid.ldap.sdk.LDAPException; +import com.unboundid.ldap.sdk.schema.Schema; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Value; @@ -173,9 +174,10 @@ class EmbeddedLdapAutoConfigurationTests { "spring.ldap.embedded.base-dn:dc=spring,dc=org") .run((context) -> { InMemoryDirectoryServer server = context.getBean(InMemoryDirectoryServer.class); - - assertThat(server.getSchema().getObjectClass("exampleAuxiliaryClass")).isNotNull(); - assertThat(server.getSchema().getAttributeType("exampleAttributeName")).isNotNull(); + Schema schema = server.getSchema(); + assertThat(schema).isNotNull(); + assertThat(schema.getObjectClass("exampleAuxiliaryClass")).isNotNull(); + assertThat(schema.getAttributeType("exampleAttributeName")).isNotNull(); }); }