Merge pull request #24 from kaiso/hotfix/#21

Hotfix/#21

Author: kaiso

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>io.github.kaiso.relmongo</groupId>
 	<artifactId>relmongo</artifactId>
-	<version>2.1.0</version>
+	<version>2.1.1</version>
 	<packaging>jar</packaging>
 
 	<name>relmongo</name>

src/main/java/io/github/kaiso/relmongo/events/callback/PersistentPropertyLazyLoadingCallback.java

@@ -52,12 +52,13 @@ public PersistentPropertyLazyLoadingCallback(Object source, Document document, M
     public void doWith(Field field) throws IllegalAccessException {
         ReflectionUtils.makeAccessible(field);
 
-        if (DocumentUtils.isLoaded(document.get(field.getName()))) {
-            return;
-        }
-
         if ((field.isAnnotationPresent(OneToMany.class) && FetchType.LAZY.equals(field.getAnnotation(OneToMany.class).fetch()))
                 || (field.isAnnotationPresent(OneToOne.class) && FetchType.LAZY.equals(field.getAnnotation(OneToOne.class).fetch()))) {
+
+            if (DocumentUtils.isLoaded(document.get(field.getName()))) {
+                return;
+            }
+            
             String joinPropertyName;
             try {
                 joinPropertyName = field.getAnnotation(JoinProperty.class).name();

src/main/java/io/github/kaiso/relmongo/events/callback/PersistentPropertyLoadingCallback.java

@@ -69,7 +69,7 @@ private void loadAssociation(Field field, FetchType fetchType, Class<?> annotati
         try {
             ids = ((org.bson.Document) source).get(name);
 
-            if (DocumentUtils.isLoaded(((org.bson.Document) source).get(field.getName())) || ids == null
+            if (ids == null || DocumentUtils.isLoaded(((org.bson.Document) source).get(field.getName()))
                     || (ids instanceof Document && ((Document) ids).keySet().isEmpty())) {
                 return;
             }

src/main/java/io/github/kaiso/relmongo/mongo/DocumentUtils.java

@@ -15,14 +15,14 @@
 */
 package io.github.kaiso.relmongo.mongo;
 
+import io.github.kaiso.relmongo.util.RelMongoConstants;
+
+import org.bson.Document;
 import org.bson.types.ObjectId;
 
 import java.util.Collection;
 
 public final class DocumentUtils {
-    
-    
-    
 
     private DocumentUtils() {
         super();
@@ -35,10 +35,30 @@ private DocumentUtils() {
      * @return
      */
     public static boolean isLoaded(Object obj) {
-        return (obj != null && Collection.class.isAssignableFrom(obj.getClass()) && !((Collection<?>) obj).isEmpty()) || (obj != null);
+        if (obj != null) {
+            if (Collection.class.isAssignableFrom(obj.getClass()) && !((Collection<?>) obj).isEmpty()) {
+                Object document = ((Collection<?>) obj).iterator().next();
+                if (document instanceof Document) {
+                    return isDocumentLoaded((Document) document);
+                }
+            } else if (obj instanceof Document) {
+                return isDocumentLoaded((Document) obj);
+            }
+        }
+        return false;
+    }
+
+    private static boolean isDocumentLoaded(Document dbObject) {
+        int counter = 0;
+        if (dbObject.containsKey("_id")) {
+            counter++;
+        }
+        if (dbObject.containsKey(RelMongoConstants.RELMONGOTARGET_PROPERTY_NAME)) {
+            counter++;
+        }
+        return dbObject.keySet().size() > counter;
     }
-    
-    
+
     public static ObjectId mapIdentifier(Object object) {
         return ((org.bson.Document) object).getObjectId("_id");
     }

src/test/java/io/github/kaiso/relmongo/data/model/Person.java

@@ -26,7 +26,7 @@ public class Person {
     private List<House> houses;
 
     @OneToOne(fetch=FetchType.EAGER)
-    @JoinProperty(name = "passportref")
+    @JoinProperty(name = "passport")
     private Passport passport;
 
     @OneToOne(fetch=FetchType.LAZY, cascade = CascadeType.PERSIST)

src/test/java/io/github/kaiso/relmongo/tests/PersonRepositoryTest.java

@@ -111,13 +111,12 @@ public void shouldPersistOnlyReferencedPropertyOnOneToOneRelation() {
         person.setPassport(passport);
         repository.save(person);
         Document document = mongoOperations.getCollection("people").find().iterator().next();
-        assertNull(document.get("passport"));
         System.out.println("db id" + document.get("passportId"));
         System.out.println("relational id" + passport.getId());
         Document obj = new Document();
         obj.put("_id", passport.getId());
         obj.put(RelMongoConstants.RELMONGOTARGET_PROPERTY_NAME, "passport");
-        assertEquals(document.get("passportref"), obj);
+        assertEquals(document.get("passport"), obj);
     }
 
     @Test