Skip to content

Commit bd10b7a

Browse files
committed
Remove javadoc references to deprecated PropertiesBeanDefinitionReader
Closes gh-35836 (cherry picked from commit 35b8fbf)
1 parent e428817 commit bd10b7a

File tree

6 files changed

+6
-13
lines changed

6 files changed

+6
-13
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
* @author Juergen Hoeller
3333
* @author Rob Harrop
3434
* @since 1.1
35-
* @see PropertiesBeanDefinitionReader
3635
* @see org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader
3736
*/
3837
public abstract class BeanDefinitionReaderUtils {

spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
* @see DefaultListableBeanFactory
4444
* @see org.springframework.context.support.GenericApplicationContext
4545
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
46-
* @see PropertiesBeanDefinitionReader
4746
*/
4847
public interface BeanDefinitionRegistry extends AliasRegistry {
4948

spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
* @author Rob Harrop
7575
* @since 26.11.2003
7676
* @see DefaultListableBeanFactory
77-
* @deprecated as of 5.3, in favor of Spring's common bean definition formats
78-
* and/or custom reader implementations
77+
* @deprecated in favor of Spring's common bean definition formats and/or
78+
* custom BeanDefinitionReader implementations
7979
*/
80-
@Deprecated
80+
@Deprecated(since = "5.3")
8181
public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader {
8282

8383
/**

spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ protected void customizeBeanFactory(DefaultListableBeanFactory beanFactory) {
227227
* @param beanFactory the bean factory to load bean definitions into
228228
* @throws BeansException if parsing of the bean definitions failed
229229
* @throws IOException if loading of bean definition files failed
230-
* @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader
231230
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
232231
*/
233232
protected abstract void loadBeanDefinitions(DefaultListableBeanFactory beanFactory)

spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@
7878
* GenericApplicationContext ctx = new GenericApplicationContext();
7979
* XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
8080
* xmlReader.loadBeanDefinitions(new ClassPathResource("applicationContext.xml"));
81-
* PropertiesBeanDefinitionReader propReader = new PropertiesBeanDefinitionReader(ctx);
82-
* propReader.loadBeanDefinitions(new ClassPathResource("otherBeans.properties"));
8381
* ctx.refresh();
8482
*
8583
* MyBean myBean = (MyBean) ctx.getBean("myBean");
@@ -101,7 +99,6 @@
10199
* @see #registerBeanDefinition
102100
* @see #refresh()
103101
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
104-
* @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader
105102
*/
106103
public class GenericApplicationContext extends AbstractApplicationContext implements BeanDefinitionRegistry {
107104

spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,10 @@
4040
* @author Rod Johnson
4141
* @author Juergen Hoeller
4242
* @see #loadBeanDefinitions
43-
* @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader
44-
* @deprecated as of 5.3, in favor of Spring's common bean definition formats
45-
* and/or custom reader implementations
43+
* @deprecated in favor of Spring's common bean definition formats and/or
44+
* custom BeanDefinitionReader implementations
4645
*/
47-
@Deprecated
46+
@Deprecated(since = "5.3")
4847
public class JdbcBeanDefinitionReader {
4948

5049
private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader;

0 commit comments

Comments
 (0)