Merge pull request #6 from kaiso/feature/#5

[#5] transform the reference type from ObjectId to Object in OneToOne…

Author: kaiso

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

@@ -64,7 +64,7 @@ private void saveAssociation(Field field) {
                 ((BasicDBObject) source).put(name, list);
             } else if (reference instanceof BasicDBObject) {
                 ((BasicDBObject) source).remove(field.getName());
-                ((BasicDBObject) source).put(name, ((BasicDBObject) reference).get("_id"));
+                ((BasicDBObject) source).put(name, this.keepOnlyIdentifier(reference));
             }
         } 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

@@ -25,7 +25,6 @@
 import io.github.kaiso.relmongo.lazy.RelMongoLazyLoader;
 import io.github.kaiso.relmongo.model.LoadableObjectsMetadata;
 
-import org.bson.types.ObjectId;
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
 import org.springframework.cglib.proxy.NoOp;
@@ -55,14 +54,12 @@ public static void resolveOnLoading(MongoOperations mongoOperations, List<Loadab
                 } else {
                     source.put(relation.getFieldName(), relation.getObjectIds());
                 }
-            } else if (relation.getObjectIds() instanceof ObjectId) {
+            } else if (relation.getObjectIds() instanceof BasicDBObject) {
                 if (FetchType.EAGER.equals(relation.getFetchType())) {
-                    source.put(relation.getFieldName(), DatabaseLoader.getDocumentByPropertyValue(mongoOperations, relation.getObjectIds(),
+                    source.put(relation.getFieldName(), DatabaseLoader.getDocumentByPropertyValue(mongoOperations, mapIdentifier(relation.getObjectIds()),
                             relation.getReferencedPropertyName(), collection));
                 } else {
-                    BasicDBObject object = new BasicDBObject();
-                    object.put("_id", relation.getObjectIds());
-                    source.put(relation.getFieldName(), object);
+                    source.put(relation.getFieldName(), relation.getObjectIds());
                 }
             }
         }

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

@@ -17,19 +17,19 @@ public class Person {
     private String email;
 
     @OneToMany(fetch=FetchType.EAGER)
-    @JoinProperty(name="cars_ids")
+    @JoinProperty(name="carsrefs")
     private List<Car> cars;
 
     @OneToMany(fetch=FetchType.LAZY)
-    @JoinProperty(name="houses_ids")
+    @JoinProperty(name="housesrefs")
     private List<House> houses;
 
     @OneToOne(fetch=FetchType.EAGER)
-    @JoinProperty(name = "passportId")
+    @JoinProperty(name = "passportref")
     private Passport passport;
 
     @OneToOne(fetch=FetchType.LAZY)
-    @JoinProperty(name = "drivingLicenseId")
+    @JoinProperty(name = "drivingLicenseref")
     private DrivingLicense drivingLicense;
 
     public String getName() {

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

@@ -1,5 +1,6 @@
 package io.github.kaiso.relmongo.tests;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 import io.github.kaiso.relmongo.data.model.Car;
@@ -101,7 +102,9 @@ public void shouldPersistOnlyReferencedPropertyOnOneToOneRelation() {
         assertNull(personNoRelational.get("passport"));
         System.out.println("db id" + personNoRelational.get("passportId"));
         System.out.println("relational id" + passport.getId());
-        assertEquals(personNoRelational.get("passportId"), passport.getId());
+        BasicDBObject obj = new BasicDBObject();
+        obj.put("_id", passport.getId());
+        assertEquals(personNoRelational.get("passportref"), obj);
     }
 
     @Test