Merge pull request #9 from kaiso/feature/#8

Feature/#8

Author: kaiso

.gitignore

@@ -1,3 +1,4 @@
 target/
 .classpath
 .project
+pom.xml.versionsBackup

pom.xml

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

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

@@ -16,6 +16,7 @@
 
 package io.github.kaiso.relmongo.events.callback;
 
+import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
 
 import io.github.kaiso.relmongo.annotation.FetchType;
@@ -47,15 +48,15 @@ public void doWith(Field field) throws IllegalAccessException {
         FetchType fetchType = null;
         if (field.isAnnotationPresent(OneToMany.class)) {
             fetchType = field.getAnnotation(OneToMany.class).fetch();
-            loadAssociation(field, fetchType);
+            loadAssociation(field, fetchType, OneToMany.class);
         } else if (field.isAnnotationPresent(OneToOne.class)) {
             fetchType = field.getAnnotation(OneToOne.class).fetch();
-            loadAssociation(field, fetchType);
+            loadAssociation(field, fetchType, OneToOne.class);
         }
 
     }
 
-    private void loadAssociation(Field field, FetchType fetchType) {
+    private void loadAssociation(Field field, FetchType fetchType, Class<?> annotation) {
         String name = "";
         try {
             name = field.getAnnotation(JoinProperty.class).name();
@@ -65,6 +66,12 @@ private void loadAssociation(Field field, FetchType fetchType) {
         Object ids = null;
         try {
             ids = ((BasicDBObject) source).get(name);
+            if (OneToOne.class.equals(annotation) && ids instanceof BasicDBList) {
+                // mongo database lookups return always an array if unwind is not used event if
+                // it is a one ot one association
+                BasicDBList list = (BasicDBList) ids;
+                ids = list.isEmpty() ? list : list.get(0);
+            }
         } catch (Exception e) {
             throw new IllegalArgumentException("Property defined in @JoinProperty annotation is not present", e);
         }

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

@@ -55,7 +55,7 @@ public static void resolveOnLoading(MongoOperations mongoOperations, List<Loadab
                 } else {
                     source.put(relation.getFieldName(), relation.getObjectIds());
                 }
-            } else if (relation.getObjectIds() instanceof BasicDBObject) {
+            } else if (relation.getObjectIds() instanceof BasicDBObject && hasToLoad((BasicDBObject) relation.getObjectIds())) {
                 if (FetchType.EAGER.equals(relation.getFetchType())) {
                     source.put(relation.getFieldName(), DatabaseLoader.getDocumentByPropertyValue(mongoOperations, mapIdentifier(relation.getObjectIds()),
                             relation.getReferencedPropertyName(), collection));