string to map

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1518 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java

@@ -372,7 +372,6 @@ public class GenericBinderTests {
 	}
 	
 	@Test
-	@Ignore
 	public void bindToMapSingleString() {
 		binder.addBinding("favoriteFoodsByGroup");
 		Map<String, String> values = new LinkedHashMap<String, String>();

org.springframework.core/src/main/java/org/springframework/core/convert/support/GenericTypeConverter.java

@@ -220,7 +220,11 @@ public class GenericTypeConverter implements TypeConverter, ConverterRegistry {
 		}
 		if (targetType.isMap()) {
 			// object to map
-			return null;
+			if (sourceType.getType().equals(String.class)) {
+				return new StringToMap(sourceType, targetType, this);
+			} else {
+				return null;
+			}
 		}
 		if (sourceType.isAssignableTo(targetType)) {
 			return NoOpConversionExecutor.INSTANCE;

org.springframework.core/src/main/java/org/springframework/core/convert/support/StringArrayToMap.java

@@ -34,12 +34,6 @@ class StringArrayToMap implements ConversionExecutor {
 
 	private EntryConverter entryConverter;
 
-	/**
-	 * Creates a new map-to-map converter
-	 * @param sourceType the source map type
-	 * @param targetType the target map type
-	 * @param conversionService the conversion service
-	 */
 	public StringArrayToMap(TypeDescriptor sourceType, TypeDescriptor targetType, GenericTypeConverter conversionService) {
 		this.sourceType = sourceType;
 		this.targetType = targetType;

org.springframework.core/src/main/java/org/springframework/core/convert/support/StringToMap.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2004-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.core.convert.support;
+
+import org.springframework.core.convert.ConversionFailedException;
+import org.springframework.core.convert.TypeDescriptor;
+
+@SuppressWarnings("unchecked")
+class StringToMap implements ConversionExecutor {
+
+	private StringArrayToMap converter;
+
+	public StringToMap(TypeDescriptor sourceType, TypeDescriptor targetType, GenericTypeConverter conversionService) {
+		converter = new StringArrayToMap(sourceType, targetType, conversionService);
+	}
+
+	public Object execute(Object source) throws ConversionFailedException {
+		String string = (String) source;
+		String[] entries = string.split(" ");
+		return converter.execute(entries);
+	}
+
+}