storing type information as specified (SPR-5556, SPR-5562); explicit XML array element in spring-beans-3.0.xsd (SPR-5543)

Author: jhoeller

org.springframework.beans/src/main/java/org/springframework/beans/factory/config/TypedStringValue.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -42,6 +42,8 @@ public class TypedStringValue implements BeanMetadataElement {
 
 	private Object source;
 
+	private String specifiedTypeName;
+
 
 	/**
 	 * Create a new {@link TypedStringValue} for the given String value.
@@ -169,6 +171,20 @@ public Object getSource() {
 		return this.source;
 	}
 
+	/**
+	 * Set the type name as actually specified for this particular value, if any.
+	 */
+	public void setSpecifiedTypeName(String specifiedTypeName) {
+		this.specifiedTypeName = specifiedTypeName;
+	}
+
+	/**
+	 * Return the type name as actually specified for this particular value, if any.
+	 */
+	public String getSpecifiedTypeName() {
+		return this.specifiedTypeName;
+	}
+
 
 	@Override
 	public boolean equals(Object other) {

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/BeanDefinitionValueResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -16,6 +16,7 @@
 
 package org.springframework.beans.factory.support;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
@@ -36,6 +37,8 @@
 import org.springframework.beans.factory.config.RuntimeBeanNameReference;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.config.TypedStringValue;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Helper class for use in bean factory implementations,
@@ -121,6 +124,30 @@ else if (value instanceof BeanDefinition) {
 			BeanDefinition bd = (BeanDefinition) value;
 			return resolveInnerBean(argName, "(inner bean)", bd);
 		}
+		else if (value instanceof ManagedArray) {
+			// May need to resolve contained runtime references.
+			ManagedArray array = (ManagedArray) value;
+			Class elementType = array.resolvedElementType;
+			if (elementType == null) {
+				String elementTypeName = array.getElementTypeName();
+				if (StringUtils.hasText(elementTypeName)) {
+					try {
+						elementType = ClassUtils.forName(elementTypeName, this.beanFactory.getBeanClassLoader());
+						array.resolvedElementType = elementType;
+					}
+					catch (Throwable ex) {
+						// Improve the message by showing the context.
+						throw new BeanCreationException(
+								this.beanDefinition.getResourceDescription(), this.beanName,
+								"Error resolving array type for " + argName, ex);
+					}
+				}
+				else {
+					elementType = Object.class;
+				}
+			}
+			return resolveManagedArray(argName, (List<?>) value, elementType);
+		}
 		else if (value instanceof ManagedList) {
 			// May need to resolve contained runtime references.
 			return resolveManagedList(argName, (List<?>) value);
@@ -292,7 +319,21 @@ private Object resolveReference(Object argName, RuntimeBeanReference ref) {
 	}
 
 	/**
-	 * For each element in the ManagedList, resolve reference if necessary.
+	 * For each element in the managed array, resolve reference if necessary.
+	 */
+	private Object resolveManagedArray(Object argName, List<?> ml, Class elementType) {
+		Object resolved = Array.newInstance(elementType, ml.size());
+		for (int i = 0; i < ml.size(); i++) {
+			Array.set(resolved, i,
+			    resolveValueIfNecessary(
+							argName + " with key " + BeanWrapper.PROPERTY_KEY_PREFIX + i + BeanWrapper.PROPERTY_KEY_SUFFIX,
+							ml.get(i)));
+		}
+		return resolved;
+	}
+
+	/**
+	 * For each element in the managed list, resolve reference if necessary.
 	 */
 	private List resolveManagedList(Object argName, List<?> ml) {
 		List<Object> resolved = new ArrayList<Object>(ml.size());
@@ -306,7 +347,7 @@ private List resolveManagedList(Object argName, List<?> ml) {
 	}
 
 	/**
-	 * For each element in the ManagedList, resolve reference if necessary.
+	 * For each element in the managed set, resolve reference if necessary.
 	 */
 	private Set resolveManagedSet(Object argName, Set<?> ms) {
 		Set<Object> resolved = new LinkedHashSet<Object>(ms.size());
@@ -320,7 +361,7 @@ private Set resolveManagedSet(Object argName, Set<?> ms) {
 	}
 
 	/**
-	 * For each element in the ManagedMap, resolve reference if necessary.
+	 * For each element in the managed map, resolve reference if necessary.
 	 */
 	private Map resolveManagedMap(Object argName, Map<?, ?> mm) {
 		Map<Object, Object> resolved = new LinkedHashMap<Object, Object>(mm.size());

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java

@@ -744,7 +744,7 @@ protected Map<String, Object> findAutowireCandidates(
 	 * Determine the primary autowire candidate in the given set of beans.
 	 * @param candidateBeans a Map of candidate names and candidate instances
 	 * that match the required type, as returned by {@link #findAutowireCandidates}
-	 * @param type the required type
+	 * @param descriptor the target dependency to match against
 	 * @return the name of the primary candidate, or <code>null</code> if none found
 	 */
 	protected String determinePrimaryCandidate(Map<String, Object> candidateBeans, DependencyDescriptor descriptor) {

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedArray.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2002-2009 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.support;
+
+import org.springframework.util.Assert;
+
+/**
+ * Tag collection class used to hold managed array elements, which may
+ * include runtime bean references (to be resolved into bean objects).
+ *
+ * @author Juergen Hoeller
+ * @since 3.0
+ */
+public class ManagedArray extends ManagedList<Object> {
+
+	/** Resolved element type for runtime creation of the target array */
+	volatile Class resolvedElementType;
+
+
+	/**
+	 * Create a new managed array placeholder.
+	 * @param elementTypeName the target element type as a class name
+	 * @param size the size of the array
+	 */
+	public ManagedArray(String elementTypeName, int size) {
+		super(size);
+		Assert.notNull(elementTypeName, "elementTypeName must not be null");
+		setElementTypeName(elementTypeName);
+	}
+
+}

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedList.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -35,6 +35,8 @@ public class ManagedList<E> extends ArrayList<E> implements Mergeable, BeanMetad
 
 	private Object source;
 
+	private String elementTypeName;
+
 	private boolean mergeEnabled;
 
 
@@ -58,6 +60,20 @@ public Object getSource() {
 		return this.source;
 	}
 
+	/**
+	 * Set the default element type name (class name) to be used for this list.
+	 */
+	public void setElementTypeName(String elementTypeName) {
+		this.elementTypeName = elementTypeName;
+	}
+
+	/**
+	 * Return the default element type name (class name) to be used for this list.
+	 */
+	public String getElementTypeName() {
+		return this.elementTypeName;
+	}
+
 	/**
 	 * Set whether merging should be enabled for this collection,
 	 * in case of a 'parent' collection value being present.
@@ -70,7 +86,8 @@ public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
-	public Object merge(Object parent) {
+	@SuppressWarnings("unchecked")
+	public List<E> merge(Object parent) {
 		if (!this.mergeEnabled) {
 			throw new IllegalStateException("Not allowed to merge when the 'mergeEnabled' property is set to 'false'");
 		}
@@ -80,7 +97,7 @@ public Object merge(Object parent) {
 		if (!(parent instanceof List)) {
 			throw new IllegalArgumentException("Cannot merge with object of type [" + parent.getClass() + "]");
 		}
-		List merged = new ManagedList();
+		List<E> merged = new ManagedList<E>();
 		merged.addAll((List) parent);
 		merged.addAll(this);
 		return merged;

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedMap.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -34,6 +34,10 @@ public class ManagedMap<K, V> extends LinkedHashMap<K, V> implements Mergeable,
 
 	private Object source;
 
+	private String keyTypeName;
+
+	private String valueTypeName;
+
 	private boolean mergeEnabled;
 
 
@@ -57,6 +61,34 @@ public Object getSource() {
 		return this.source;
 	}
 
+	/**
+	 * Set the default key type name (class name) to be used for this map.
+	 */
+	public void setKeyTypeName(String keyTypeName) {
+		this.keyTypeName = keyTypeName;
+	}
+
+	/**
+	 * Return the default key type name (class name) to be used for this map.
+	 */
+	public String getKeyTypeName() {
+		return this.keyTypeName;
+	}
+
+	/**
+	 * Set the default value type name (class name) to be used for this map.
+	 */
+	public void setValueTypeName(String valueTypeName) {
+		this.valueTypeName = valueTypeName;
+	}
+
+	/**
+	 * Return the default value type name (class name) to be used for this map.
+	 */
+	public String getValueTypeName() {
+		return this.valueTypeName;
+	}
+
 	/**
 	 * Set whether merging should be enabled for this collection,
 	 * in case of a 'parent' collection value being present.
@@ -69,6 +101,7 @@ public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
+	@SuppressWarnings("unchecked")
 	public Object merge(Object parent) {
 		if (!this.mergeEnabled) {
 			throw new IllegalStateException("Not allowed to merge when the 'mergeEnabled' property is set to 'false'");
@@ -79,7 +112,7 @@ public Object merge(Object parent) {
 		if (!(parent instanceof Map)) {
 			throw new IllegalArgumentException("Cannot merge with object of type [" + parent.getClass() + "]");
 		}
-		Map merged = new ManagedMap();
+		Map<K, V> merged = new ManagedMap<K, V>();
 		merged.putAll((Map) parent);
 		merged.putAll(this);
 		return merged;

org.springframework.beans/src/main/java/org/springframework/beans/factory/support/ManagedSet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2008 the original author or authors.
+ * Copyright 2002-2009 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.
@@ -34,6 +34,8 @@ public class ManagedSet<E> extends LinkedHashSet<E> implements Mergeable, BeanMe
 
 	private Object source;
 
+	private String elementTypeName;
+
 	private boolean mergeEnabled;
 
 
@@ -57,6 +59,20 @@ public Object getSource() {
 		return this.source;
 	}
 
+	/**
+	 * Set the default element type name (class name) to be used for this set.
+	 */
+	public void setElementTypeName(String elementTypeName) {
+		this.elementTypeName = elementTypeName;
+	}
+
+	/**
+	 * Return the default element type name (class name) to be used for this set.
+	 */
+	public String getElementTypeName() {
+		return this.elementTypeName;
+	}
+
 	/**
 	 * Set whether merging should be enabled for this collection,
 	 * in case of a 'parent' collection value being present.
@@ -69,7 +85,8 @@ public boolean isMergeEnabled() {
 		return this.mergeEnabled;
 	}
 
-	public Object merge(Object parent) {
+	@SuppressWarnings("unchecked")
+	public Set<E> merge(Object parent) {
 		if (!this.mergeEnabled) {
 			throw new IllegalStateException("Not allowed to merge when the 'mergeEnabled' property is set to 'false'");
 		}
@@ -79,7 +96,7 @@ public Object merge(Object parent) {
 		if (!(parent instanceof Set)) {
 			throw new IllegalArgumentException("Cannot merge with object of type [" + parent.getClass() + "]");
 		}
-		Set merged = new ManagedSet();
+		Set<E> merged = new ManagedSet<E>();
 		merged.addAll((Set) parent);
 		merged.addAll(this);
 		return merged;