From 024f4211703a8b6ce0ab46375769fa2294c56d3e Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Mon, 7 Apr 2025 14:19:51 +0200 Subject: [PATCH] =?UTF-8?q?Switch=20to=20JSpecify=20@=E2=81=A0Nullable=20a?= =?UTF-8?q?nnotation=20on=20main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See gh-34726 --- .../test/context/bean/override/BeanOverrideRegistry.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideRegistry.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideRegistry.java index d9c6deb644..96c4b2ced7 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideRegistry.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/BeanOverrideRegistry.java @@ -23,9 +23,9 @@ import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jspecify.annotations.Nullable; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** @@ -114,8 +114,7 @@ class BeanOverrideRegistry { * @since 6.2.6 * @see #registerBeanOverrideHandler(BeanOverrideHandler, String) */ - @Nullable - Object getBeanForHandler(BeanOverrideHandler handler, Class requiredType) { + @Nullable Object getBeanForHandler(BeanOverrideHandler handler, Class requiredType) { String beanName = this.handlerToBeanNameMap.get(handler); if (beanName != null) { return this.beanFactory.getBean(beanName, requiredType);