Merge pull request #97 from justinhrobbins/feature_80

Feature 80
justinhrobbins · Jan 11, 2014 · f4fe54c · f4fe54c
2 parents 474d57f + 4489bfd
commit f4fe54c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/FlashCards_Domain/pom.xml b/FlashCards_Domain/pom.xml
@@ -10,7 +10,8 @@
 	<name>FlashCards_Domain</name>
 	<description>FlashCards_Domain description</description>
 	<properties>
-		<skip.coveralls>false</skip.coveralls>
+		<skip.coveralls>true</skip.coveralls>
+		<skip.cobertura>true</skip.cobertura>
 	</properties>
 	<scm>
 		<connection>scm:git:git@github.com:justinhrobbins/FlashCards_App.git</connection>

diff --git a/...Cards_Service/src/main/java/org/robbins/flashcards/service/util/FieldInitializerUtil.java b/...Cards_Service/src/main/java/org/robbins/flashcards/service/util/FieldInitializerUtil.java
@@ -28,9 +28,13 @@ private void initializeField(Object entity, String field) throws IllegalAccessEx
 
 		 PersistenceUnitUtil unitUtil = em.getEntityManagerFactory().getPersistenceUnitUtil();
 
+		 // if the requested 'field' exists and hasn't been 
 		 if ( (PropertyUtils.isReadable(entity, field)) && (!unitUtil.isLoaded(entity, field)) ) {
 				 Object value = PropertyUtils.getProperty(entity, field);
+				 // is the 'field' a collection?
 				 if (value instanceof Collection<?>) {
+					 // this is why we are here!
+					 // initialize the collection
 					 initializeCollection((Collection<?>) value);	 
 				 }
 		 }
@@ -77,6 +81,7 @@ private void initializeCollection(Collection<?> collection) {
 	    if(collection == null) {
 	        return;
 	    }
+	    // we force the ORM to initialize the collection by touching it (hasNext)
 	    collection.iterator().hasNext();
 	}
 }
diff --git a/...rds_Service/src/test/java/org/robbins/flashcards/service/util/HibernateFieldMapperUT.java b/...rds_Service/src/test/java/org/robbins/flashcards/service/util/HibernateFieldMapperUT.java
@@ -15,6 +15,7 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mock;
+import org.robbins.flashcards.dto.FlashCardDto;
 import org.robbins.flashcards.dto.TagDto;
 import org.robbins.flashcards.exceptions.ServiceException;
 import org.robbins.tests.BaseMockingTest;
@@ -36,15 +37,17 @@ public class HibernateFieldMapperUT extends BaseMockingTest {
 	private FieldInitializerUtil fieldInitializerUtil;
 
 	private TagDto tagDto;
-	
+
 	private String FIELD_NAME = "name";
+	private String COLLECTION_FIELD_NAME = "flashcards";
 
 	@Before
 	public void before() {
-		String TAG_NAME = "test_tag";
-		tagDto = new TagDto(TAG_NAME);
 		fieldInitializerUtil = new FieldInitializerUtil();
 
+		tagDto = new TagDto();
+		tagDto.setFlashcards(new HashSet<FlashCardDto>());
+
 		when(mockEntityManager.getEntityManagerFactory()).thenReturn(mockEntityManagerFactory);
 		when(mockEntityManagerFactory.getPersistenceUnitUtil()).thenReturn(mockPersistenceUnitUtil);
 		when(mockEntityManagerFactory.createEntityManager()).thenReturn(mockEntityManager);
@@ -54,7 +57,7 @@ public void before() {
 
 	@Test
 	public void initializeEntity() throws IllegalAccessException, InvocationTargetException, NoSuchMethodException, ServiceException {
-		fieldInitializerUtil.initializeEntity(tagDto, new HashSet<String>(Arrays.asList(FIELD_NAME)));
+		fieldInitializerUtil.initializeEntity(tagDto, new HashSet<String>(Arrays.asList(COLLECTION_FIELD_NAME)));
 	}
 
 	@Test