Minor improvement to proxied-value serializer to possibly work wrt schema generation

Author: cowtowncoder

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

@@ -7,6 +7,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
@@ -60,7 +61,7 @@ public HibernateProxySerializer(boolean forceLazyLoading, BeanProperty property)
     @Override
     public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
         return new HibernateProxySerializer(this._forceLazyLoading);
-    }    
+    }
 
     /*
     /**********************************************************************
@@ -105,6 +106,20 @@ public void serializeWithType(HibernateProxy value, JsonGenerator jgen, Serializ
         findSerializer(provider, proxiedValue).serializeWithType(proxiedValue, jgen, provider, typeSer);
     }
 
+    @Override
+    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
+        throws JsonMappingException
+    {
+        SerializerProvider prov = visitor.getProvider();
+        if ((prov == null) || (_property == null)) {
+            super.acceptJsonFormatVisitor(visitor, typeHint);
+        } else {
+            JavaType type = _property.getType();
+            prov.findPrimaryPropertySerializer(type, _property)
+                .acceptJsonFormatVisitor(visitor, type);
+        }
+    }
+
     /*
     /**********************************************************************
     /* Helper methods
@@ -117,7 +132,8 @@ protected JsonSerializer<Object> findSerializer(SerializerProvider provider, Obj
         /* TODO: if Hibernate did use generics, or we wanted to allow use of Jackson
          *  annotations to indicate type, should take that into account.
          */
-        Class<?> type = value.getClass();
+        Class<?> rawType = value.getClass();
+
         /* we will use a map to contain serializers found so far, keyed by type:
          * this avoids potentially costly lookup from global caches and/or construction
          * of new serializers
@@ -126,7 +142,7 @@ protected JsonSerializer<Object> findSerializer(SerializerProvider provider, Obj
          *   really anyone's guess at this point; proxies can exist at any level?
          */
         PropertySerializerMap.SerializerAndMapResult result =
-                _dynamicSerializers.findAndAddPrimarySerializer(type, provider, _property);
+                _dynamicSerializers.findAndAddPrimarySerializer(rawType, provider, _property);
         if (_dynamicSerializers != result.map) {
             _dynamicSerializers = result.map;
         }

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

@@ -4,10 +4,12 @@
 import java.util.HashMap;
 
 import com.fasterxml.jackson.core.*;
-
 import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
@@ -121,6 +123,20 @@ public void serializeWithType(HibernateProxy value, JsonGenerator jgen, Serializ
         findSerializer(provider, proxiedValue).serializeWithType(proxiedValue, jgen, provider, typeSer);
     }
 
+    @Override
+    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
+        throws JsonMappingException
+    {
+        SerializerProvider prov = visitor.getProvider();
+        if ((prov == null) || (_property == null)) {
+            super.acceptJsonFormatVisitor(visitor, typeHint);
+        } else {
+            JavaType type = _property.getType();
+            prov.findPrimaryPropertySerializer(type, _property)
+                .acceptJsonFormatVisitor(visitor, type);
+        }
+    }
+
     /*
     /**********************************************************************
     /* Helper methods

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

@@ -4,10 +4,12 @@
 import java.util.HashMap;
 
 import com.fasterxml.jackson.core.JsonGenerator;
-
 import com.fasterxml.jackson.databind.BeanProperty;
+import com.fasterxml.jackson.databind.JavaType;
+import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
@@ -121,6 +123,20 @@ public void serializeWithType(HibernateProxy value, JsonGenerator jgen, Serializ
         findSerializer(provider, proxiedValue).serializeWithType(proxiedValue, jgen, provider, typeSer);
     }
 
+    @Override
+    public void acceptJsonFormatVisitor(JsonFormatVisitorWrapper visitor, JavaType typeHint)
+        throws JsonMappingException
+    {
+        SerializerProvider prov = visitor.getProvider();
+        if ((prov == null) || (_property == null)) {
+            super.acceptJsonFormatVisitor(visitor, typeHint);
+        } else {
+            JavaType type = _property.getType();
+            prov.findPrimaryPropertySerializer(type, _property)
+                .acceptJsonFormatVisitor(visitor, type);
+        }
+    }
+
     /*
     /**********************************************************************
     /* Helper methods