From bd10b7ae0654d9e148c9c46ee27f5d9262ae6fd7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 19 Nov 2025 16:18:56 +0100 Subject: [PATCH] Remove javadoc references to deprecated PropertiesBeanDefinitionReader Closes gh-35836 (cherry picked from commit 35b8fbf90110d4705a9661cf64caa734592dc5c0) --- .../beans/factory/support/BeanDefinitionReaderUtils.java | 1 - .../beans/factory/support/BeanDefinitionRegistry.java | 1 - .../factory/support/PropertiesBeanDefinitionReader.java | 6 +++--- .../support/AbstractRefreshableApplicationContext.java | 1 - .../context/support/GenericApplicationContext.java | 3 --- .../jdbc/core/support/JdbcBeanDefinitionReader.java | 7 +++---- 6 files changed, 6 insertions(+), 13 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java index c183733e573..a7e0ad507c1 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java @@ -32,7 +32,6 @@ import org.springframework.util.StringUtils; * @author Juergen Hoeller * @author Rob Harrop * @since 1.1 - * @see PropertiesBeanDefinitionReader * @see org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader */ public abstract class BeanDefinitionReaderUtils { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java index b97d1fa7329..4381cf7e61a 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java @@ -43,7 +43,6 @@ import org.springframework.core.AliasRegistry; * @see DefaultListableBeanFactory * @see org.springframework.context.support.GenericApplicationContext * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader - * @see PropertiesBeanDefinitionReader */ public interface BeanDefinitionRegistry extends AliasRegistry { diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java index db4ea48a25d..f1afba74fc5 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java @@ -74,10 +74,10 @@ import org.springframework.util.StringUtils; * @author Rob Harrop * @since 26.11.2003 * @see DefaultListableBeanFactory - * @deprecated as of 5.3, in favor of Spring's common bean definition formats - * and/or custom reader implementations + * @deprecated in favor of Spring's common bean definition formats and/or + * custom BeanDefinitionReader implementations */ -@Deprecated +@Deprecated(since = "5.3") public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader { /** diff --git a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java index 249f0114713..1328c49726c 100644 --- a/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java @@ -227,7 +227,6 @@ public abstract class AbstractRefreshableApplicationContext extends AbstractAppl * @param beanFactory the bean factory to load bean definitions into * @throws BeansException if parsing of the bean definitions failed * @throws IOException if loading of bean definition files failed - * @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader */ protected abstract void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) diff --git a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java index e529204716e..2d60ea29b00 100644 --- a/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java +++ b/spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java @@ -78,8 +78,6 @@ import org.springframework.util.Assert; * GenericApplicationContext ctx = new GenericApplicationContext(); * XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx); * xmlReader.loadBeanDefinitions(new ClassPathResource("applicationContext.xml")); - * PropertiesBeanDefinitionReader propReader = new PropertiesBeanDefinitionReader(ctx); - * propReader.loadBeanDefinitions(new ClassPathResource("otherBeans.properties")); * ctx.refresh(); * * MyBean myBean = (MyBean) ctx.getBean("myBean"); @@ -101,7 +99,6 @@ import org.springframework.util.Assert; * @see #registerBeanDefinition * @see #refresh() * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader - * @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader */ public class GenericApplicationContext extends AbstractApplicationContext implements BeanDefinitionRegistry { diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java index 8ccbe581044..bcd1e80770e 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java @@ -40,11 +40,10 @@ import org.springframework.util.Assert; * @author Rod Johnson * @author Juergen Hoeller * @see #loadBeanDefinitions - * @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader - * @deprecated as of 5.3, in favor of Spring's common bean definition formats - * and/or custom reader implementations + * @deprecated in favor of Spring's common bean definition formats and/or + * custom BeanDefinitionReader implementations */ -@Deprecated +@Deprecated(since = "5.3") public class JdbcBeanDefinitionReader { private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader;