introspect element type in case of incoming Collection/Map in order to not accidentally say canConvert=true (SPR-6564)

org.springframework.context/src/test/java/org/springframework/context/conversionservice/Bar.java

@@ -1,5 +1,24 @@
+/*
+ * Copyright 2002-2006 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.context.conversionservice;
 
+/**
+ * @author Keith Donald
+ */
 public class Bar {
 	
 	private String value;
@@ -11,4 +30,5 @@ public class Bar {
 	public String getValue() {
 		return value;
 	}
+
 }

org.springframework.context/src/test/java/org/springframework/context/conversionservice/ConversionServiceContextConfigTests.java

@@ -1,16 +1,32 @@
+/*
+ * Copyright 2002-2006 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.context.conversionservice;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Ignore;
+import static org.junit.Assert.*;
 import org.junit.Test;
+
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
+/**
+ * @author Keith Donald
+ */
 public class ConversionServiceContextConfigTests {
 	
 	@Test
-	@Ignore
 	public void testConfigOk() {
 		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("org/springframework/context/conversionservice/conversionService.xml");
 		TestClient client = context.getBean("testClient", TestClient.class);

org.springframework.context/src/test/java/org/springframework/context/conversionservice/StringToBarConverter.java

@@ -1,7 +1,26 @@
+/*
+ * Copyright 2002-2006 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.context.conversionservice;
 
 import org.springframework.core.convert.converter.Converter;
 
+/**
+ * @author Keith Donald
+ */
 public class StringToBarConverter implements Converter<String, Bar> {
 
 	public Bar convert(String source) {

org.springframework.context/src/test/java/org/springframework/context/conversionservice/TestClient.java

@@ -1,15 +1,44 @@
+/*
+ * Copyright 2002-2006 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.context.conversionservice;
 
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
 
+/**
+ * @author Keith Donald
+ * @author Juergen Hoeller
+ */
 public class TestClient {
 
 	private List<Bar> bars;
 
 	private boolean bool;
 
+	private Resource[] resourceArray;
+
+	private List<Resource> resourceList;
+
+	private Map<String, Resource> resourceMap;
+
+
 	public List<Bar> getBars() {
 		return bars;
 	}
@@ -27,4 +56,28 @@ public class TestClient {
 		this.bool = bool;
 	}
 
+	public Resource[] getResourceArray() {
+		return resourceArray;
+	}
+
+	public void setResourceArray(Resource[] resourceArray) {
+		this.resourceArray = resourceArray;
+	}
+
+	public List<Resource> getResourceList() {
+		return resourceList;
+	}
+
+	public void setResourceList(List<Resource> resourceList) {
+		this.resourceList = resourceList;
+	}
+
+	public Map<String, Resource> getResourceMap() {
+		return resourceMap;
+	}
+
+	public void setResourceMap(Map<String, Resource> resourceMap) {
+		this.resourceMap = resourceMap;
+	}
+
 }

org.springframework.context/src/test/resources/org/springframework/context/conversionservice/conversionService.xml

@@ -5,7 +5,7 @@
 				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
 				http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-3.0.xsd">
 
-	<bean id="conversionService" class="org.springframework.core.convert.support.DefaultConversionService">
+	<bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
 		<property name="converters">
 			<bean class="org.springframework.context.conversionservice.StringToBarConverter" />
 		</property>
@@ -13,6 +13,20 @@
 
 	<bean id="testClient" class="org.springframework.context.conversionservice.TestClient">
 		<property name="bool" value="true"/>
+		<property name="resourceArray">
+			<value>classpath:test.xml</value>
+		</property>
+		<property name="resourceList">
+			<list>
+				<value>classpath:test.xml</value>
+			</list>
+		</property>
+		<property name="resourceMap">
+			<map>
+				<entry key="res1" value="classpath:test1.xml"/>
+				<entry key="res2" value="classpath:test2.xml"/>
+			</map>
+		</property>
 	</bean>
 
 	<bean class="org.springframework.context.conversionservice.Bar">