Polishing

Author: jhoeller

build.gradle

@@ -441,7 +441,7 @@ project("spring-tx") {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		optional(project(":spring-aop"))
-		optional(project(":spring-context")) // for JCA, @EnableTransactionManagement
+		optional(project(":spring-context"))  // for JCA, @EnableTransactionManagement
 		optional("aopalliance:aopalliance:1.0")
 		optional("javax.transaction:javax.transaction-api:1.2")
 		optional("javax.resource:connector-api:1.5")
@@ -516,7 +516,7 @@ project("spring-jdbc") {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
 		compile(project(":spring-tx"))
-		optional(project(":spring-context")) // for JndiDataSourceLookup
+		optional(project(":spring-context"))  // for JndiDataSourceLookup
 		optional("javax.transaction:javax.transaction-api:1.2")
 		optional("com.mchange:c3p0:0.9.2.1")
 		optional("org.hsqldb:hsqldb:${hsqldbVersion}")
@@ -533,8 +533,8 @@ project("spring-context-support") {
 		compile(project(":spring-core"))
 		compile(project(":spring-beans"))
 		compile(project(":spring-context"))
-		optional(project(":spring-jdbc")) // for Quartz support
-		optional(project(":spring-tx")) // for Quartz support
+		optional(project(":spring-jdbc"))  // for Quartz support
+		optional(project(":spring-tx"))  // for Quartz support
 		optional("javax.mail:javax.mail-api:1.4.7")
 		optional("javax.cache:cache-api:1.0.0")
 		optional("com.google.guava:guava:17.0")
@@ -550,8 +550,8 @@ project("spring-context-support") {
 			exclude group: "xml-apis", module: "xml-apis"
 		}
 		testCompile("org.apache.poi:poi:3.10.1")
-		testCompile("commons-beanutils:commons-beanutils:1.8.0") // for Velocity/JasperReports
-		testCompile("commons-digester:commons-digester:1.8.1") // for Velocity/JasperReports
+		testCompile("commons-beanutils:commons-beanutils:1.8.0")  // for Velocity/JasperReports
+		testCompile("commons-digester:commons-digester:1.8.1")  // for Velocity/JasperReports
 		testCompile("org.hsqldb:hsqldb:${hsqldbVersion}")
 		testCompile("org.slf4j:slf4j-api:${slf4jVersion}")
 		testRuntime("com.sun.mail:javax.mail:1.4.7")
@@ -565,20 +565,20 @@ project("spring-web") {
 	description = "Spring Web"
 
 	dependencies {
-		compile(project(":spring-aop")) // for JaxWsPortProxyFactoryBean
-		compile(project(":spring-beans")) // for MultiPartFilter
+		compile(project(":spring-aop"))  // for JaxWsPortProxyFactoryBean
+		compile(project(":spring-beans"))  // for MultipartFilter
 		compile(project(":spring-context"))
 		compile(project(":spring-core"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional(project(":spring-oxm")) // for MarshallingHttpMessageConverter
+		optional(project(":spring-oxm"))  // for MarshallingHttpMessageConverter
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
 		optional("javax.portlet:portlet-api:2.0")
 		optional("javax.el:javax.el-api:2.2.5")
 		optional("javax.faces:javax.faces-api:2.2")
 		optional("aopalliance:aopalliance:1.0")
 		optional("com.caucho:hessian:4.0.7")
 		optional("commons-fileupload:commons-fileupload:1.3.1")
-		optional("org.apache.httpcomponents:httpclient:4.3.5")
+		optional("org.apache.httpcomponents:httpclient:4.3.6")
 		optional("org.apache.httpcomponents:httpasyncclient:4.0.2")
 		optional("org.codehaus.jackson:jackson-mapper-asl:${jackson1Version}")
 		optional("com.fasterxml.jackson.core:jackson-databind:${jackson2Version}")
@@ -711,8 +711,8 @@ project("spring-webmvc") {
 		compile(project(":spring-expression"))
 		compile(project(":spring-web"))
 		provided("javax.servlet:javax.servlet-api:3.0.1")
-		optional(project(":spring-context-support")) // for Velocity support
-		optional(project(":spring-oxm")) // for MarshallingView
+		optional(project(":spring-context-support"))  // for Velocity support
+		optional(project(":spring-oxm"))  // for MarshallingView
 		optional("javax.servlet.jsp:javax.servlet.jsp-api:2.2.1")
 		optional("javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.1")
 		optional("net.sourceforge.jexcelapi:jxl:2.6.12")
@@ -764,7 +764,7 @@ project("spring-webmvc") {
 		}
 		testCompile("javax.validation:validation-api:1.0.0.GA")
 		testCompile("org.hibernate:hibernate-validator:${hibVal4Version}")
-		testCompile("org.apache.httpcomponents:httpclient:4.3.5")
+		testCompile("org.apache.httpcomponents:httpclient:4.3.6")
 		testCompile("commons-fileupload:commons-fileupload:1.3.1")
 		testCompile("commons-io:commons-io:1.3")
 		testCompile("joda-time:joda-time:${jodaVersion}")
@@ -915,13 +915,13 @@ project("spring-aspects") {
 		rt("org.aspectj:aspectjrt:${aspectjVersion}")
 		compile("org.aspectj:aspectjweaver:${aspectjVersion}")
 		provided("org.eclipse.persistence:javax.persistence:2.0.0")
-		optional(project(":spring-aop")) // for @Async support
-		optional(project(":spring-beans")) // for @Configurable support
-		optional(project(":spring-context")) // for @Enable* support
-		optional(project(":spring-context-support")) // for JavaMail support
-		optional(project(":spring-orm")) // for JPA exception translation support
-		optional(project(":spring-tx")) // for JPA, @Transactional support
-		testCompile(project(":spring-core")) // for CodeStyleAspect
+		optional(project(":spring-aop"))  // for @Async support
+		optional(project(":spring-beans"))  // for @Configurable support
+		optional(project(":spring-context"))  // for @Enable* support
+		optional(project(":spring-context-support"))  // for JavaMail support
+		optional(project(":spring-orm"))  // for JPA exception translation support
+		optional(project(":spring-tx"))  // for JPA, @Transactional support
+		testCompile(project(":spring-core"))  // for CodeStyleAspect
 		testCompile(project(":spring-test"))
 		testCompile("javax.mail:javax.mail-api:1.4.7")
 	}
@@ -1157,7 +1157,7 @@ configure(rootProject) {
 		}
 	}
 
-	// Create an distribution that contains all dependencies (required and optional).
+	// Create a distribution that contains all dependencies (required and optional).
 	// Not published by default; only for use when building from source.
 	task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
 		group = "Distribution"

spring-beans/src/test/java/org/springframework/beans/factory/DefaultListableBeanFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -104,9 +104,11 @@ public class DefaultListableBeanFactoryTests {
 
 	private static final Log factoryLog = LogFactory.getLog(DefaultListableBeanFactory.class);
 
+
 	@Rule
 	public ExpectedException thrown = ExpectedException.none();
 
+
 	@Test
 	public void testUnreferencedSingletonWasInstantiated() {
 		KnowsIfInstantiated.clearInstantiationRecord();
@@ -2748,6 +2750,7 @@ public String getUserName() {
 		}
 	}
 
+
 	@SuppressWarnings("unused")
 	private static class KnowsIfInstantiated {
 

spring-beans/src/test/resources/org/springframework/beans/factory/xml/testUtilNamespace.xml

@@ -15,7 +15,7 @@
 	<util:property-path id="name" path="
 			configuredBean.
 			name
-  "/>
+	"/>
 
 	<bean id="testBean" class="org.springframework.tests.sample.beans.TestBean" scope="prototype">
 		<property name="name">

spring-core/src/main/java/org/springframework/core/convert/support/ArrayToArrayConverter.java

@@ -27,8 +27,9 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Converts an Array to another Array. First adapts the source array to a List, then
- * delegates to {@link CollectionToArrayConverter} to perform the target array conversion.
+ * Converts an array to another array. First adapts the source array to a List,
+ * then delegates to {@link CollectionToArrayConverter} to perform the target
+ * array conversion.
  *
  * @author Keith Donald
  * @author Phillip Webb

spring-core/src/main/java/org/springframework/core/convert/support/ArrayToCollectionConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -27,23 +27,27 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
- * Converts an Array to a Collection.
+ * Converts an array to a Collection.
  *
- * <p>First, creates a new Collection of the requested targetType.
+ * <p>First, creates a new Collection of the requested target type.
  * Then adds each array element to the target collection.
- * Will perform an element conversion from the source component type to the collection's parameterized type if necessary.
+ * Will perform an element conversion from the source component type
+ * to the collection's parameterized type if necessary.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class ArrayToCollectionConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ArrayToCollectionConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Collection.class));
@@ -60,9 +64,12 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
+
 		int length = Array.getLength(source);
+		TypeDescriptor elementDesc = targetType.getElementTypeDescriptor();
 		Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), length);
-		if (targetType.getElementTypeDescriptor() == null) {
+
+		if (elementDesc == null) {
 			for (int i = 0; i < length; i++) {
 				Object sourceElement = Array.get(source, i);
 				target.add(sourceElement);
@@ -72,7 +79,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 			for (int i = 0; i < length; i++) {
 				Object sourceElement = Array.get(source, i);
 				Object targetElement = this.conversionService.convert(sourceElement,
-						sourceType.elementTypeDescriptor(sourceElement), targetType.getElementTypeDescriptor());
+						sourceType.elementTypeDescriptor(sourceElement), elementDesc);
 				target.add(targetElement);
 			}
 		}

spring-core/src/main/java/org/springframework/core/convert/support/ArrayToObjectConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -25,7 +25,8 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
- * Converts an Array to an Object by returning the first array element after converting it to the desired targetType.
+ * Converts an array to an Object by returning the first array element
+ * after converting it to the desired target type.
  *
  * @author Keith Donald
  * @since 3.0
@@ -34,10 +35,12 @@ final class ArrayToObjectConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ArrayToObjectConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object[].class, Object.class));

spring-core/src/main/java/org/springframework/core/convert/support/ArrayToStringConverter.java

@@ -26,9 +26,9 @@
 import org.springframework.util.ObjectUtils;
 
 /**
- * Converts an Array to a comma-delimited String.
- * This implementation first adapts the source Array to a List,
- * then delegates to {@link CollectionToStringConverter} to perform the target String conversion.
+ * Converts an array to a comma-delimited String. First adapts the source array
+ * to a List, then delegates to {@link CollectionToStringConverter} to perform
+ * the target String conversion.
  *
  * @author Keith Donald
  * @since 3.0

spring-core/src/main/java/org/springframework/core/convert/support/MapToMapConverter.java

@@ -36,6 +36,7 @@
  * map's parameterized types K,V if necessary.
  *
  * @author Keith Donald
+ * @author Juergen Hoeller
  * @since 3.0
  */
 final class MapToMapConverter implements ConditionalGenericConverter {
@@ -64,17 +65,22 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
-		boolean copyRequired = !targetType.getType().isInstance(source);
 		Map<Object, Object> sourceMap = (Map<Object, Object>) source;
+
+		// Shortcut if possible...
+		boolean copyRequired = !targetType.getType().isInstance(source);
 		if (!copyRequired && sourceMap.isEmpty()) {
 			return sourceMap;
 		}
+		TypeDescriptor keyDesc = targetType.getMapKeyTypeDescriptor();
+		TypeDescriptor valueDesc = targetType.getMapValueTypeDescriptor();
+
 		List<MapEntry> targetEntries = new ArrayList<MapEntry>(sourceMap.size());
 		for (Map.Entry<Object, Object> entry : sourceMap.entrySet()) {
 			Object sourceKey = entry.getKey();
 			Object sourceValue = entry.getValue();
-			Object targetKey = convertKey(sourceKey, sourceType, targetType.getMapKeyTypeDescriptor());
-			Object targetValue = convertValue(sourceValue, sourceType, targetType.getMapValueTypeDescriptor());
+			Object targetKey = convertKey(sourceKey, sourceType, keyDesc);
+			Object targetValue = convertValue(sourceValue, sourceType, valueDesc);
 			targetEntries.add(new MapEntry(targetKey, targetValue));
 			if (sourceKey != targetKey || sourceValue != targetValue) {
 				copyRequired = true;
@@ -83,6 +89,7 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (!copyRequired) {
 			return sourceMap;
 		}
+
 		Map<Object, Object> targetMap = CollectionFactory.createMap(targetType.getType(), sourceMap.size());
 		for (MapEntry entry : targetEntries) {
 			entry.addToMap(targetMap);

spring-core/src/main/java/org/springframework/core/convert/support/ObjectToArrayConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -25,8 +25,8 @@
 import org.springframework.core.convert.converter.ConditionalGenericConverter;
 
 /**
- * Converts an Object to a single-element Array containing the Object.
- * Will convert the Object to the target Array's component type if necessary.
+ * Converts an Object to a single-element array containing the Object.
+ * Will convert the Object to the target array's component type if necessary.
  *
  * @author Keith Donald
  * @since 3.0
@@ -35,10 +35,12 @@ final class ObjectToArrayConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ObjectToArrayConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Object[].class));

spring-core/src/main/java/org/springframework/core/convert/support/ObjectToCollectionConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -37,10 +37,12 @@ final class ObjectToCollectionConverter implements ConditionalGenericConverter {
 
 	private final ConversionService conversionService;
 
+
 	public ObjectToCollectionConverter(ConversionService conversionService) {
 		this.conversionService = conversionService;
 	}
 
+
 	@Override
 	public Set<ConvertiblePair> getConvertibleTypes() {
 		return Collections.singleton(new ConvertiblePair(Object.class, Collection.class));
@@ -56,12 +58,15 @@ public Object convert(Object source, TypeDescriptor sourceType, TypeDescriptor t
 		if (source == null) {
 			return null;
 		}
+
+		TypeDescriptor elementDesc = targetType.getElementTypeDescriptor();
 		Collection<Object> target = CollectionFactory.createCollection(targetType.getType(), 1);
-		if (targetType.getElementTypeDescriptor() == null || targetType.getElementTypeDescriptor().isCollection()) {
+
+		if (elementDesc == null || elementDesc.isCollection()) {
 			target.add(source);
 		}
 		else {
-			Object singleElement = this.conversionService.convert(source, sourceType, targetType.getElementTypeDescriptor());
+			Object singleElement = this.conversionService.convert(source, sourceType, elementDesc);
 			target.add(singleElement);
 		}
 		return target;