root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 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:08:31 +00:00
parent c84ef76fc3
commit c9c436128f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,6 +37,7 @@ import org.springframework.util.StringValueResolver;
* contained in a BeanDefinition, resolving any placeholders found. * contained in a BeanDefinition, resolving any placeholders found.
* *
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Sam Brannen
* @since 1.2 * @since 1.2
* @see BeanDefinition * @see BeanDefinition
* @see BeanDefinition#getPropertyValues * @see BeanDefinition#getPropertyValues
@ -162,6 +163,7 @@ public class BeanDefinitionVisitor {
} }
} }
@SuppressWarnings("rawtypes")
protected Object resolveValue(Object value) { protected Object resolveValue(Object value) {
if (value instanceof BeanDefinition) { if (value instanceof BeanDefinition) {
visitBeanDefinition((BeanDefinition) value); visitBeanDefinition((BeanDefinition) value);
@ -209,7 +211,6 @@ public class BeanDefinitionVisitor {
return value; return value;
} }
@SuppressWarnings("unchecked")
protected void visitArray(Object[] arrayVal) { protected void visitArray(Object[] arrayVal) {
for (int i = 0; i < arrayVal.length; i++) { for (int i = 0; i < arrayVal.length; i++) {
Object elem = arrayVal[i]; Object elem = arrayVal[i];
@ -220,7 +221,7 @@ public class BeanDefinitionVisitor {
} }
} }
@SuppressWarnings("unchecked") @SuppressWarnings({"unchecked", "rawtypes"})
protected void visitList(List listVal) { protected void visitList(List listVal) {
for (int i = 0; i < listVal.size(); i++) { for (int i = 0; i < listVal.size(); i++) {
Object elem = listVal.get(i); Object elem = listVal.get(i);
@ -231,7 +232,7 @@ public class BeanDefinitionVisitor {
} }
} }
@SuppressWarnings("unchecked") @SuppressWarnings({"unchecked", "rawtypes"})
protected void visitSet(Set setVal) { protected void visitSet(Set setVal) {
Set newContent = new LinkedHashSet(); Set newContent = new LinkedHashSet();
boolean entriesModified = false; boolean entriesModified = false;
@ -248,7 +249,7 @@ public class BeanDefinitionVisitor {
} }
} }
@SuppressWarnings("unchecked") @SuppressWarnings({"unchecked", "rawtypes"})
protected void visitMap(Map<?, ?> mapVal) { protected void visitMap(Map<?, ?> mapVal) {
Map newContent = new LinkedHashMap(); Map newContent = new LinkedHashMap();
boolean entriesModified = false; boolean entriesModified = false;