Trying to fix #36

FasterXML · Oct 18, 2013 · 46bff65 · 46bff65
1 parent 1364bc2
commit 46bff65
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...c/main/java/com/fasterxml/jackson/datatype/hibernate3/PersistentCollectionSerializer.java b/...c/main/java/com/fasterxml/jackson/datatype/hibernate3/PersistentCollectionSerializer.java
@@ -135,6 +135,11 @@ public void serializeWithType(Object value, JsonGenerator jgen, SerializerProvid
     protected boolean usesLazyLoading(BeanProperty property)
     {
         if (property != null) {
+            // As per [Issue#36]
+            ElementCollection ec = property.getAnnotation(ElementCollection.class);
+            if (ec != null) {
+                return (ec.fetch() == FetchType.LAZY);
+            }
             OneToMany ann1 = property.getAnnotation(OneToMany.class);
             if (ann1 != null) {
                 return (ann1.fetch() == FetchType.LAZY);

diff --git a/...c/main/java/com/fasterxml/jackson/datatype/hibernate4/PersistentCollectionSerializer.java b/...c/main/java/com/fasterxml/jackson/datatype/hibernate4/PersistentCollectionSerializer.java
@@ -2,15 +2,10 @@
 
 import java.io.IOException;
 
-import javax.persistence.FetchType;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
+import javax.persistence.*;
 
 import org.hibernate.collection.spi.PersistentCollection;
 
-
 import com.fasterxml.jackson.core.*;
 
 import com.fasterxml.jackson.databind.*;
@@ -141,6 +136,11 @@ public void serializeWithType(Object value, JsonGenerator jgen, SerializerProvid
     protected boolean usesLazyLoading(BeanProperty property)
     {
         if (property != null) {
+            // As per [Issue#36]
+            ElementCollection ec = property.getAnnotation(ElementCollection.class);
+            if (ec != null) {
+                return (ec.fetch() == FetchType.LAZY);
+            }
             OneToMany ann1 = property.getAnnotation(OneToMany.class);
             if (ann1 != null) {
                 return (ann1.fetch() == FetchType.LAZY);