root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

[SPR-7953] BeanDefinitionVisitor now actually visits factory method names.

This commit is contained in:
Sam Brannen 2011-02-10 13:01:58 +00:00
parent a6d35d4801
commit c84ef76fc3
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build-spring-framework/resources/changelog.txt
View File

@ -12,8 +12,8 @@ Changes in version 3.1 M1 (2011-02-11)
* introduced support for environment profiles in bean definition files * introduced support for environment profiles in bean definition files
* introduced PropertySourcesPlaceholderConfigurer as alternative to PropertyPlaceholderConfigurer * introduced PropertySourcesPlaceholderConfigurer as alternative to PropertyPlaceholderConfigurer
* introduced "c:" namespace for constructor argument shortcuts (analogous to the "p:" namespace) * introduced "c:" namespace for constructor argument shortcuts (analogous to the "p:" namespace)
* introduced @FeatureConfiguration classes with @Feature methods returns FeatureSpecifications * introduced @FeatureConfiguration classes with @Feature methods that return FeatureSpecifications
* added TxAnnotationDriven and MvcAnnotationDriven etc as out of the box FeatureSpecifications * added TxAnnotationDriven, MvcAnnotationDriven, etc. as out-of-the-box FeatureSpecifications
* introduced caching abstraction and cache annotation support * introduced caching abstraction and cache annotation support
* ProxyCreationContext uses "ThreadLocal.remove()" over "ThreadLocal.set(null)" as well * ProxyCreationContext uses "ThreadLocal.remove()" over "ThreadLocal.set(null)" as well
* fixed potential InjectionMetadata NPE when using SpringBeanAutowiringInterceptor * fixed potential InjectionMetadata NPE when using SpringBeanAutowiringInterceptor
@ -22,7 +22,7 @@ Changes in version 3.1 M1 (2011-02-11)
* Servlet/PortletRequestDataBinder perform unwrapping for MultipartRequest as well * Servlet/PortletRequestDataBinder perform unwrapping for MultipartRequest as well
* ResourceHttpRequestHandler does not set Content-Length header for 304 response * ResourceHttpRequestHandler does not set Content-Length header for 304 response
* LocaleChangeInterceptor validates locale values in order to prevent XSS vulnerability * LocaleChangeInterceptor validates locale values in order to prevent XSS vulnerability
* BeanDefinitionVisitor now actually visits factory method names
Changes in version 3.0.5 (2010-10-20) Changes in version 3.0.5 (2010-10-20)
------------------------------------- -------------------------------------

4
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinition.java
View File

@ -123,8 +123,8 @@ public interface BeanDefinition extends AttributeAccessor, BeanMetadataElement {
/** /**
* Specify a factory method, if any. This method will be invoked with * Specify a factory method, if any. This method will be invoked with
* constructor arguments, or with no arguments if none are specified. * constructor arguments, or with no arguments if none are specified.
* The method will be invoked on the specifed factory bean, if any, * The method will be invoked on the specified factory bean, if any,
* or as static method on the local bean class else. * or otherwise as a static method on the local bean class.
* @param factoryMethodName static factory method name, * @param factoryMethodName static factory method name,
* or <code>null</code> if normal constructor creation should be used * or <code>null</code> if normal constructor creation should be used
* @see #getBeanClassName() * @see #getBeanClassName()

2
org.springframework.beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionVisitor.java
View File

@ -115,7 +115,7 @@ public class BeanDefinitionVisitor {
} }
protected void visitFactoryMethodName(BeanDefinition beanDefinition) { protected void visitFactoryMethodName(BeanDefinition beanDefinition) {
String factoryMethodName = beanDefinition.getFactoryBeanName(); String factoryMethodName = beanDefinition.getFactoryMethodName();
if (factoryMethodName != null) { if (factoryMethodName != null) {
String resolvedName = resolveStringValue(factoryMethodName); String resolvedName = resolveStringValue(factoryMethodName);
if (!factoryMethodName.equals(resolvedName)) { if (!factoryMethodName.equals(resolvedName)) {