closes #156

justinhrobbins · Oct 26, 2014 · 64b4622 · 64b4622
1 parent 457aae3
commit 64b4622
Show file tree

Hide file tree

Showing 47 changed files with 257 additions and 906 deletions.
diff --git a/...ds_Repository_Jpa/src/main/java/org/robbins/flashcards/repository/UserRepositoryImpl.java b/...ds_Repository_Jpa/src/main/java/org/robbins/flashcards/repository/UserRepositoryImpl.java
@@ -3,6 +3,7 @@
 
 import java.util.List;
 
+import javax.persistence.NoResultException;
 import javax.persistence.Query;
 
 import org.robbins.flashcards.model.User;
@@ -55,7 +56,15 @@ public Page<User> findAll(final Pageable page) {
     public User findUserByOpenid(final String openid) {
         Query query = getEm().createQuery("from User where openid = :openid");
         query.setParameter("openid", openid);
-        return (User) query.getSingleResult();
+        try
+		{
+			return (User) query.getSingleResult();
+		}
+		catch (NoResultException e)
+		{
+			return null;
+		}
+
     }
 
     @Override

diff --git a/FlashCards_Repository_Jpa/src/main/resources/applicationContext-repository.xml b/FlashCards_Repository_Jpa/src/main/resources/applicationContext-repository.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
-    <import resource="applicationContext-repository-jpa-commons.xml" />
+    <import resource="classpath:applicationContext-repository-jpa-commons.xml" />
 	<import resource="classpath:infrastructure.xml" />
 
     <bean id="auditorAware" class="org.robbins.flashcards.auditing.AuditingAwareUser" />

diff --git a/.../java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java b/.../java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java
@@ -26,7 +26,7 @@
 import com.google.common.collect.Sets;
 
 @Transactional
-@Component
+@Component("flashcardRepositoryFacade")
 public class DefaultFlashcardRepositoryFacade extends
 		AbstractCrudRepositoryFacadeImpl<FlashCardDto, FlashCard> implements FlashcardFacade {
 

diff --git a/...c/main/java/org/robbins/flashcards/repository/facade/impl/DefaultTagRepositoryFacade.java b/...c/main/java/org/robbins/flashcards/repository/facade/impl/DefaultTagRepositoryFacade.java
@@ -15,7 +15,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-@Component
+@Component("tagRepositoryFacade")
 public class DefaultTagRepositoryFacade extends AbstractCrudRepositoryFacadeImpl<TagDto, Tag> implements
         TagFacade {
 

diff --git a/.../main/java/org/robbins/flashcards/repository/facade/impl/DefaultUserRepositoryFacade.java b/.../main/java/org/robbins/flashcards/repository/facade/impl/DefaultUserRepositoryFacade.java
@@ -15,7 +15,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
-@Component
+@Component("userRepositoryFacade")
 public class DefaultUserRepositoryFacade extends AbstractCrudRepositoryFacadeImpl<UserDto, User> implements
         UserFacade {
 

diff --git a/...itory/facade/impl/DefaultTagFacadeIT.java → ...itory/facade/impl/DefaultTagFacadeIT.java b/...itory/facade/impl/DefaultTagFacadeIT.java → ...itory/facade/impl/DefaultTagFacadeIT.java
@@ -19,8 +19,8 @@
 import com.github.springtestdbunit.annotation.DatabaseSetup;
 
 @Ignore
-@ContextConfiguration({ "classpath:applicationContext-service.xml",
-    "classpath:test-applicationContext-service-springdata.xml" })
+@ContextConfiguration({ "classpath:applicationContext-repository-jpa-commons.xml",
+    "classpath:test-applicationContext-repository-springdata.xml" })
 @DatabaseSetup("classpath:test-flashCardsAppRepository.xml")
 @Category(IntegrationTest.class)
 public class DefaultTagFacadeIT extends BaseIntegrationTest {

diff --git a/FlashCards_Repository_SpringData/src/main/resources/applicationContext-repository.xml b/FlashCards_Repository_SpringData/src/main/resources/applicationContext-repository.xml
@@ -4,7 +4,8 @@
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                         http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.1.xsd">
 
-    <import resource="classpath:infrastructure.xml" />
+	<import resource="classpath:applicationContext-repository-jpa-commons.xml" />
+	<import resource="classpath:infrastructure.xml" />
 
     <bean id="auditorAware" class="org.robbins.flashcards.auditing.AuditingAwareUser" 
         scope="request" />

diff --git a/...src/main/java/org/robbins/flashcards/presentation/facade/base/AbstractCrudFacadeImpl.java b/...src/main/java/org/robbins/flashcards/presentation/facade/base/AbstractCrudFacadeImpl.java
@@ -7,9 +7,7 @@
 import org.robbins.flashcards.exceptions.FlashcardsException;
 import org.robbins.flashcards.facade.base.GenericCrudFacade;
 import org.robbins.flashcards.presentation.facade.PagingAndSortingFacade;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional
 public abstract class AbstractCrudFacadeImpl<D> implements GenericCrudFacade<D>, PagingAndSortingFacade<D>
 {
     @Override
@@ -48,7 +46,7 @@ public D findOne(final Long id) throws FlashcardsException {
 
     @Override
     public D findOne(final Long id, final Set<String> fields) throws FlashcardsException {
-        return getService().findOne(id);
+        return getService().findOne(id, fields);
     }
 
     @Override

diff --git a/...src/main/java/org/robbins/flashcards/presentation/facade/impl/DefaultFlashcardFacade.java b/...src/main/java/org/robbins/flashcards/presentation/facade/impl/DefaultFlashcardFacade.java
@@ -9,17 +9,14 @@
 import org.robbins.flashcards.dto.FlashCardDto;
 import org.robbins.flashcards.dto.TagDto;
 import org.robbins.flashcards.exceptions.FlashcardsException;
-import org.robbins.flashcards.exceptions.ServiceException;
 import org.robbins.flashcards.facade.FlashcardFacade;
 import org.robbins.flashcards.presentation.facade.base.AbstractCrudFacadeImpl;
 import org.robbins.flashcards.service.FlashCardService;
 import org.robbins.flashcards.service.TagService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional
-@Component
+@Component("presentationFlashcardFacade")
 public class DefaultFlashcardFacade extends
         AbstractCrudFacadeImpl<FlashCardDto> implements FlashcardFacade {
 

diff --git a/...rvice/src/main/java/org/robbins/flashcards/presentation/facade/impl/DefaultTagFacade.java b/...rvice/src/main/java/org/robbins/flashcards/presentation/facade/impl/DefaultTagFacade.java
@@ -8,11 +8,10 @@
 import org.robbins.flashcards.facade.TagFacade;
 import org.robbins.flashcards.presentation.facade.base.AbstractCrudFacadeImpl;
 import org.robbins.flashcards.service.TagService;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional
-@Component
+@Component("presentationTagFacade")
 public class DefaultTagFacade extends AbstractCrudFacadeImpl<TagDto> implements
         TagFacade {
 

diff --git a/...vice/src/main/java/org/robbins/flashcards/presentation/facade/impl/DefaultUserFacade.java b/...vice/src/main/java/org/robbins/flashcards/presentation/facade/impl/DefaultUserFacade.java
@@ -9,10 +9,8 @@
 import org.robbins.flashcards.presentation.facade.base.AbstractCrudFacadeImpl;
 import org.robbins.flashcards.service.UserService;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
-@Transactional
-@Component
+@Component("presentationUserFacade")
 public class DefaultUserFacade extends AbstractCrudFacadeImpl<UserDto> implements
         UserFacade {
 

diff --git a/...Cards_Service/src/main/java/org/robbins/flashcards/security/CustomUserDetailsService.java b/...Cards_Service/src/main/java/org/robbins/flashcards/security/CustomUserDetailsService.java
@@ -9,6 +9,7 @@
 
 import org.robbins.flashcards.dto.UserDto;
 import org.robbins.flashcards.facade.UserFacade;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -25,6 +26,7 @@
 public class CustomUserDetailsService implements UserDetailsService {
 
     @Inject
+	@Qualifier("userRepositoryFacade")
     private UserFacade userFacade;
 
     /**

diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardServiceImpl.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardServiceImpl.java
@@ -6,12 +6,14 @@
 
 import javax.inject.Inject;
 
+
 import org.robbins.flashcards.dto.FlashCardDto;
 import org.robbins.flashcards.dto.TagDto;
 import org.robbins.flashcards.exceptions.FlashcardsException;
 import org.robbins.flashcards.facade.FlashcardFacade;
 import org.robbins.flashcards.facade.base.GenericCrudFacade;
 import org.robbins.flashcards.service.base.AbstractCrudServiceImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 
@@ -20,6 +22,7 @@ public class FlashCardServiceImpl extends AbstractCrudServiceImpl<FlashCardDto>
         implements FlashCardService {
 
     @Inject
+	@Qualifier("flashcardRepositoryFacade")
     private FlashcardFacade facade;
 
 	@Override

diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagServiceImpl.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagServiceImpl.java
@@ -8,13 +8,15 @@
 import org.robbins.flashcards.facade.TagFacade;
 import org.robbins.flashcards.facade.base.GenericCrudFacade;
 import org.robbins.flashcards.service.base.AbstractCrudServiceImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 @Service
 public class TagServiceImpl extends AbstractCrudServiceImpl<TagDto> implements
         TagService {
 
     @Inject
+	@Qualifier("tagRepositoryFacade")
     private TagFacade facade;
 
 	@Override

diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserServiceImpl.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserServiceImpl.java
@@ -10,13 +10,15 @@
 import org.robbins.flashcards.facade.base.GenericCrudFacade;
 import org.robbins.flashcards.repository.UserRepository;
 import org.robbins.flashcards.service.base.AbstractCrudServiceImpl;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 @Service
 public class UserServiceImpl extends AbstractCrudServiceImpl<UserDto> implements
         UserService {
 
     @Inject
+	@Qualifier("userRepositoryFacade")
     private UserFacade facade;
 
     @Override

diff --git a/...ds_Service/src/main/java/org/robbins/flashcards/service/base/AbstractCrudServiceImpl.java b/...ds_Service/src/main/java/org/robbins/flashcards/service/base/AbstractCrudServiceImpl.java
@@ -35,7 +35,13 @@ public D findOne(final Long id) throws FlashcardsException {
         return getFacade().findOne(id);
     }
 
-    @Override
+	@Override
+	public D findOne(final Long id, final Set<String> fields) throws FlashcardsException
+	{
+		return getFacade().findOne(id, fields);
+	}
+
+	@Override
     public void delete(final Long id) {
 		getFacade().delete(id);
     }

diff --git a/...ice/src/main/java/org/robbins/flashcards/service/base/GenericPagingAndSortingService.java b/...ice/src/main/java/org/robbins/flashcards/service/base/GenericPagingAndSortingService.java
@@ -17,4 +17,6 @@ List<D> findAll(Integer page, Integer size, String sort, String direction)
 
 	List<D> findAll(Integer page, Integer size, String sort, String direction,
 			Set<String> fields) throws FlashcardsException;
+
+	D findOne(ID id, Set<String> fields) throws FlashcardsException;
 }
diff --git a/FlashCards_Service/src/main/resources/applicationContext-service.xml b/FlashCards_Service/src/main/resources/applicationContext-service.xml
@@ -10,6 +10,7 @@
 
     <context:component-scan base-package="
         org.robbins.flashcards.security,
-        org.robbins.flashcards.service" />
+        org.robbins.flashcards.service,
+        org.robbins.flashcards.presentation.facade" />
 
 </beans>
diff --git a/...ice/src/test/java/org/robbins/flashcards/presentation/facade/impl/DefaultTagFacadeUT.java b/...ice/src/test/java/org/robbins/flashcards/presentation/facade/impl/DefaultTagFacadeUT.java
@@ -78,34 +78,35 @@ public void count() {
 
     @Test
     public void findOne() throws FlashcardsException {
-        when(mockService.findOne(any(Long.class))).thenReturn(mockTag);
+		Long id = 1L;
+        when(mockService.findOne(id, null)).thenReturn(mockTag);
 
-        TagDto result = tagFacade.findOne(any(Long.class));
+        TagDto result = tagFacade.findOne(id);
 
-        verify(mockService).findOne(any(Long.class));
+        verify(mockService).findOne(id, null);
         assertThat(result, is(TagDto.class));
     }
 
     @Test
     public void findOne_WithFields() throws FlashcardsException {
-        TagDto tagDto = new TagDto();
-        Set<String> fields = new HashSet<String>(Arrays.asList("flashcards"));
 
-        when(mockService.findOne(any(Long.class))).thenReturn(mockTag);
+        when(mockService.findOne(any(Long.class), any(Set.class))).thenReturn(mockTag);
 
-        TagDto result = tagFacade.findOne(any(Long.class), fields);
+        TagDto result = tagFacade.findOne(any(Long.class), any(Set.class));
 
-        verify(mockService).findOne(any(Long.class));
+        verify(mockService).findOne(any(Long.class), any(Set.class));
         assertThat(result, is(TagDto.class));
     }
 
     @Test
     public void findOne_ReturnsNull() throws FlashcardsException {
-        when(mockService.findOne(any(Long.class))).thenReturn(null);
+		Long id = 1L;
 
-        TagDto result = tagFacade.findOne(any(Long.class));
+        when(mockService.findOne(id, null)).thenReturn(null);
 
-        verify(mockService).findOne(any(Long.class));
+        TagDto result = tagFacade.findOne(id);
+
+        verify(mockService).findOne(id, null);
         assertThat(result, is(nullValue()));
     }