Eventual removal of deprecated AbstractBeanConfigurerAspect, BeanReferenceFactoryBean and CommonsLogFactoryBean
This commit is contained in:
Juergen Hoeller
@@ -1,117 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2012 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.beans.factory.config;
|
||||
|
||||
import org.springframework.beans.BeansException;
|
||||
import org.springframework.beans.factory.BeanFactory;
|
||||
import org.springframework.beans.factory.BeanFactoryAware;
|
||||
import org.springframework.beans.factory.FactoryBeanNotInitializedException;
|
||||
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
|
||||
import org.springframework.beans.factory.SmartFactoryBean;
|
||||
|
||||
/**
|
||||
* FactoryBean that exposes an arbitrary target bean under a different name.
|
||||
*
|
||||
* <p>Usually, the target bean will reside in a different bean definition file,
|
||||
* using this FactoryBean to link it in and expose it under a different name.
|
||||
* Effectively, this corresponds to an alias for the target bean.
|
||||
*
|
||||
* <p><b>NOTE:</b> For XML bean definition files, an {@code <alias>}
|
||||
* tag is available that effectively achieves the same.
|
||||
*
|
||||
* <p>A special capability of this FactoryBean is enabled through its configuration
|
||||
* as bean definition: The "targetBeanName" can be substituted through a placeholder,
|
||||
* in combination with Spring's {@link PropertyPlaceholderConfigurer}.
|
||||
* Thanks to Marcus Bristav for pointing this out!
|
||||
*
|
||||
* @author Juergen Hoeller
|
||||
* @since 1.2
|
||||
* @see #setTargetBeanName
|
||||
* @see PropertyPlaceholderConfigurer
|
||||
* @deprecated as of Spring 3.2, in favor of using regular bean name aliases
|
||||
* (which support placeholder parsing since Spring 2.5)
|
||||
*/
|
||||
@Deprecated
|
||||
public class BeanReferenceFactoryBean implements SmartFactoryBean<Object>, BeanFactoryAware {
|
||||
|
||||
private String targetBeanName;
|
||||
|
||||
private BeanFactory beanFactory;
|
||||
|
||||
|
||||
/**
|
||||
* Set the name of the target bean.
|
||||
* <p>This property is required. The value for this property can be
|
||||
* substituted through a placeholder, in combination with Spring's
|
||||
* PropertyPlaceholderConfigurer.
|
||||
* @param targetBeanName the name of the target bean
|
||||
* @see PropertyPlaceholderConfigurer
|
||||
*/
|
||||
public void setTargetBeanName(String targetBeanName) {
|
||||
this.targetBeanName = targetBeanName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBeanFactory(BeanFactory beanFactory) {
|
||||
this.beanFactory = beanFactory;
|
||||
if (this.targetBeanName == null) {
|
||||
throw new IllegalArgumentException("'targetBeanName' is required");
|
||||
}
|
||||
if (!this.beanFactory.containsBean(this.targetBeanName)) {
|
||||
throw new NoSuchBeanDefinitionException(this.targetBeanName, this.beanFactory.toString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Object getObject() throws BeansException {
|
||||
if (this.beanFactory == null) {
|
||||
throw new FactoryBeanNotInitializedException();
|
||||
}
|
||||
return this.beanFactory.getBean(this.targetBeanName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<?> getObjectType() {
|
||||
if (this.beanFactory == null) {
|
||||
return null;
|
||||
}
|
||||
return this.beanFactory.getType(this.targetBeanName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSingleton() {
|
||||
if (this.beanFactory == null) {
|
||||
throw new FactoryBeanNotInitializedException();
|
||||
}
|
||||
return this.beanFactory.isSingleton(this.targetBeanName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isPrototype() {
|
||||
if (this.beanFactory == null) {
|
||||
throw new FactoryBeanNotInitializedException();
|
||||
}
|
||||
return this.beanFactory.isPrototype(this.targetBeanName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isEagerInit() {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,78 +0,0 @@
|
||||
/*
|
||||
* Copyright 2002-2012 the original author or authors.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package org.springframework.beans.factory.config;
|
||||
|
||||
import org.apache.commons.logging.Log;
|
||||
import org.apache.commons.logging.LogFactory;
|
||||
|
||||
import org.springframework.beans.factory.FactoryBean;
|
||||
import org.springframework.beans.factory.InitializingBean;
|
||||
|
||||
/**
|
||||
* Factory bean for
|
||||
* <a href="http://jakarta.apache.org/commons/logging.html">commons-logging</a>
|
||||
* {@link org.apache.commons.logging.Log} instances.
|
||||
*
|
||||
* <p>Useful for sharing Log instances among multiple beans instead of using
|
||||
* one Log instance per class name, e.g. for common log topics.
|
||||
*
|
||||
* @author Juergen Hoeller
|
||||
* @since 16.11.2003
|
||||
* @see org.apache.commons.logging.Log
|
||||
* @deprecated as of Spring 3.2, in favor of a bean definition that points
|
||||
* to the bean class "org.apache.commons.logging.LogFactory" and the factory
|
||||
* method "getLog", passing in the log name as constructor argument
|
||||
*/
|
||||
@Deprecated
|
||||
public class CommonsLogFactoryBean implements FactoryBean<Log>, InitializingBean {
|
||||
|
||||
private Log log;
|
||||
|
||||
|
||||
/**
|
||||
* The name of the log.
|
||||
* <p>This property is required.
|
||||
* @param logName the name of the log
|
||||
*/
|
||||
public void setLogName(String logName) {
|
||||
this.log = LogFactory.getLog(logName);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void afterPropertiesSet() {
|
||||
if (this.log == null) {
|
||||
throw new IllegalArgumentException("'logName' is required");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Log getObject() {
|
||||
return this.log;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends Log> getObjectType() {
|
||||
return (this.log != null ? this.log.getClass() : Log.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSingleton() {
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user