Drop legacy DisposableBean declaration on AbstractApplicationContext

Issue: SPR-15154
This commit is contained in:
Juergen Hoeller
2017-07-07 20:50:35 +02:00
parent 6d55b3a592
commit e7b77cb2b6
2 changed files with 10 additions and 10 deletions

View File

@@ -34,7 +34,6 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.beans.BeansException;
import org.springframework.beans.CachedIntrospectionResults;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -124,7 +123,7 @@ import org.springframework.util.ReflectionUtils;
* @see org.springframework.context.MessageSource
*/
public abstract class AbstractApplicationContext extends DefaultResourceLoader
implements ConfigurableApplicationContext, DisposableBean {
implements ConfigurableApplicationContext {
/**
* Name of the MessageSource bean in the factory.
@@ -940,12 +939,13 @@ public abstract class AbstractApplicationContext extends DefaultResourceLoader
}
/**
* DisposableBean callback for destruction of this instance.
* Callback for destruction of this instance, originally attached
* to a {@code DisposableBean} implementation (not anymore in 5.0).
* <p>The {@link #close()} method is the native way to shut down
* an ApplicationContext, which this method simply delegates to.
* @see #close()
* @deprecated as of Spring Framework 5.0, in favor of {@link #close()}
*/
@Override
@Deprecated
public void destroy() {
close();
}