master
Keith Donald 15 years ago
parent 7a6dafd5ad
commit 2bd30a49ad
  1. 2
      org.springframework.core/src/main/java/org/springframework/core/convert/support/MapEntryConverter.java
  2. 15
      org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

@ -38,7 +38,7 @@ class MapEntryConverter {
if (this.valueConverter == null) {
throw new ConverterNotFoundException(sourceValueType, targetValueType);
}
this.targetKeyType = targetKeyType;
this.sourceValueType = sourceValueType;
this.targetValueType = targetValueType;
}
}

@ -417,6 +417,21 @@ public class GenericConversionServiceTests {
assertEquals(new Integer(3), result[0]);
}
@Test
public void convertObjectToMap() {
Map result = conversionService.convert("foo=bar bar=baz", Map.class);
assertEquals("bar", result.get("foo"));
assertEquals("baz", result.get("bar"));
}
@Test
public void convertObjectToMapWithConversion() throws Exception {
conversionService.addConverterFactory(new NumberToNumberConverterFactory());
Map result = (Map) conversionService.convert(1L, TypeDescriptor.valueOf(Integer.class), new TypeDescriptor(
getClass().getField("genericMap2")));
assertEquals(new Long(1), result.get(1L));
}
@Test
public void convertStringArrayToMap() {
Map result = conversionService.convert(new String[] { "foo=bar", "bar=baz", "baz=boop" }, Map.class);

Loading…
Cancel
Save