Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

costin code review comments

Browse Source
This commit is contained in:
Keith Donald
2009-05-18 13:13:34 +00:00
parent 0cc3542aed
commit 8cbab5acb6
39 changed files with 242 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
org.springframework.core/src/test/java/org/springframework/core/convert/ConversionPointTests.java → org.springframework.core/src/test/java/org/springframework/core/convert/ConversionContextTests.java
View File

@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* @author Andy Clement
*/
public class ConversionPointTests {
public class ConversionContextTests {
List<String> listOfString;
int[] intArray;
@@ -34,13 +34,13 @@ public class ConversionPointTests {
@Test
public void testWrapperType() {
ConversionPoint desc = ConversionPoint.valueOf(int.class);
ConversionContext desc = ConversionContext.valueOf(int.class);
assertEquals(Integer.class, desc.getType());
}
@Test
public void listDescriptors() throws Exception {
ConversionPoint typeDescriptor = new ConversionPoint(ConversionPointTests.class.getDeclaredField("listOfString"));
ConversionContext typeDescriptor = new ConversionContext(ConversionContextTests.class.getDeclaredField("listOfString"));
assertFalse(typeDescriptor.isArray());
assertEquals(List.class,typeDescriptor.getType());
assertEquals(String.class,typeDescriptor.getElementType());
@@ -50,7 +50,7 @@ public class ConversionPointTests {
@Test
public void arrayTypeDescriptors() throws Exception {
ConversionPoint typeDescriptor = new ConversionPoint(ConversionPointTests.class.getDeclaredField("intArray"));
ConversionContext typeDescriptor = new ConversionContext(ConversionContextTests.class.getDeclaredField("intArray"));
assertTrue(typeDescriptor.isArray());
assertEquals(Integer.TYPE,typeDescriptor.getElementType());
assertEquals("int[]",typeDescriptor.asString());
@@ -58,14 +58,14 @@ public class ConversionPointTests {
@Test
public void buildingArrayTypeDescriptors() throws Exception {
ConversionPoint typeDescriptor = new ConversionPoint(new int[0].getClass());
ConversionContext typeDescriptor = new ConversionContext(new int[0].getClass());
assertTrue(typeDescriptor.isArray());
assertEquals(Integer.TYPE,typeDescriptor.getElementType());
}
@Test
public void complexTypeDescriptors() throws Exception {
ConversionPoint typeDescriptor = new ConversionPoint(ConversionPointTests.class.getDeclaredField("arrayOfListOfString"));
ConversionContext typeDescriptor = new ConversionContext(ConversionContextTests.class.getDeclaredField("arrayOfListOfString"));
assertTrue(typeDescriptor.isArray());
assertEquals(List.class,typeDescriptor.getElementType());
// TODO asc notice that the type of the list elements is lost: typeDescriptor.getElementType() should return a TypeDescriptor

4
org.springframework.core/src/test/java/org/springframework/core/convert/support/ArrayToArrayTests.java
View File

@@ -3,7 +3,7 @@ package org.springframework.core.convert.support;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.springframework.core.convert.ConversionPoint;
import org.springframework.core.convert.ConversionContext;
import org.springframework.core.convert.support.ArrayToArray;
import org.springframework.core.convert.support.DefaultTypeConverter;
@@ -12,7 +12,7 @@ public class ArrayToArrayTests {
@Test
public void testArrayToArrayConversion() {
DefaultTypeConverter service = new DefaultTypeConverter();
ArrayToArray c = new ArrayToArray(ConversionPoint.valueOf(String[].class), ConversionPoint.valueOf(Integer[].class), service);
ArrayToArray c = new ArrayToArray(ConversionContext.valueOf(String[].class), ConversionContext.valueOf(Integer[].class), service);
Integer[] result = (Integer[]) c.execute(new String[] { "1", "2", "3" });
assertEquals(new Integer(1), result[0]);
assertEquals(new Integer(2), result[1]);

12
org.springframework.core/src/test/java/org/springframework/core/convert/support/ArrayToCollectionTests.java
View File

@@ -9,7 +9,7 @@ import java.util.Set;
import java.util.SortedSet;
import org.junit.Test;
import org.springframework.core.convert.ConversionPoint;
import org.springframework.core.convert.ConversionContext;
import org.springframework.core.convert.support.ArrayToCollection;
import org.springframework.core.convert.support.DefaultTypeConverter;
@@ -18,7 +18,7 @@ public class ArrayToCollectionTests {
@Test
public void testArrayToCollectionConversion() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
ArrayToCollection c = new ArrayToCollection(ConversionPoint.valueOf(String[].class), new ConversionPoint(getClass().getField("bindTarget")), service);
ArrayToCollection c = new ArrayToCollection(ConversionContext.valueOf(String[].class), new ConversionContext(getClass().getField("bindTarget")), service);
List result = (List) c.execute(new String[] { "1", "2", "3" });
assertEquals(new Integer(1), result.get(0));
assertEquals(new Integer(2), result.get(1));
@@ -28,7 +28,7 @@ public class ArrayToCollectionTests {
@Test
public void testArrayToSetConversion() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
ArrayToCollection c = new ArrayToCollection(ConversionPoint.valueOf(String[].class), new ConversionPoint(getClass().getField("setTarget")), service);
ArrayToCollection c = new ArrayToCollection(ConversionContext.valueOf(String[].class), new ConversionContext(getClass().getField("setTarget")), service);
Set result = (Set) c.execute(new String[] { "1" });
assertEquals("1", result.iterator().next());
}
@@ -36,7 +36,7 @@ public class ArrayToCollectionTests {
@Test
public void testArrayToSortedSetConversion() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
ArrayToCollection c = new ArrayToCollection(ConversionPoint.valueOf(String[].class), new ConversionPoint(getClass().getField("sortedSetTarget")), service);
ArrayToCollection c = new ArrayToCollection(ConversionContext.valueOf(String[].class), new ConversionContext(getClass().getField("sortedSetTarget")), service);
SortedSet result = (SortedSet) c.execute(new String[] { "1" });
assertEquals(new Integer(1), result.iterator().next());
}
@@ -44,7 +44,7 @@ public class ArrayToCollectionTests {
@Test
public void testArrayToCollectionImplConversion() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
ArrayToCollection c = new ArrayToCollection(ConversionPoint.valueOf(String[].class), new ConversionPoint(getClass().getField("implTarget")), service);
ArrayToCollection c = new ArrayToCollection(ConversionContext.valueOf(String[].class), new ConversionContext(getClass().getField("implTarget")), service);
LinkedList result = (LinkedList) c.execute(new String[] { "1" });
assertEquals("1", result.iterator().next());
}
@@ -52,7 +52,7 @@ public class ArrayToCollectionTests {
@Test
public void testArrayToNonGenericCollectionConversionNullElement() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
ArrayToCollection c = new ArrayToCollection(ConversionPoint.valueOf(String[].class), new ConversionPoint(getClass().getField("listTarget")), service);
ArrayToCollection c = new ArrayToCollection(ConversionContext.valueOf(String[].class), new ConversionContext(getClass().getField("listTarget")), service);
List result = (List) c.execute(new Integer[] { null, new Integer(1) });
assertEquals(null, result.get(0));
assertEquals(new Integer(1), result.get(1));

10
org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToArrayTests.java
View File

@@ -6,7 +6,7 @@ import java.util.ArrayList;
import java.util.Collection;
import org.junit.Test;
import org.springframework.core.convert.ConversionPoint;
import org.springframework.core.convert.ConversionContext;
import org.springframework.core.convert.support.CollectionToArray;
import org.springframework.core.convert.support.DefaultTypeConverter;
@@ -15,8 +15,8 @@ public class CollectionToArrayTests {
@Test
public void testCollectionToArrayConversion() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToArray c = new CollectionToArray(new ConversionPoint(getClass().getField("bindTarget")),
ConversionPoint.valueOf(Integer[].class), service);
CollectionToArray c = new CollectionToArray(new ConversionContext(getClass().getField("bindTarget")),
ConversionContext.valueOf(Integer[].class), service);
bindTarget.add("1");
bindTarget.add("2");
bindTarget.add("3");
@@ -29,7 +29,7 @@ public class CollectionToArrayTests {
@Test
public void testCollectionToArrayConversionNoGenericInfo() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToArray c = new CollectionToArray(ConversionPoint.valueOf(Collection.class), ConversionPoint
CollectionToArray c = new CollectionToArray(ConversionContext.valueOf(Collection.class), ConversionContext
.valueOf(Integer[].class), service);
bindTarget.add("1");
bindTarget.add("2");
@@ -43,7 +43,7 @@ public class CollectionToArrayTests {
@Test
public void testCollectionToArrayConversionNoGenericInfoNullElement() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToArray c = new CollectionToArray(ConversionPoint.valueOf(Collection.class), ConversionPoint
CollectionToArray c = new CollectionToArray(ConversionContext.valueOf(Collection.class), ConversionContext
.valueOf(Integer[].class), service);
bindTarget.add(null);
bindTarget.add("1");

22
org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionTests.java
View File

@@ -8,7 +8,7 @@ import java.util.Collection;
import java.util.List;
import org.junit.Test;
import org.springframework.core.convert.ConversionPoint;
import org.springframework.core.convert.ConversionContext;
import org.springframework.core.convert.support.CollectionToCollection;
import org.springframework.core.convert.support.DefaultTypeConverter;
@@ -17,8 +17,8 @@ public class CollectionToCollectionTests {
@Test
public void testCollectionToCollectionConversion() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToCollection c = new CollectionToCollection(new ConversionPoint(getClass().getField("bindTarget")),
new ConversionPoint(getClass().getField("integerTarget")), service);
CollectionToCollection c = new CollectionToCollection(new ConversionContext(getClass().getField("bindTarget")),
new ConversionContext(getClass().getField("integerTarget")), service);
bindTarget.add("1");
bindTarget.add("2");
bindTarget.add("3");
@@ -31,8 +31,8 @@ public class CollectionToCollectionTests {
@Test
public void testCollectionToCollectionConversionNoGenericInfo() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToCollection c = new CollectionToCollection(ConversionPoint.valueOf(Collection.class),
ConversionPoint.valueOf(List.class), service);
CollectionToCollection c = new CollectionToCollection(ConversionContext.valueOf(Collection.class),
ConversionContext.valueOf(List.class), service);
bindTarget.add("1");
bindTarget.add("2");
bindTarget.add("3");
@@ -45,8 +45,8 @@ public class CollectionToCollectionTests {
@Test
public void testCollectionToCollectionConversionNoGenericInfoSource() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToCollection c = new CollectionToCollection(ConversionPoint.valueOf(Collection.class),
new ConversionPoint(getClass().getField("integerTarget")), service);
CollectionToCollection c = new CollectionToCollection(ConversionContext.valueOf(Collection.class),
new ConversionContext(getClass().getField("integerTarget")), service);
bindTarget.add("1");
bindTarget.add("2");
bindTarget.add("3");
@@ -59,8 +59,8 @@ public class CollectionToCollectionTests {
@Test
public void testCollectionToCollectionConversionNoGenericInfoSourceNullValues() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToCollection c = new CollectionToCollection(ConversionPoint.valueOf(Collection.class),
new ConversionPoint(getClass().getField("integerTarget")), service);
CollectionToCollection c = new CollectionToCollection(ConversionContext.valueOf(Collection.class),
new ConversionContext(getClass().getField("integerTarget")), service);
bindTarget.add(null);
bindTarget.add("1");
bindTarget.add("2");
@@ -77,8 +77,8 @@ public class CollectionToCollectionTests {
@Test
public void testCollectionToCollectionConversionNoGenericInfoSourceEmpty() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
CollectionToCollection c = new CollectionToCollection(ConversionPoint.valueOf(Collection.class),
new ConversionPoint(getClass().getField("integerTarget")), service);
CollectionToCollection c = new CollectionToCollection(ConversionContext.valueOf(Collection.class),
new ConversionContext(getClass().getField("integerTarget")), service);
List result = (List) c.execute(bindTarget);
assertTrue(result.isEmpty());
}

34
org.springframework.core/src/test/java/org/springframework/core/convert/support/GenericTypeConverterTests.java
View File

@@ -29,7 +29,7 @@ import java.util.Map;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.core.convert.ConversionFailedException;
import org.springframework.core.convert.ConversionPoint;
import org.springframework.core.convert.ConversionContext;
import org.springframework.core.convert.ConverterNotFoundException;
import org.springframework.core.convert.converter.Converter;
@@ -39,7 +39,7 @@ public class GenericTypeConverterTests {
@Test
public void executeConversion() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
assertEquals(new Integer(3), converter.convert("3", Integer.class));
}
@@ -65,7 +65,7 @@ public class GenericTypeConverterTests {
@Test
public void addConverterNoSourceTargetClassInfoAvailable() {
try {
converter.addConverter(new Converter() {
converter.add(new Converter() {
public Object convert(Object source) throws Exception {
return source;
}
@@ -88,13 +88,13 @@ public class GenericTypeConverterTests {
@Test
public void convertNullConversionPointType() {
assertEquals("3", converter.convert("3", ConversionPoint.NULL));
assertEquals("3", converter.convert("3", ConversionContext.NULL));
}
@Test
public void convertWrongTypeArgument() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
try {
converter.convert("BOGUS", Integer.class);
fail("Should have failed");
@@ -105,7 +105,7 @@ public class GenericTypeConverterTests {
@Test
public void convertSuperSourceType() {
converter.addConverter(new Converter<CharSequence, Integer>() {
converter.add(new Converter<CharSequence, Integer>() {
public Integer convert(CharSequence source) throws Exception {
return Integer.valueOf(source.toString());
}
@@ -117,7 +117,7 @@ public class GenericTypeConverterTests {
@Test
@Ignore
public void convertNoSuperTargetType() {
converter.addConverter(new Converter<CharSequence, Number>() {
converter.add(new Converter<CharSequence, Number>() {
public Integer convert(CharSequence source) throws Exception {
return Integer.valueOf(source.toString());
}
@@ -132,14 +132,14 @@ public class GenericTypeConverterTests {
@Test
public void convertObjectToPrimitive() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
Integer three = converter.convert("3", int.class);
assertEquals(3, three.intValue());
}
@Test
public void convertArrayToArray() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
Integer[] result = converter.convert(new String[] { "1", "2", "3" }, Integer[].class);
assertEquals(new Integer(1), result[0]);
assertEquals(new Integer(2), result[1]);
@@ -148,7 +148,7 @@ public class GenericTypeConverterTests {
@Test
public void convertArrayToPrimitiveArray() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
int[] result = (int[]) converter.convert(new String[] { "1", "2", "3" }, int[].class);
assertEquals(1, result[0]);
assertEquals(2, result[1]);
@@ -167,8 +167,8 @@ public class GenericTypeConverterTests {
@Test
public void convertArrayToListGenericTypeConversion() throws Exception {
converter.addConverter(new StringToInteger());
List<Integer> result = converter.convert(new String[] { "1", "2", "3" }, new ConversionPoint<List<Integer>>(getClass().getDeclaredField("genericList")));
converter.add(new StringToInteger());
List<Integer> result = converter.convert(new String[] { "1", "2", "3" }, new ConversionContext<List<Integer>>(getClass().getDeclaredField("genericList")));
assertEquals(new Integer("1"), result.get(0));
assertEquals(new Integer("2"), result.get(1));
assertEquals(new Integer("3"), result.get(2));
@@ -205,7 +205,7 @@ public class GenericTypeConverterTests {
@Test
public void convertListToArrayWithComponentConversion() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
List<String> list = new ArrayList<String>();
list.add("1");
list.add("2");
@@ -224,9 +224,9 @@ public class GenericTypeConverterTests {
Map<String, String> foo = new HashMap<String, String>();
foo.put("1", "BAR");
foo.put("2", "BAZ");
converter.addConverter(new StringToInteger());
converter.addConverter(new StringToEnumFactory().getConverter(FooEnum.class));
Map<String, FooEnum> map = converter.convert(foo, new ConversionPoint<Map<String, FooEnum>>(getClass().getField("genericMap")));
converter.add(new StringToInteger());
converter.add(new StringToEnumFactory().getConverter(FooEnum.class));
Map<String, FooEnum> map = converter.convert(foo, new ConversionContext<Map<String, FooEnum>>(getClass().getField("genericMap")));
assertEquals(map.get(1), FooEnum.BAR);
assertEquals(map.get(2), FooEnum.BAZ);
}
@@ -242,7 +242,7 @@ public class GenericTypeConverterTests {
@Ignore
@Test
public void convertObjectToArrayWithElementConversion() {
converter.addConverter(new StringToInteger());
converter.add(new StringToInteger());
Integer[] result = converter.convert("123", Integer[].class);
assertEquals(1, result.length);
assertEquals(new Integer(123), result[0]);

14
org.springframework.core/src/test/java/org/springframework/core/convert/support/MapToMapTests.java
View File

@@ -6,7 +6,7 @@ import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import org.springframework.core.convert.ConversionPoint;
import org.springframework.core.convert.ConversionContext;
import org.springframework.core.convert.support.DefaultTypeConverter;
import org.springframework.core.convert.support.MapToMap;
@@ -15,8 +15,8 @@ public class MapToMapTests {
@Test
public void testMapToMapConversion() throws Exception {
DefaultTypeConverter converter = new DefaultTypeConverter();
MapToMap c = new MapToMap(new ConversionPoint<Map<String, String>>(getClass().getField("source")),
new ConversionPoint<Map<String, FooEnum>>(getClass().getField("bindTarget")), converter);
MapToMap c = new MapToMap(new ConversionContext<Map<String, String>>(getClass().getField("source")),
new ConversionContext<Map<String, FooEnum>>(getClass().getField("bindTarget")), converter);
source.put("1", "BAR");
source.put("2", "BAZ");
Map<String, FooEnum> result = (Map<String, FooEnum>) c.execute(source);
@@ -27,8 +27,8 @@ public class MapToMapTests {
@Test
public void testMapToMapConversionNoGenericInfoOnSource() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
MapToMap c = new MapToMap(ConversionPoint.valueOf(Map.class),
new ConversionPoint(getClass().getField("bindTarget")), service);
MapToMap c = new MapToMap(ConversionContext.valueOf(Map.class),
new ConversionContext(getClass().getField("bindTarget")), service);
source.put("1", "BAR");
source.put("2", "BAZ");
Map result = (Map) c.execute(source);
@@ -39,8 +39,8 @@ public class MapToMapTests {
@Test
public void testMapToMapConversionNoGenericInfo() throws Exception {
DefaultTypeConverter service = new DefaultTypeConverter();
MapToMap c = new MapToMap(ConversionPoint.valueOf(Map.class),
ConversionPoint.valueOf(Map.class), service);
MapToMap c = new MapToMap(ConversionContext.valueOf(Map.class),
ConversionContext.valueOf(Map.class), service);
source.put("1", "BAR");
source.put("2", "BAZ");
Map result = (Map) c.execute(source);