Fix #70

Author: cowtowncoder

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

@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
 
 /**
@@ -21,6 +22,7 @@
  */
 public class HibernateProxySerializer
     extends JsonSerializer<HibernateProxy>
+    implements ContextualSerializer
 {
     /**
      * Property that has proxy value to handle
@@ -44,10 +46,22 @@ public class HibernateProxySerializer
     public HibernateProxySerializer(boolean forceLazyLoading)
     {
         _forceLazyLoading = forceLazyLoading;
-        _dynamicSerializers = PropertySerializerMap.emptyMap();
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
         _property = null;
     }
 
+    public HibernateProxySerializer(boolean forceLazyLoading, BeanProperty property)
+    {
+        _forceLazyLoading = forceLazyLoading;
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
+        _property = property;
+    }
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
+        return new HibernateProxySerializer(this._forceLazyLoading);
+    }    
+
     /*
     /**********************************************************************
     /* JsonSerializer impl

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

@@ -1,20 +1,23 @@
 package com.fasterxml.jackson.datatype.hibernate4;
 
+import java.io.IOException;
+import java.util.HashMap;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
+
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
+
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
-import java.io.IOException;
-import java.util.HashMap;
-
 /**
  * Serializer to use for values proxied using {@link org.hibernate.proxy.HibernateProxy}.
  *<p>
@@ -26,6 +29,7 @@
  */
 public class HibernateProxySerializer
     extends JsonSerializer<HibernateProxy>
+    implements ContextualSerializer
 {
     /**
      * Property that has proxy value to handle
@@ -50,21 +54,32 @@ public class HibernateProxySerializer
 
     public HibernateProxySerializer(boolean forceLazyLoading)
     {
-        this(forceLazyLoading, false, null);
+        this(forceLazyLoading, false, null, null);
     }
 
     public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier) {
-        this(forceLazyLoading, serializeIdentifier, null);
+        this(forceLazyLoading, serializeIdentifier, null, null);
     }
 
     public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, Mapping mapping) {
+        this(forceLazyLoading, serializeIdentifier, mapping, null);
+    }
+
+    public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, Mapping mapping,
+            BeanProperty property) {
         _forceLazyLoading = forceLazyLoading;
         _serializeIdentifier = serializeIdentifier;
         _mapping = mapping;
-        _dynamicSerializers = PropertySerializerMap.emptyMap();
-        _property = null;
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
+        _property = property;
     }
-    
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
+        return new HibernateProxySerializer(this._forceLazyLoading, _serializeIdentifier,
+                _mapping, property);
+    }    
+
     /*
     /**********************************************************************
     /* JsonSerializer impl

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

@@ -1,20 +1,22 @@
 package com.fasterxml.jackson.datatype.hibernate5;
 
+import java.io.IOException;
+import java.util.HashMap;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
+import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
+
 import org.hibernate.engine.spi.Mapping;
 import org.hibernate.engine.spi.SessionImplementor;
 import org.hibernate.proxy.HibernateProxy;
 import org.hibernate.proxy.LazyInitializer;
 
-import java.io.IOException;
-import java.util.HashMap;
-
 /**
  * Serializer to use for values proxied using {@link org.hibernate.proxy.HibernateProxy}.
  *<p>
@@ -26,6 +28,7 @@
  */
 public class HibernateProxySerializer
     extends JsonSerializer<HibernateProxy>
+    implements ContextualSerializer
 {
     /**
      * Property that has proxy value to handle
@@ -50,21 +53,32 @@ public class HibernateProxySerializer
 
     public HibernateProxySerializer(boolean forceLazyLoading)
     {
-        this(forceLazyLoading, false, null);
+        this(forceLazyLoading, false, null, null);
     }
 
     public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier) {
-        this(forceLazyLoading, serializeIdentifier, null);
+        this(forceLazyLoading, serializeIdentifier, null, null);
     }
 
     public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, Mapping mapping) {
+        this(forceLazyLoading, serializeIdentifier, mapping, null);
+    }
+
+    public HibernateProxySerializer(boolean forceLazyLoading, boolean serializeIdentifier, Mapping mapping,
+            BeanProperty property) {
         _forceLazyLoading = forceLazyLoading;
         _serializeIdentifier = serializeIdentifier;
         _mapping = mapping;
-        _dynamicSerializers = PropertySerializerMap.emptyMap();
-        _property = null;
-    }
-    
+        _dynamicSerializers = PropertySerializerMap.emptyForProperties();
+        _property = property;
+    }    
+
+    @Override
+    public JsonSerializer<?> createContextual(SerializerProvider prov, BeanProperty property) {
+        return new HibernateProxySerializer(this._forceLazyLoading, _serializeIdentifier,
+                _mapping, property);
+    }    
+
     /*
     /**********************************************************************
     /* JsonSerializer impl

release-notes/CREDITS

@@ -4,6 +4,7 @@ Hibernate module,  version 2.x
 
 Tatu Saloranta, [email protected]: author
 
+------------
 Contributors
 ------------
 
@@ -21,3 +22,8 @@ Edouard Oger (eoger@github)
 
 #67: Provide support for Hibernate 5.x
  (2.6.0)
+
+Tiago Peruzzo (peruzzo@github)
+
+#70: Infinite recursion due to `@JsonIgnoreProperties` not passed to property
+ (2.6.5)

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-datatype-hibernate
 === Releases ===
 ------------------------------------------------------------------------
 
+2.6.5 (not yet released)
+
+#70: Infinite recursion due to `@JsonIgnoreProperties` not passed to property
+ (reported, fix contributed by Tiago P)
+
 2.6.4 (07-Dec-2015)
 2.6.3 (12-Oct-2015)
 2.6.2 (15-Sep-2015)