Merge pull request #12 from kaiso/hotfix/#11

[BUG#11] Exception encountered upon retrieval of relmongo annotated e…

Author: kaiso

.gitignore

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

pom.xml

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

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

@@ -78,7 +78,11 @@ private org.bson.Document keepOnlyIdentifier(Object obj, String collection) {
     }
 
     private String getCollectionName(Field field) {
-        return ReflectionsUtil.getGenericType(field).getAnnotation(Document.class).collection();
+        String collection = ReflectionsUtil.getGenericType(field).getAnnotation(Document.class).collection();
+        if(collection == null || "".equals(collection)) {
+        	   collection = ReflectionsUtil.getGenericType(field).getSimpleName().toLowerCase();
+        }
+		return collection;
     }
 
 }

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

@@ -16,14 +16,9 @@
 
 package io.github.kaiso.relmongo.mongo;
 
-import com.mongodb.BasicDBList;
-import com.mongodb.BasicDBObject;
-
-import io.github.kaiso.relmongo.annotation.FetchType;
-import io.github.kaiso.relmongo.lazy.LazyLoadingProxy;
-import io.github.kaiso.relmongo.lazy.RelMongoLazyLoader;
-import io.github.kaiso.relmongo.model.LoadableObjectsMetadata;
-import io.github.kaiso.relmongo.util.RelMongoConstants;
+import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import org.springframework.cglib.proxy.Enhancer;
 import org.springframework.cglib.proxy.Factory;
@@ -32,9 +27,11 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.objenesis.ObjenesisStd;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.stream.Collectors;
+import io.github.kaiso.relmongo.annotation.FetchType;
+import io.github.kaiso.relmongo.lazy.LazyLoadingProxy;
+import io.github.kaiso.relmongo.lazy.RelMongoLazyLoader;
+import io.github.kaiso.relmongo.model.LoadableObjectsMetadata;
+import io.github.kaiso.relmongo.util.RelMongoConstants;
 
 public final class PersistentRelationResolver {
 
@@ -47,6 +44,9 @@ private PersistentRelationResolver() {
     public static void resolveOnLoading(MongoOperations mongoOperations, List<LoadableObjectsMetadata> loadableObjects, org.bson.Document document) {
         for (LoadableObjectsMetadata relation : loadableObjects) {
             String collection = relation.getTargetAssociationClass().getAnnotation(Document.class).collection();
+            if(collection == null || "".equals(collection)) {
+            	   collection = relation.getTargetAssociationClass().getSimpleName().toLowerCase();
+            }
             if (relation.getObjectIds() instanceof Collection && hasToLoad((Collection<?>) relation.getObjectIds())) {
                 if (FetchType.EAGER.equals(relation.getFetchType())) {
                     List<Object> identifierList = ((Collection<?>) relation.getObjectIds()).stream().map(PersistentRelationResolver::mapIdentifier)

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

@@ -4,7 +4,7 @@
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
-@Document(collection = "passports")
+@Document()
 public class Passport {
 
     @Id

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

@@ -22,6 +22,7 @@
 import org.springframework.test.context.ContextConfiguration;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Optional;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -74,18 +75,27 @@ public void shouldSaveAndRetreive() {
 
     @Test
     public void shouldPersistOnlyIdOnOneToManyRelation() {
-        Car car = new Car();
-        car.setColor(Color.BLUE);
-        car.setManufacturer("BMW");
-        carRepository.save(car);
+        Car car1 = new Car();
+        car1.setColor(Color.BLUE);
+        car1.setManufacturer("BMW");
+        Car car2 = new Car();
+        car2.setColor(Color.BLUE);
+        car2.setManufacturer("BMW");
+        carRepository.save(car1);
+        carRepository.save(car2);
         Person person = new Person();
         person.setName("Dave");
         person.setEmail("dave@mail.com");
-        person.setCars(Arrays.asList(new Car[] { car }));
+        person.setCars(Arrays.asList(new Car[] { car1, car2 }));
         repository.save(person);
 
         Document document = mongoOperations.getCollection("people").find().iterator().next();
         assertNull(document.get("cars"));
+        Document obj = new Document();
+        obj.put("_id", car1.getId());
+        obj.put(RelMongoConstants.RELMONGOTARGET_PROPERTY_NAME, "cars");
+        assertTrue(((Collection<?>)document.get("carsrefs")).size() == 2);
+        assertEquals(((Collection<?>)document.get("carsrefs")).iterator().next(), obj);
     }
 
     @Test
@@ -104,7 +114,7 @@ public void shouldPersistOnlyReferencedPropertyOnOneToOneRelation() {
         System.out.println("relational id" + passport.getId());
         Document obj = new Document();
         obj.put("_id", passport.getId());
-        obj.put(RelMongoConstants.RELMONGOTARGET_PROPERTY_NAME, "passports");
+        obj.put(RelMongoConstants.RELMONGOTARGET_PROPERTY_NAME, "passport");
         assertEquals(document.get("passportref"), obj);
     }