Fixed ERRAI-802: Jackson (de)marshalling fails for collections of enums

jfuerth · Oct 6, 2014 · e57d2a3 · e57d2a3
1 parent 86d76d4
commit e57d2a3
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/...axrs-client/src/main/java/org/jboss/errai/enterprise/client/jaxrs/JacksonTransformer.java b/...axrs-client/src/main/java/org/jboss/errai/enterprise/client/jaxrs/JacksonTransformer.java
@@ -141,6 +141,7 @@ else if (k.equals(ENUM_STRING_VALUE) || k.equals(NUMERIC_VALUE)) {
           if (parent != null) {
             parent.put(key, obj.get(k));
           }
+          return toJackson(obj.get(k), k, obj, objectCache);
         }
         else if (k.equals(QUALIFIED_VALUE)) {
           if (parent != null) {
@@ -174,7 +175,7 @@ else if (k.startsWith(SerializationParts.EMBEDDED_JSON)) {
       }
     }
 
-    return cleanUpEmbeddedJson(obj);
+    return (obj != null) ? cleanUpEmbeddedJson(obj) : val;
   }
 
   private static JSONObject cleanUpEmbeddedJson(JSONObject obj) {

diff --git a/...axrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/client/shared/entity/User.java b/...axrs-client/src/test/java/org/jboss/errai/enterprise/jaxrs/client/shared/entity/User.java
@@ -53,6 +53,16 @@ public enum Gender {
 
   private Map<Integer, String> friendsNameMap = new HashMap<Integer, String>();
   private Map<String, User> friendsMap = new HashMap<String, User>();
+
+  private List<Gender> genders;
+
+  public List<Gender> getGenders() {
+    return genders;
+  }
+
+  public void setGenders(List<Gender> genders) {
+    this.genders = genders;
+  }
 
   private Integer age;
   private boolean alive = true;
@@ -263,6 +273,12 @@ else if (!friends.equals(other.friends))
     }
     else if (!friendsMap.equals(other.friendsMap))
       return false;
+    if (genders == null) {
+      if (other.genders != null)
+        return false;
+    }
+    else if (!genders.equals(other.genders))
+      return false;
     if (friendsNameMap == null) {
       if (other.friendsNameMap != null)
         return false;

diff --git a/...nt/src/test/java/org/jboss/errai/enterprise/jaxrs/client/test/JacksonIntegrationTest.java b/...nt/src/test/java/org/jboss/errai/enterprise/jaxrs/client/test/JacksonIntegrationTest.java
@@ -99,8 +99,14 @@ public void testJacksonMarshalling() {
         put("friend2-first", friend2);
       }
     });
+
+    List<Gender> genders = new ArrayList<Gender>();
+    genders.add(Gender.MALE);
+    genders.add(Gender.FEMALE);
+    user.setGenders(genders);
 
     String jackson = MarshallingWrapper.toJSON(user);
+
     call(JacksonTestService.class,
         new RemoteCallback<String>() {
           @Override

diff --git a/...ain/java/org/jboss/errai/marshalling/client/marshallers/AbstractCollectionMarshaller.java b/...ain/java/org/jboss/errai/marshalling/client/marshallers/AbstractCollectionMarshaller.java
@@ -72,12 +72,15 @@ protected <T extends Collection<Object>> T marshallToCollection(final T collecti
             type = assumedElementType;
           }
         }
+        else {
+          type = assumedElementType;
+        }
 
         if (type == null) {
           type = ctx.determineTypeFor(null, elem);
         }
 
-        // the assumed element type can only be used once since they it is not set for nested collections.
+        // the assumed element type can only be used once since it is not set for nested collections.
         ctx.setAssumedElementType(null);
         final Marshaller<Object> marshallerInstance = ctx.getMarshallerInstance(type);
         if (marshallerInstance == null) {