Merge branch 'master' of github.com:caelum/vraptor

rdllopes · Mar 22, 2011 · 4acad53 · 4acad53
2 parents aa95733 + 71bddbc
commit 4acad53
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 1 deletion.
diff --git a/...tor-core/src/main/java/br/com/caelum/vraptor/serialization/xstream/XStreamSerializer.java b/...tor-core/src/main/java/br/com/caelum/vraptor/serialization/xstream/XStreamSerializer.java
@@ -21,6 +21,7 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.lang.reflect.TypeVariable;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collection;
@@ -221,10 +222,18 @@ public Serializer include(String... fields) {
 	private Class<?> getActualType(Type genericType) {
 		if (genericType instanceof ParameterizedType) {
 			ParameterizedType type = (ParameterizedType) genericType;
+
 			if (isCollection(type)) {
-				return (Class<?>) type.getActualTypeArguments()[0];
+				Type actualType = type.getActualTypeArguments()[0];
+
+				if (actualType instanceof TypeVariable<?>) {
+					return (Class<?>) type.getRawType();
+				}
+
+				return (Class<?>) actualType;
 			}
 		}
+
 		return (Class<?>) genericType;
 	}
 

diff --git a/.../test/java/br/com/caelum/vraptor/serialization/xstream/XStreamJSONPSerializationTest.java b/.../test/java/br/com/caelum/vraptor/serialization/xstream/XStreamJSONPSerializationTest.java
@@ -8,6 +8,8 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collection;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -65,5 +67,32 @@ public void shouldIncludeCallbackPadding() {
 	private String result() {
 		return new String(stream.toByteArray());
 	}
+
+	public static class GenericWrapper<T> {
+
+		Collection<T> entityList;
+		Integer total;
+
+		public GenericWrapper(Collection<T> entityList, Integer total) {
+			this.entityList = entityList;
+			this.total = total;
+		}
+
+	}
+
+	@Test
+    public void shouldSerializeGenericClass() {
+		String expectedResult = "myCallback({\"genericWrapper\": {\"entityList\": [{\"street\": \"vergueiro street\"},{\"street\": \"vergueiro street\"}],\"total\": 2}})";
+
+		Collection<Address> entityList = new ArrayList<Address>();
+		entityList.add(new Address("vergueiro street"));
+		entityList.add(new Address("vergueiro street"));
+
+		GenericWrapper<Address> wrapper = new GenericWrapper<Address>(entityList, entityList.size());
+
+        serialization.withCallback("myCallback").from(wrapper).include("entityList").serialize();
+
+        assertThat(result(), is(equalTo(expectedResult)));
+    }
 
 }
diff --git a/...c/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamJSONSerializationTest.java b/...c/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamJSONSerializationTest.java
@@ -110,6 +110,33 @@ public AdvancedOrder(Client client, double price, String comments, String notes)
 
 	}
 
+	public static class GenericWrapper<T> {
+
+		Collection<T> entityList;
+		Integer total;
+
+		public GenericWrapper(Collection<T> entityList, Integer total) {
+			this.entityList = entityList;
+			this.total = total;
+		}
+
+	}
+
+	@Test
+    public void shouldSerializeGenericClass() {
+		String expectedResult = "{\"genericWrapper\": {\"entityList\": [{\"name\": \"washington botelho\"},{\"name\": \"washington botelho\"}],\"total\": 2}}";
+
+		Collection<Client> entityList = new ArrayList<Client>();
+		entityList.add(new Client("washington botelho"));
+		entityList.add(new Client("washington botelho"));
+
+		GenericWrapper<Client> wrapper = new GenericWrapper<Client>(entityList, entityList.size());
+
+        serialization.from(wrapper).include("entityList").serialize();
+
+        assertThat(result(), is(equalTo(expectedResult)));
+    }
+
     @Test
     public void shouldSerializeAllBasicFields() {
         String expectedResult = "{\"order\": {\"price\": 15.0,\"comments\": \"pack it nicely, please\"}}";

diff --git a/...rc/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXMLSerializationTest.java b/...rc/test/java/br/com/caelum/vraptor/serialization/xstream/XStreamXMLSerializationTest.java
@@ -12,6 +12,7 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -105,6 +106,33 @@ public AdvancedOrder(Client client, double price, String comments, String notes)
 
 	}
 
+	public static class GenericWrapper<T> {
+
+		Collection<T> entityList;
+		Integer total;
+
+		public GenericWrapper(Collection<T> entityList, Integer total) {
+			this.entityList = entityList;
+			this.total = total;
+		}
+
+	}
+
+	@Test
+    public void shouldSerializeGenericClass() {
+		String expectedResult = "<genericWrapper>\n  <entityList class=\"list\">\n    <client>\n      <name>washington botelho</name>\n    </client>\n    <client>\n      <name>washington botelho</name>\n    </client>\n  </entityList>\n  <total>2</total>\n</genericWrapper>";
+
+		Collection<Client> entityList = new ArrayList<Client>();
+		entityList.add(new Client("washington botelho"));
+		entityList.add(new Client("washington botelho"));
+
+		GenericWrapper<Client> wrapper = new GenericWrapper<Client>(entityList, entityList.size());
+
+        serialization.from(wrapper).include("entityList").serialize();
+
+        assertThat(result(), is(equalTo(expectedResult)));
+    }
+
 	@Test
 	public void shouldSerializeMaps() {
 		String expectedResult = "<properties>\n  <map>\n    <entry>\n      <string>test</string>\n      <string>true</string>\n    </entry>\n  </map>\n</properties>";