Add handling of unwrapping for persistent collections

Author: cowtowncoder

hibernate3/src/main/java/com/fasterxml/jackson/datatype/hibernate3/PersistentCollectionSerializer.java

@@ -14,6 +14,7 @@
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.*;
+import com.fasterxml.jackson.databind.util.NameTransformer;
 import com.fasterxml.jackson.datatype.hibernate3.Hibernate3Module.Feature;
 
 import org.hibernate.engine.PersistenceContext;
@@ -83,8 +84,13 @@ protected PersistentCollectionSerializer(PersistentCollectionSerializer base, Js
         _sessionFactory = base._sessionFactory;
     }
 
+    @Override
+    public PersistentCollectionSerializer unwrappingSerializer(NameTransformer unwrapper) {
+        return _withSerializer(_serializer.unwrappingSerializer(unwrapper));
+    }
+    
     protected PersistentCollectionSerializer _withSerializer(JsonSerializer<?> ser) {
-        if (ser == _serializer) {
+        if ((ser == _serializer) || (ser == null)) {
             return this;
         }
         return new PersistentCollectionSerializer(this, ser);
@@ -171,6 +177,16 @@ public boolean isEmpty(SerializerProvider provider, Object value)
         return _serializer.isEmpty(provider, value);
     }
 
+    @Override
+    public boolean isUnwrappingSerializer() {
+        return _serializer.isUnwrappingSerializer();
+    }
+
+    @Override
+    public boolean usesObjectId() {
+        return _serializer.usesObjectId();
+    }
+
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws JsonMappingException

hibernate4/src/main/java/com/fasterxml/jackson/datatype/hibernate4/PersistentCollectionSerializer.java

@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.databind.ser.ContainerSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
+import com.fasterxml.jackson.databind.util.NameTransformer;
 import com.fasterxml.jackson.datatype.hibernate4.Hibernate4Module.Feature;
 
 import org.hibernate.FlushMode;
@@ -84,8 +85,13 @@ protected PersistentCollectionSerializer(PersistentCollectionSerializer base, Js
         _sessionFactory = base._sessionFactory;
     }
 
+    @Override
+    public PersistentCollectionSerializer unwrappingSerializer(NameTransformer unwrapper) {
+        return _withSerializer(_serializer.unwrappingSerializer(unwrapper));
+    }
+    
     protected PersistentCollectionSerializer _withSerializer(JsonSerializer<?> ser) {
-        if (ser == _serializer) {
+        if ((ser == _serializer) || (ser == null)) {
             return this;
         }
         return new PersistentCollectionSerializer(this, ser);
@@ -171,6 +177,16 @@ public boolean isEmpty(SerializerProvider provider, Object value)
         return _serializer.isEmpty(provider, value);
     }
 
+    @Override
+    public boolean isUnwrappingSerializer() {
+        return _serializer.isUnwrappingSerializer();
+    }
+
+    @Override
+    public boolean usesObjectId() {
+        return _serializer.usesObjectId();
+    }
+
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws JsonMappingException

hibernate5/src/main/java/com/fasterxml/jackson/datatype/hibernate5/PersistentCollectionSerializer.java

@@ -13,6 +13,7 @@
 import com.fasterxml.jackson.databind.ser.ContainerSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.ResolvableSerializer;
+import com.fasterxml.jackson.databind.util.NameTransformer;
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module.Feature;
 
 import org.hibernate.FlushMode;
@@ -84,8 +85,13 @@ protected PersistentCollectionSerializer(PersistentCollectionSerializer base, Js
         _sessionFactory = base._sessionFactory;
     }
 
+    @Override
+    public PersistentCollectionSerializer unwrappingSerializer(NameTransformer unwrapper) {
+        return _withSerializer(_serializer.unwrappingSerializer(unwrapper));
+    }
+    
     protected PersistentCollectionSerializer _withSerializer(JsonSerializer<?> ser) {
-        if (ser == _serializer) {
+        if ((ser == _serializer) || (ser == null)) {
             return this;
         }
         return new PersistentCollectionSerializer(this, ser);
@@ -173,6 +179,16 @@ public boolean isEmpty(SerializerProvider provider, Object value)
         return _serializer.isEmpty(provider, value);
     }
 
+    @Override
+    public boolean isUnwrappingSerializer() {
+        return _serializer.isUnwrappingSerializer();
+    }
+
+    @Override
+    public boolean usesObjectId() {
+        return _serializer.usesObjectId();
+    }
+
     @Override
     public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
         throws JsonMappingException