Browse Source

Remove javadoc references to deprecated PropertiesBeanDefinitionReader

Closes gh-35836

(cherry picked from commit 35b8fbf901)
pull/35859/head
Juergen Hoeller 4 weeks ago
parent
commit
bd10b7ae06
  1. 1
      spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionReaderUtils.java
  2. 1
      spring-beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionRegistry.java
  3. 6
      spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
  4. 1
      spring-context/src/main/java/org/springframework/context/support/AbstractRefreshableApplicationContext.java
  5. 3
      spring-context/src/main/java/org/springframework/context/support/GenericApplicationContext.java
  6. 7
      spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcBeanDefinitionReader.java

1
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 Juergen Hoeller
* @author Rob Harrop * @author Rob Harrop
* @since 1.1 * @since 1.1
* @see PropertiesBeanDefinitionReader
* @see org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader * @see org.springframework.beans.factory.xml.DefaultBeanDefinitionDocumentReader
*/ */
public abstract class BeanDefinitionReaderUtils { public abstract class BeanDefinitionReaderUtils {

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

@ -43,7 +43,6 @@ import org.springframework.core.AliasRegistry;
* @see DefaultListableBeanFactory * @see DefaultListableBeanFactory
* @see org.springframework.context.support.GenericApplicationContext * @see org.springframework.context.support.GenericApplicationContext
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
* @see PropertiesBeanDefinitionReader
*/ */
public interface BeanDefinitionRegistry extends AliasRegistry { public interface BeanDefinitionRegistry extends AliasRegistry {

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

@ -74,10 +74,10 @@ import org.springframework.util.StringUtils;
* @author Rob Harrop * @author Rob Harrop
* @since 26.11.2003 * @since 26.11.2003
* @see DefaultListableBeanFactory * @see DefaultListableBeanFactory
* @deprecated as of 5.3, in favor of Spring's common bean definition formats * @deprecated in favor of Spring's common bean definition formats and/or
* and/or custom reader implementations * custom BeanDefinitionReader implementations
*/ */
@Deprecated @Deprecated(since = "5.3")
public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader { public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader {
/** /**

1
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 * @param beanFactory the bean factory to load bean definitions into
* @throws BeansException if parsing of the bean definitions failed * @throws BeansException if parsing of the bean definitions failed
* @throws IOException if loading of bean definition files failed * @throws IOException if loading of bean definition files failed
* @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
*/ */
protected abstract void loadBeanDefinitions(DefaultListableBeanFactory beanFactory) protected abstract void loadBeanDefinitions(DefaultListableBeanFactory beanFactory)

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

@ -78,8 +78,6 @@ import org.springframework.util.Assert;
* GenericApplicationContext ctx = new GenericApplicationContext(); * GenericApplicationContext ctx = new GenericApplicationContext();
* XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx); * XmlBeanDefinitionReader xmlReader = new XmlBeanDefinitionReader(ctx);
* xmlReader.loadBeanDefinitions(new ClassPathResource("applicationContext.xml")); * xmlReader.loadBeanDefinitions(new ClassPathResource("applicationContext.xml"));
* PropertiesBeanDefinitionReader propReader = new PropertiesBeanDefinitionReader(ctx);
* propReader.loadBeanDefinitions(new ClassPathResource("otherBeans.properties"));
* ctx.refresh(); * ctx.refresh();
* *
* MyBean myBean = (MyBean) ctx.getBean("myBean"); * MyBean myBean = (MyBean) ctx.getBean("myBean");
@ -101,7 +99,6 @@ import org.springframework.util.Assert;
* @see #registerBeanDefinition * @see #registerBeanDefinition
* @see #refresh() * @see #refresh()
* @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader * @see org.springframework.beans.factory.xml.XmlBeanDefinitionReader
* @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader
*/ */
public class GenericApplicationContext extends AbstractApplicationContext implements BeanDefinitionRegistry { public class GenericApplicationContext extends AbstractApplicationContext implements BeanDefinitionRegistry {

7
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 Rod Johnson
* @author Juergen Hoeller * @author Juergen Hoeller
* @see #loadBeanDefinitions * @see #loadBeanDefinitions
* @see org.springframework.beans.factory.support.PropertiesBeanDefinitionReader * @deprecated in favor of Spring's common bean definition formats and/or
* @deprecated as of 5.3, in favor of Spring's common bean definition formats * custom BeanDefinitionReader implementations
* and/or custom reader implementations
*/ */
@Deprecated @Deprecated(since = "5.3")
public class JdbcBeanDefinitionReader { public class JdbcBeanDefinitionReader {
private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader; private final org.springframework.beans.factory.support.PropertiesBeanDefinitionReader propReader;

Loading…
Cancel
Save