From 4a40da2dc0de6e4caf9516beebd52d7f91ab95dc Mon Sep 17 00:00:00 2001 From: Justin Robbins | hybris Date: Sat, 2 Jan 2016 13:40:45 -0700 Subject: [PATCH 01/13] closes #81 --- .../exceptions/FlashcardsException.java | 6 +- .../exceptions/RepositoryException.java | 2 +- .../exceptions/ServiceException.java | 3 +- .../flashcards/facade/FlashcardFacade.java | 16 +++--- .../robbins/flashcards/facade/TagFacade.java | 7 +-- .../robbins/flashcards/facade/UserFacade.java | 4 +- .../facade/base/GenericCrudFacade.java | 18 +++--- .../flashcards/client/AbstractCrudClient.java | 8 ++- .../client/DefaultFlashcardClient.java | 11 ++-- .../client/DefaultFlashcardsAppClient.java | 3 +- .../flashcards/client/DefaultTagClient.java | 6 +- .../flashcards/client/FlashcardClient.java | 4 +- .../client/FlashcardsAppClient.java | 3 +- .../flashcards/client/util/ResourceUrls.java | 4 +- .../org/robbins/flashcards/dto/TagDto.java | 10 ++-- .../dto/builder/FlashCardDtoBuilder.java | 12 ++-- .../webservices/FlashCardsAppResourceIT.java | 4 +- .../webservices/FlashCardsResourceIT.java | 28 +++++---- .../webservices/TagsResourceIT.java | 33 ++++++----- .../webservices/UsersResourceIT.java | 7 ++- .../robbins/load/tester/actor/LoadTester.java | 4 +- .../service/DefaultLoadTestingService.java | 4 +- .../load/tester/util/LoadingTestingUtil.java | 10 ++-- .../repository/FlashCardRepositoryImpl.java | 41 +++++++------ .../TagFlashcardCassandraRepository.java | 2 +- .../repository/TagRepositoryImpl.java | 24 ++++---- .../DefaultFlashCardRepositoryFacade.java | 32 +++++++---- .../facade/DefaultTagRepositoryFacade.java | 8 +-- .../facade/DefaultUserRepositoryFacade.java | 6 +- .../AbstractCrudRepositoryFacadeImpl.java | 27 +++++---- .../repository/FlashCardRepositoryIT.java | 28 ++++----- .../repository/TagFlashCardRepositoryIT.java | 12 ++-- .../cassandra/repository/TagRepositoryIT.java | 4 +- .../domain/FlashCardCassandraBuilder.java | 12 ++-- .../facade/impl/DefaultFlashCardFacadeIT.java | 28 ++++----- .../facade/impl/DefaultTagFacadeIT.java | 24 ++++---- .../facade/impl/DefaultUserFacadeIT.java | 26 +++++---- .../repository/util/IntegrationTestUtils.java | 16 +++--- .../flashcards/repository/TagRepository.java | 2 +- .../repository/FlashCardRepositoryImpl.java | 20 ++++--- .../jpa/repository/TagRepositoryImpl.java | 6 +- .../jpa/repository/TagRepositoryIT.java | 4 +- .../org/robbins/flashcards/model/Tag.java | 18 +++--- .../impl/DefaultFlashcardDtoConverter.java | 2 +- .../AbstractCrudRepositoryFacadeImpl.java | 10 ++-- .../DefaultFlashcardRepositoryFacade.java | 16 +++--- .../impl/DefaultTagRepositoryFacade.java | 4 +- .../DefaultFlashcardDtoConverterUT.java | 6 +- .../facade/impl/DefaultFlashcardFacadeUT.java | 57 ++++++++++--------- .../facade/impl/DefaultTagFacadeIT.java | 4 +- .../facade/impl/DefaultTagFacadeUT.java | 19 ++++--- .../facade/impl/DefaultUserFacadeUT.java | 10 ++-- .../util/FieldInitializerUtilUT.java | 2 +- .../repository/FlashcardRepositoryImpl.java | 2 +- .../repository/TagRepositoryImpl.java | 6 +- .../repository/TagSpringDataRepository.java | 4 +- .../repository/predicates/TagPredicates.java | 4 +- .../springdata/TagRepositoryIT.java | 6 +- .../akka/actor/ItemSavingActor.java | 4 +- .../flashcards/service/FlashCardService.java | 14 ++--- .../service/FlashCardServiceImpl.java | 25 ++++---- .../flashcards/service/TagService.java | 6 +- .../flashcards/service/TagServiceImpl.java | 10 ++-- .../flashcards/service/UserService.java | 4 +- .../flashcards/service/UserServiceImpl.java | 5 +- .../service/base/AbstractCrudServiceImpl.java | 27 +++++---- .../service/base/GenericCrudService.java | 10 ++-- .../base/GenericPagingAndSortingService.java | 10 ++-- .../service/FlashCardServiceImplUT.java | 21 ++++--- .../flashcards/service/TagServiceImplUT.java | 5 +- .../flashcards/service/UserServiceImplUT.java | 5 +- .../base/AbstractCrudServiceImplUT.java | 10 ++-- .../webservices/GenericEntityRestTest.java | 17 ++++-- .../activity/EditFlashCardActivity.java | 17 +++--- .../client/activity/EditTagActivity.java | 2 +- .../client/activity/FlashCardsActivity.java | 2 +- .../flashcards/client/ui/AppConstants.java | 2 +- .../client/ui/AppConstants.properties | 2 +- .../ui/desktop/TagsViewImplDesktop.java | 4 +- .../client/ui/widgets/DeleteTagImageCell.java | 2 +- .../client/ui/widgets/FlashCardFlexTable.java | 2 +- .../events/DeleteFlashCardEvent.java | 2 +- .../events/DeleteFlashCardEventHandler.java | 2 +- .../org/robbins/flashcards/model/TagDto.java | 20 +++---- .../presentation/action/FlashCardAction.java | 38 ++++++------- .../presentation/action/TagAction.java | 7 +-- .../webservices/FlashCardsResource.java | 52 ++++++++--------- .../flashcards/webservices/TagsResource.java | 28 ++++----- .../flashcards/webservices/UsersResource.java | 6 +- .../base/AbstractGenericListingResource.java | 4 +- .../base/AbstractGenericResource.java | 14 ++--- .../base/AbstractSecurityFilter.java | 4 +- .../webservices/FlashCardsResourceUT.java | 26 +++++---- .../webservices/TagsResourceUT.java | 13 +++-- .../webservices/UsersResourceUT.java | 7 ++- .../base/AbstractGenericResourceUT.java | 23 +++++--- 96 files changed, 626 insertions(+), 525 deletions(-) diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashcardsException.java b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashcardsException.java index f3d10b606..def515f6d 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashcardsException.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashcardsException.java @@ -11,13 +11,13 @@ */ package org.robbins.flashcards.exceptions; -public class FlashcardsException extends RuntimeException +public class FlashCardsException extends RuntimeException { - public FlashcardsException(final String message) { + public FlashCardsException(final String message) { super(message); } - public FlashcardsException(final String message, final Throwable cause) { + public FlashCardsException(final String message, final Throwable cause) { super(message, cause); } } diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/RepositoryException.java b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/RepositoryException.java index 900cf7454..960008ab7 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/RepositoryException.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/RepositoryException.java @@ -11,7 +11,7 @@ */ package org.robbins.flashcards.exceptions; -public class RepositoryException extends FlashcardsException +public class RepositoryException extends FlashCardsException { public RepositoryException(final String message) { super(message); diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/ServiceException.java b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/ServiceException.java index 08713dde2..fc768bf22 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/ServiceException.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/ServiceException.java @@ -1,7 +1,8 @@ package org.robbins.flashcards.exceptions; -public class ServiceException extends FlashcardsException { +public class ServiceException extends FlashCardsException +{ public ServiceException(final String message) { super(message); diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java index fcb9f42c4..772d181a9 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java @@ -3,21 +3,21 @@ import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.base.GenericCrudFacade; import org.springframework.data.domain.PageRequest; import java.util.List; import java.util.Set; -public interface FlashcardFacade extends GenericCrudFacade +public interface FlashCardFacade extends GenericCrudFacade { - List findByTagsIn(final Set tags) throws FlashcardsException; + List findByTagsIn(final Set tags) throws FlashCardsException; List findByTagsIn(final Set tags, final PageRequest page) - throws FlashcardsException; - List findByQuestionLike(final String question) throws FlashcardsException; + throws FlashCardsException; + List findByQuestionLike(final String question) throws FlashCardsException; List findByQuestionLike(final String question, final PageRequest page) - throws FlashcardsException; - FlashCardDto findByQuestion(final String question) throws FlashcardsException; - List findFlashcardsForTag(final Long tagId, final Set fields) throws FlashcardsException; + throws FlashCardsException; + FlashCardDto findByQuestion(final String question) throws FlashCardsException; + List findFlashCardsForTag(final Long tagId, final Set fields) throws FlashCardsException; } diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/TagFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/TagFacade.java index ea525908b..b4a602f5d 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/TagFacade.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/TagFacade.java @@ -2,8 +2,7 @@ package org.robbins.flashcards.facade; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; -import org.robbins.flashcards.exceptions.RepositoryException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.base.GenericCrudFacade; import java.util.List; @@ -11,6 +10,6 @@ public interface TagFacade extends GenericCrudFacade { - TagDto findByName(final String name) throws FlashcardsException; - List findTagsForFlashcard(final Long flashcardId, final Set fields) throws FlashcardsException; + TagDto findByName(final String name) throws FlashCardsException; + List findTagsForFlashCard(final Long flashCardId, final Set fields) throws FlashCardsException; } diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/UserFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/UserFacade.java index 484678c0a..54ec6da69 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/UserFacade.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/UserFacade.java @@ -2,10 +2,10 @@ package org.robbins.flashcards.facade; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.base.GenericCrudFacade; public interface UserFacade extends GenericCrudFacade { - UserDto findUserByOpenid(String openid) throws FlashcardsException; + UserDto findUserByOpenid(String openid) throws FlashCardsException; } diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/base/GenericCrudFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/base/GenericCrudFacade.java index d73232691..9a70e7daa 100644 --- a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/base/GenericCrudFacade.java +++ b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/base/GenericCrudFacade.java @@ -2,7 +2,7 @@ package org.robbins.flashcards.facade.base; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.springframework.data.domain.Pageable; import java.util.List; @@ -11,14 +11,14 @@ public interface GenericCrudFacade { - List list() throws FlashcardsException; - List list(final Optional page) throws FlashcardsException; - List list(final Optional page, Set fields) throws FlashcardsException; + List list() throws FlashCardsException; + List list(final Optional page) throws FlashCardsException; + List list(final Optional page, Set fields) throws FlashCardsException; Long count(); - D findOne(final ID id) throws FlashcardsException; - D findOne(final ID id, Set fields) throws FlashcardsException; - D save(final D entity) throws FlashcardsException; - BatchLoadingReceiptDto save(final List dtos) throws FlashcardsException; + D findOne(final ID id) throws FlashCardsException; + D findOne(final ID id, Set fields) throws FlashCardsException; + D save(final D entity) throws FlashCardsException; + BatchLoadingReceiptDto save(final List dtos) throws FlashCardsException; void delete(final ID id); - List findByCreatedBy(final ID userId, final Set fields) throws FlashcardsException; + List findByCreatedBy(final ID userId, final Set fields) throws FlashCardsException; } diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/AbstractCrudClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/AbstractCrudClient.java index ee888d0a8..7d8dfe312 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/AbstractCrudClient.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/AbstractCrudClient.java @@ -10,7 +10,7 @@ import org.robbins.flashcards.dto.AbstractPersistableDto; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.exceptions.ServiceException; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpEntity; @@ -165,7 +165,8 @@ public E save(final E entity) throws ServiceException { } @Override - public BatchLoadingReceiptDto save(List entities) throws FlashcardsException { + public BatchLoadingReceiptDto save(List entities) throws FlashCardsException + { // set the Authentication header @SuppressWarnings({ "unchecked", "rawtypes" }) final HttpEntity httpEntity = new HttpEntity(entities, getAuthHeaders()); @@ -225,7 +226,8 @@ public void put(final E entity) { } @Override - public List findByCreatedBy(final ID userId, final Set fields) throws FlashcardsException { + public List findByCreatedBy(final ID userId, final Set fields) throws FlashCardsException + { Map uriVariables = new HashMap(); uriVariables.put("userId", String.valueOf(userId)); return Arrays.asList(searchEntities(getEntityListUrl(), uriVariables, getClazzArray())); diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java index 48169c7ed..cb6c87631 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java @@ -1,10 +1,9 @@ package org.robbins.flashcards.client; import org.robbins.flashcards.client.util.ResourceUrls; -import org.robbins.flashcards.dto.AbstractPersistableDto; import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.exceptions.ServiceException; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Component; @@ -14,7 +13,8 @@ @Component("flashcardClient") -public class DefaultFlashcardClient extends AbstractCrudClient implements FlashcardClient { +public class DefaultFlashCardClient extends AbstractCrudClient implements FlashCardClient +{ @Override public String getEntityListUrl() { return getServerAddress() + ResourceUrls.flashCards; @@ -122,9 +122,10 @@ public FlashCardDto findByQuestion(final String question) throws ServiceExceptio } @Override - public List findFlashcardsForTag(Long tagId, Set fields) throws FlashcardsException { + public List findFlashCardsForTag(Long tagId, Set fields) throws FlashCardsException + { final Map uriVariables = new HashMap(); uriVariables.put("tagId", String.valueOf(tagId)); - return Arrays.asList(searchEntities(getServerAddress() + ResourceUrls.flashcardsForTag, uriVariables, FlashCardDto[].class)); + return Arrays.asList(searchEntities(getServerAddress() + ResourceUrls.flashCardsForTag, uriVariables, FlashCardDto[].class)); } } diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardsAppClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardsAppClient.java index e29b53c9e..4edcbdbcb 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardsAppClient.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardsAppClient.java @@ -8,7 +8,8 @@ import org.springframework.stereotype.Component; @Component -public class DefaultFlashcardsAppClient extends AbstractClient implements FlashcardsAppClient { +public class DefaultFlashCardsAppClient extends AbstractClient implements FlashCardsAppClient +{ private String getStatusUrl() { return getServerAddress() + ResourceUrls.status; diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultTagClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultTagClient.java index 2449025fc..05a123ced 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultTagClient.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultTagClient.java @@ -66,9 +66,9 @@ public TagDto findByName(final String name) throws ServiceException { } @Override - public List findTagsForFlashcard(final Long flashcardId, final Set fields) { + public List findTagsForFlashCard(final Long flashCardId, final Set fields) { Map uriVariables = new HashMap(); - uriVariables.put("flashcardId", String.valueOf(flashcardId)); - return Arrays.asList(searchEntities(getServerAddress() + ResourceUrls.tagsForFlashcard, uriVariables, TagDto[].class)); + uriVariables.put("flashcardId", String.valueOf(flashCardId)); + return Arrays.asList(searchEntities(getServerAddress() + ResourceUrls.tagsForFlashCard, uriVariables, TagDto[].class)); } } diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java index 6bdaed9c5..74a0405ad 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java @@ -1,7 +1,7 @@ package org.robbins.flashcards.client; import org.robbins.flashcards.dto.FlashCardDto; -import org.robbins.flashcards.facade.FlashcardFacade; +import org.robbins.flashcards.facade.FlashCardFacade; -public interface FlashcardClient extends FlashcardFacade, GenericRestCrudFacade { +public interface FlashCardClient extends FlashCardFacade, GenericRestCrudFacade { } diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardsAppClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardsAppClient.java index e3592966f..53c8b57c4 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardsAppClient.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardsAppClient.java @@ -1,5 +1,6 @@ package org.robbins.flashcards.client; -public interface FlashcardsAppClient { +public interface FlashCardsAppClient +{ String getStatus(); } diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/util/ResourceUrls.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/util/ResourceUrls.java index fb3c4cc2c..af7620555 100644 --- a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/util/ResourceUrls.java +++ b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/util/ResourceUrls.java @@ -32,9 +32,9 @@ private ResourceUrls() { public static final String status = "/v1/status/"; - public static final String tagsForFlashcard = "v1/flashcards/{flashcardId}/tags"; + public static final String tagsForFlashCard = "v1/flashcards/{flashcardId}/tags"; - public static final String flashcardsForTag = "v1/tags/{tagId}/flashcards"; + public static final String flashCardsForTag = "v1/tags/{tagId}/flashcards"; public static final String batch = "batch/"; } diff --git a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/TagDto.java b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/TagDto.java index 56d6afafd..d77b9f650 100644 --- a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/TagDto.java +++ b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/TagDto.java @@ -22,7 +22,7 @@ public class TagDto extends AbstractAuditableDto implements Serializable { private String name; - private Set flashcards = new HashSet(0); + private Set flashCards = new HashSet<>(0); public TagDto() { } @@ -44,12 +44,12 @@ public void setName(final String name) { this.name = name; } - public Set getFlashcards() { - return flashcards; + public Set getFlashCards() { + return flashCards; } - public void setFlashcards(final Set flashcards) { - this.flashcards = flashcards; + public void setFlashCards(final Set flashCardId) { + this.flashCards = flashCardId; } /** diff --git a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/builder/FlashCardDtoBuilder.java b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/builder/FlashCardDtoBuilder.java index f3dff8632..acdd3f093 100644 --- a/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/builder/FlashCardDtoBuilder.java +++ b/FlashCards_DTO/src/main/java/org/robbins/flashcards/dto/builder/FlashCardDtoBuilder.java @@ -4,31 +4,31 @@ import org.robbins.flashcards.dto.TagDto; public class FlashCardDtoBuilder { - private FlashCardDto flashcard = new FlashCardDto(); + private FlashCardDto flashCardId = new FlashCardDto(); public FlashCardDtoBuilder() {} public FlashCardDtoBuilder withId(final Long id) { - flashcard.setId(id); + flashCardId.setId(id); return this; } public FlashCardDtoBuilder withQuestion(final String question) { - flashcard.setQuestion(question); + flashCardId.setQuestion(question); return this; } public FlashCardDtoBuilder withAnswer(final String answer) { - flashcard.setAnswer(answer); + flashCardId.setAnswer(answer); return this; } public FlashCardDtoBuilder withTag(final TagDto tag) { - flashcard.getTags().add(tag); + flashCardId.getTags().add(tag); return this; } public FlashCardDto build() { - return flashcard; + return flashCardId; } } diff --git a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java index 09b2ee35a..11211c2c6 100644 --- a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java +++ b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsAppResourceIT.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; -import org.robbins.flashcards.client.FlashcardsAppClient; +import org.robbins.flashcards.client.FlashCardsAppClient; import org.robbins.tests.IntegrationTest; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -21,7 +21,7 @@ public class FlashCardsAppResourceIT { @Inject - private FlashcardsAppClient client; + private FlashCardsAppClient client; @Test public void status_FoundManifestAndVerson() { diff --git a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceIT.java b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceIT.java index 1400b39d3..0893dd19c 100644 --- a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceIT.java +++ b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceIT.java @@ -5,14 +5,14 @@ import org.hamcrest.Matchers; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.robbins.flashcards.client.FlashcardClient; +import org.robbins.flashcards.client.FlashCardClient; import org.robbins.flashcards.client.GenericRestCrudFacade; import org.robbins.flashcards.client.TagClient; import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; import org.robbins.flashcards.dto.builder.FlashCardDtoBuilder; import org.robbins.flashcards.dto.builder.TagDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.tests.webservices.GenericEntityRestTest; import org.robbins.tests.IntegrationTest; import org.springframework.test.context.ContextConfiguration; @@ -43,7 +43,7 @@ public FlashCardDto getEntity() { } @Inject - private FlashcardClient client; + private FlashCardClient client; @Inject private TagClient tagClient; @@ -54,7 +54,7 @@ public GenericRestCrudFacade getClient() { } @Test - public void testSearchByTagsIn() throws FlashcardsException + public void testSearchByTagsIn() throws FlashCardsException { final Set tags = new HashSet<>(); tags.add(new TagDto(2L, "two")); @@ -66,7 +66,8 @@ public void testSearchByTagsIn() throws FlashcardsException } @Test - public void testUpdateEntity() throws FlashcardsException { + public void testUpdateEntity() throws FlashCardsException + { final Long id = getEntity().getId(); final String UPDATED_VALUE = "updated value"; @@ -81,7 +82,8 @@ public void testUpdateEntity() throws FlashcardsException { } @Test - public void createNewFlashCard_WithNewTag() throws FlashcardsException { + public void createNewFlashCard_WithNewTag() throws FlashCardsException + { final FlashCardDto flashCard = new FlashCardDto(); flashCard.setQuestion("Question4"); @@ -100,23 +102,25 @@ public void createNewFlashCard_WithNewTag() throws FlashcardsException { } @Test - public void testFindFlashcardsForTag() throws FlashcardsException { - final FlashCardDto flashCard = setupFlashcard(); + public void testFindFlashCardsForTag() throws FlashCardsException + { + final FlashCardDto flashCard = setupFlashCard(); - final List results = client.findFlashcardsForTag(flashCard.getTags().iterator().next().getId(), null); + final List results = client.findFlashCardsForTag(flashCard.getTags().iterator().next().getId(), null); assertTrue(results != null); assertTrue(results.size() == 1); - cleanupFlashcard(flashCard); + cleanupFlashCard(flashCard); } - private FlashCardDto setupFlashcard() throws FlashcardsException { + private FlashCardDto setupFlashCard() throws FlashCardsException + { final FlashCardDto flashCardDto = new FlashCardDtoBuilder().withQuestion("question").withAnswer("answer").build(); flashCardDto.setTags(Sets.newHashSet(new TagDtoBuilder().withName("tag_name").build())); return client.save(flashCardDto); } - private void cleanupFlashcard(FlashCardDto flashCard) { + private void cleanupFlashCard(FlashCardDto flashCard) { client.delete(flashCard.getId()); tagClient.delete(flashCard.getTags().iterator().next().getId()); } diff --git a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/TagsResourceIT.java b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/TagsResourceIT.java index 27dd9c7b8..6fd14abe6 100644 --- a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/TagsResourceIT.java +++ b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/TagsResourceIT.java @@ -6,21 +6,20 @@ import org.apache.commons.lang3.RandomUtils; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.robbins.flashcards.client.FlashcardClient; +import org.robbins.flashcards.client.FlashCardClient; import org.robbins.flashcards.client.GenericRestCrudFacade; import org.robbins.flashcards.client.TagClient; import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.builder.FlashCardDtoBuilder; import org.robbins.flashcards.dto.TagDto; import org.robbins.flashcards.dto.builder.TagDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.tests.webservices.GenericEntityRestTest; import org.robbins.tests.IntegrationTest; import org.springframework.test.context.ContextConfiguration; import javax.inject.Inject; import java.util.List; -import java.util.UUID; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -38,7 +37,7 @@ public class TagsResourceIT extends GenericEntityRestTest { private TagClient client; @Inject - private FlashcardClient flashcardClient; + private FlashCardClient flashCardClient; @Override public GenericRestCrudFacade getClient() { @@ -56,7 +55,7 @@ public TagDto getEntity() { } @Test - public void testSearchByName() throws FlashcardsException + public void testSearchByName() throws FlashCardsException { final TagDto searchResult = client.findByName(TAG_NAME); @@ -66,7 +65,8 @@ public void testSearchByName() throws FlashcardsException } @Test - public void testUpdateEntity() throws FlashcardsException { + public void testUpdateEntity() throws FlashCardsException + { final Long id = getEntity().getId(); final String UPDATED_VALUE = "updated value"; @@ -81,7 +81,8 @@ public void testUpdateEntity() throws FlashcardsException { } @Test - public void testFindByCreatedBy() throws FlashcardsException { + public void testFindByCreatedBy() throws FlashCardsException + { final Long userId = RandomUtils.nextLong(0L, Long.MAX_VALUE); final List results = client.findByCreatedBy(userId, null); @@ -90,24 +91,26 @@ public void testFindByCreatedBy() throws FlashcardsException { } @Test - public void testFindTagsForFlashcard() throws FlashcardsException { - final FlashCardDto flashCard = setupFlashcard(); + public void testFindTagsForFlashCard() throws FlashCardsException + { + final FlashCardDto flashCard = setupFlashCard(); - final List results = client.findTagsForFlashcard(flashCard.getId(), null); + final List results = client.findTagsForFlashCard(flashCard.getId(), null); assertTrue(results != null); assertTrue(results.size() == 1); - cleanupFlashcard(flashCard); + cleanupFlashCard(flashCard); } - private FlashCardDto setupFlashcard() throws FlashcardsException { + private FlashCardDto setupFlashCard() throws FlashCardsException + { final FlashCardDto flashCardDto = new FlashCardDtoBuilder().withQuestion("question").withAnswer("answer").build(); flashCardDto.setTags(Sets.newHashSet(new TagDtoBuilder().withName("tag_name").build())); - return flashcardClient.save(flashCardDto); + return flashCardClient.save(flashCardDto); } - private void cleanupFlashcard(FlashCardDto flashCard) { - flashcardClient.delete(flashCard.getId()); + private void cleanupFlashCard(FlashCardDto flashCard) { + flashCardClient.delete(flashCard.getId()); client.delete(flashCard.getTags().iterator().next().getId()); } } diff --git a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/UsersResourceIT.java b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/UsersResourceIT.java index 9e132cb6d..407f5debc 100644 --- a/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/UsersResourceIT.java +++ b/FlashCards_Feature_Tests/src/test/java/org/robbins/flashcards/webservices/UsersResourceIT.java @@ -7,7 +7,7 @@ import org.robbins.flashcards.client.UserClient; import org.robbins.flashcards.dto.UserDto; import org.robbins.flashcards.dto.builder.UserDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.tests.webservices.GenericEntityRestTest; import org.robbins.tests.IntegrationTest; import org.springframework.test.context.ContextConfiguration; @@ -46,7 +46,7 @@ public GenericRestCrudFacade getClient() { } @Test - public void testSearchByOpenId() throws FlashcardsException + public void testSearchByOpenId() throws FlashCardsException { final UserDto searchResult = client.findUserByOpenid(OPEN_ID); @@ -54,7 +54,8 @@ public void testSearchByOpenId() throws FlashcardsException } @Test - public void testUpdateEntity() throws FlashcardsException { + public void testUpdateEntity() throws FlashCardsException + { final Long id = getEntity().getId(); final String UPDATED_VALUE = "updated value"; diff --git a/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/actor/LoadTester.java b/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/actor/LoadTester.java index 4d97d8439..4deb80c72 100644 --- a/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/actor/LoadTester.java +++ b/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/actor/LoadTester.java @@ -6,7 +6,7 @@ import akka.japi.pf.ReceiveBuilder; import org.robbins.flashcards.client.GenericRestCrudFacade; import org.robbins.flashcards.dto.AbstractAuditableDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.load.tester.message.SingleTestResult; import org.robbins.load.tester.message.TestStart; import org.robbins.load.tester.util.LoadingTestingUtil; @@ -62,7 +62,7 @@ private SingleTestResult saveItem(final TestSta try { client.save(dto); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { LOGGER.error("Unable to create Dto {}, error: {}", dto.toString(), e.getMessage()); resultStatus = SingleTestResult.TestResultStatus.FAILURE; } diff --git a/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/service/DefaultLoadTestingService.java b/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/service/DefaultLoadTestingService.java index 97ce114e5..b598d1fe6 100644 --- a/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/service/DefaultLoadTestingService.java +++ b/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/service/DefaultLoadTestingService.java @@ -3,7 +3,7 @@ import org.robbins.flashcards.client.GenericRestCrudFacade; import org.robbins.flashcards.dto.AbstractAuditableDto; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.load.tester.message.LoadTestResult; import org.robbins.load.tester.message.LoadTestStart; import org.robbins.load.tester.message.SingleTestResult; @@ -102,7 +102,7 @@ private SingleTestResult saveItem(final String try { client.save(dto); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { LOGGER.error("Unable to create Dto {}, error: {}", dto.toString(), e.getMessage()); resultStatus = SingleTestResult.TestResultStatus.FAILURE; } diff --git a/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/util/LoadingTestingUtil.java b/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/util/LoadingTestingUtil.java index 42f6e5059..d417de63a 100644 --- a/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/util/LoadingTestingUtil.java +++ b/FlashCards_Load_Tester/src/main/java/org/robbins/load/tester/util/LoadingTestingUtil.java @@ -6,10 +6,8 @@ import org.robbins.flashcards.dto.AbstractAuditableDto; import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.dto.UserDto; import org.robbins.flashcards.dto.builder.FlashCardDtoBuilder; import org.robbins.flashcards.dto.builder.TagDtoBuilder; -import org.robbins.flashcards.dto.builder.UserDtoBuilder; import java.util.Date; import java.util.List; @@ -21,13 +19,13 @@ public class LoadingTestingUtil { private static final String prefix = "load-tester"; private static final String tagDto = "TagDto"; - private static final String flashcardDto = "FlashCardDto"; + private static final String flashCardDto = "FlashCardDto"; public static TagDto createTagDto(final String name) { return new TagDtoBuilder().withName(name).build(); } - public static FlashCardDto createFlashcardDto(final String question) { + public static FlashCardDto createFlashCardDto(final String question) { return new FlashCardDtoBuilder() .withQuestion(question) .withAnswer(RandomStringUtils.randomAlphabetic(10)) @@ -38,8 +36,8 @@ public static AbstractAuditableDto createDto(final String name, final Class tagRepository; - private PreparedStatement flashcardStatement; - private PreparedStatement tagFlashcardStatement; + private PreparedStatement flashCardStatement; + private PreparedStatement tagFlashCardStatement; private static final String TAG_FLASHCARD_TABLE = "tag_flashcard"; private static final String FLASHCARD_TABLE = "flashcard"; @@ -67,40 +66,40 @@ private void initStatements(){ if (session == null){ LOGGER.error("Cassandra not available"); } else { - flashcardStatement = session.prepare(flashcardInsert()); - tagFlashcardStatement = session.prepare(tagFlashcardInsert()); + flashCardStatement = session.prepare(flashCardInsert()); + tagFlashCardStatement = session.prepare(tagFlashCardInsert()); } } @Override - public FlashCardCassandraEntity save(final FlashCardCassandraEntity flashcard) { - cassandraOperations.execute(flashcardBatch(flashcard)); + public FlashCardCassandraEntity save(final FlashCardCassandraEntity flashCard) { + cassandraOperations.execute(flashCardBatch(flashCard)); - return flashcard; + return flashCard; } - private BatchStatement flashcardBatch(FlashCardCassandraEntity flashcard) { + private BatchStatement flashCardBatch(FlashCardCassandraEntity flashCard) { BatchStatement batch = new BatchStatement(); - batch.add(flashcardStatement.bind( - flashcard.getId(), - flashcard.getQuestion(), - flashcard.getAnswer(), - flashcard.getTags())); + batch.add(flashCardStatement.bind( + flashCard.getId(), + flashCard.getQuestion(), + flashCard.getAnswer(), + flashCard.getTags())); - for (Map.Entry tagEntry : flashcard.getTags().entrySet()) { - batch.add(tagFlashcardStatement.bind( + for (Map.Entry tagEntry : flashCard.getTags().entrySet()) { + batch.add(tagFlashCardStatement.bind( tagEntry.getKey(), - flashcard.getId(), - flashcard.getQuestion(), - flashcard.getAnswer())); + flashCard.getId(), + flashCard.getQuestion(), + flashCard.getAnswer())); } return batch; } - private RegularStatement tagFlashcardInsert() { + private RegularStatement tagFlashCardInsert() { return insertInto(TAG_FLASHCARD_TABLE) .value(TAG_ID, bindMarker()) .value(FLASHCARD_ID, bindMarker()) @@ -108,7 +107,7 @@ private RegularStatement tagFlashcardInsert() { .value(ANSWER, bindMarker()); } - private RegularStatement flashcardInsert() { + private RegularStatement flashCardInsert() { return insertInto(FLASHCARD_TABLE) .value(ID, bindMarker()) .value(QUESTION, bindMarker()) diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashcardCassandraRepository.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashcardCassandraRepository.java index 2760ab1bb..778b85f2a 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashcardCassandraRepository.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashcardCassandraRepository.java @@ -11,7 +11,7 @@ import java.util.UUID; @Repository -public interface TagFlashcardCassandraRepository extends TypedIdCassandraRepository { +public interface TagFlashCardCassandraRepository extends TypedIdCassandraRepository { @Query("SELECT * FROM tag_flashcard WHERE tag_id = ?0") public List findByTagId(final Long tagId); diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagRepositoryImpl.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagRepositoryImpl.java index 549617fbd..822d86350 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagRepositoryImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagRepositoryImpl.java @@ -49,13 +49,13 @@ public class TagRepositoryImpl extends AbstractCrudRepositoryImpl tagFlashcards = tagFlashcardCassandraRepository.findByTagId(tag.getId()); - if (tagFlashcards != null && tagFlashcards.size() > 0) { - for (TagFlashCardCassandraEntity tagFlashCard : tagFlashcards) { - final FlashCardCassandraEntity flashcard = flashCardCassandraRepository.findOne(tagFlashCard.getId().getFlashCardId()); - if (flashcard != null && flashcard.getTags() != null) { - batch.add(flashcardStatement.bind( + final List tagFlashCards = tagFlashCardCassandraRepository.findByTagId(tag.getId()); + if (tagFlashCards != null && tagFlashCards.size() > 0) { + for (TagFlashCardCassandraEntity tagFlashCard : tagFlashCards) { + final FlashCardCassandraEntity flashCard = flashCardCassandraRepository.findOne(tagFlashCard.getId().getFlashCardId()); + if (flashCard != null && flashCard.getTags() != null) { + batch.add(flashCardStatement.bind( tag.getId(), tag.getName(), - flashcard.getId())); + flashCard.getId())); } } } @@ -109,7 +109,7 @@ private RegularStatement tagInsert() { .value(NAME, bindMarker()); } - private RegularStatement flashcardUpdateTag() { + private RegularStatement flashCardUpdateTag() { return update(FLASHCARD_TABLE) .with(put(TAGS, bindMarker(), bindMarker())) .where(eq(ID, bindMarker())); @@ -121,7 +121,7 @@ public TagCassandraEntity findByName(final String name) { } @Override - public List findByFlashcards_Id(Long flashcardId) { + public List findByFlashCards_Id(Long flashCardId) { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultFlashCardRepositoryFacade.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultFlashCardRepositoryFacade.java index 268e7127c..7c6411525 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultFlashCardRepositoryFacade.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultFlashCardRepositoryFacade.java @@ -2,15 +2,14 @@ package org.robbins.flashcards.cassandra.repository.facade; import org.apache.commons.lang3.NotImplementedException; -import org.apache.commons.lang3.StringUtils; import org.robbins.flashcards.cassandra.repository.domain.FlashCardCassandraEntity; import org.robbins.flashcards.cassandra.repository.domain.TagCassandraEntity; import org.robbins.flashcards.cassandra.repository.facade.base.AbstractCrudRepositoryFacadeImpl; import org.robbins.flashcards.conversion.DtoConverter; 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.exceptions.FlashCardsException; +import org.robbins.flashcards.facade.FlashCardFacade; import org.robbins.flashcards.repository.FlashCardRepository; import org.robbins.flashcards.repository.TagRepository; import org.springframework.beans.factory.annotation.Qualifier; @@ -24,7 +23,8 @@ @Component("flashcardRepositoryFacade") public class DefaultFlashCardRepositoryFacade extends AbstractCrudRepositoryFacadeImpl implements - FlashcardFacade { + FlashCardFacade +{ @Inject private FlashCardRepository repository; @@ -52,7 +52,8 @@ public FlashCardRepository g } @Override - public FlashCardDto save(final FlashCardDto dto) throws FlashcardsException { + public FlashCardDto save(final FlashCardDto dto) throws FlashCardsException + { FlashCardCassandraEntity entity = getConverter().getEntity(dto); if (entity.getId() == null) { entity.setId(UUIDs.timeBased().timestamp()); @@ -85,37 +86,44 @@ private Map configureTags(final Set tags) { } @Override - public List findByTagsIn(final Set tags) throws FlashcardsException { + public List findByTagsIn(final Set tags) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List findByTagsIn(final Set tags, PageRequest page) throws FlashcardsException { + public List findByTagsIn(final Set tags, PageRequest page) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List findByQuestionLike(final String question) throws FlashcardsException { + public List findByQuestionLike(final String question) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List findByQuestionLike(final String question, PageRequest page) throws FlashcardsException { + public List findByQuestionLike(final String question, PageRequest page) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public FlashCardDto findByQuestion(final String question) throws FlashcardsException { + public FlashCardDto findByQuestion(final String question) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List findFlashcardsForTag(final Long tagId, final Set fields) throws FlashcardsException { + public List findFlashCardsForTag(final Long tagId, final Set fields) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List findByCreatedBy(final Long userId, final Set fields) throws FlashcardsException { + public List findByCreatedBy(final Long userId, final Set fields) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultTagRepositoryFacade.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultTagRepositoryFacade.java index d1f03377b..c5be5935b 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultTagRepositoryFacade.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultTagRepositoryFacade.java @@ -6,7 +6,7 @@ import org.robbins.flashcards.cassandra.repository.facade.base.AbstractCrudRepositoryFacadeImpl; import org.robbins.flashcards.conversion.DtoConverter; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.exceptions.RepositoryException; import org.robbins.flashcards.facade.TagFacade; import org.robbins.flashcards.repository.TagRepository; @@ -16,7 +16,6 @@ import javax.inject.Inject; import java.util.List; import java.util.Set; -import java.util.UUID; @Component("tagRepositoryFacade") public class DefaultTagRepositoryFacade extends AbstractCrudRepositoryFacadeImpl implements @@ -47,12 +46,13 @@ public TagDto findByName(final String name) throws RepositoryException { } @Override - public List findTagsForFlashcard(final Long flashcardId, final Set fields) throws RepositoryException { + public List findTagsForFlashCard(final Long flashCardId, final Set fields) throws RepositoryException { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List findByCreatedBy(final Long userId, final Set fields) throws FlashcardsException { + public List findByCreatedBy(final Long userId, final Set fields) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultUserRepositoryFacade.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultUserRepositoryFacade.java index 9127e900d..cd3afe580 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultUserRepositoryFacade.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/DefaultUserRepositoryFacade.java @@ -5,14 +5,13 @@ import org.robbins.flashcards.cassandra.repository.facade.base.AbstractCrudRepositoryFacadeImpl; import org.robbins.flashcards.conversion.DtoConverter; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.UserFacade; import org.robbins.flashcards.repository.UserRepository; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; import javax.inject.Inject; -import java.util.UUID; @Component("userRepositoryFacade") public class DefaultUserRepositoryFacade extends AbstractCrudRepositoryFacadeImpl implements @@ -37,7 +36,8 @@ public UserRepository getRepository() { } @Override - public UserDto findUserByOpenid(final String openid) throws FlashcardsException { + public UserDto findUserByOpenid(final String openid) throws FlashCardsException + { UserCassandraEntity user = repository.findUserByOpenid(openid); return user == null ? null : getConverter().getDto(user); } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java index 3490adcdc..499e32e2a 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.NotImplementedException; import org.robbins.flashcards.cassandra.repository.domain.AbstractPersistable; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.base.GenericCrudFacade; import org.robbins.flashcards.repository.facade.RepositoryFacade; import org.springframework.data.domain.Pageable; @@ -22,18 +22,21 @@ public abstract class AbstractCrudRepositoryFacadeImpl { @Override - public List list() throws FlashcardsException { + public List list() throws FlashCardsException + { final List results = Lists.newArrayList(getRepository().findAll()); return getConverter().getDtos(results); } @Override - public List list(final Optional page) throws FlashcardsException { + public List list(final Optional page) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @Override - public List list(final Optional page, final Set fields) throws FlashcardsException { + public List list(final Optional page, final Set fields) throws FlashCardsException + { throw new NotImplementedException("method not yet implemented in Cassandra repository"); } @@ -43,18 +46,20 @@ public Long count() { } @Override - public D findOne(final Long id) throws FlashcardsException { + public D findOne(final Long id) throws FlashCardsException + { return findOne(id, null); } @Override - public D findOne(final Long id, final Set fields) throws FlashcardsException { + public D findOne(final Long id, final Set fields) throws FlashCardsException + { final E result = getRepository().findOne(id); return result == null ? null : getConverter().getDto(result); } @Override - public D save(final D dto) throws FlashcardsException + public D save(final D dto) throws FlashCardsException { final E entity = getConverter().getEntity(dto); addId(entity); @@ -63,10 +68,11 @@ public D save(final D dto) throws FlashcardsException } @Override - public BatchLoadingReceiptDto save(final List dtos) throws FlashcardsException { + public BatchLoadingReceiptDto save(final List dtos) throws FlashCardsException + { if (CollectionUtils.isEmpty(dtos)) - throw new FlashcardsException("Expected list with at least one element"); + throw new FlashCardsException("Expected list with at least one element"); final List entities = getConverter().getEntities(dtos); addIds(entities); @@ -98,7 +104,8 @@ public void delete(final Long id) { } @Override - public List findByCreatedBy(final Long userId, final Set fields) throws FlashcardsException { + public List findByCreatedBy(final Long userId, final Set fields) throws FlashCardsException + { return null; } } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/FlashCardRepositoryIT.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/FlashCardRepositoryIT.java index f7fec70f8..fd6a2c7b8 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/FlashCardRepositoryIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/FlashCardRepositoryIT.java @@ -29,7 +29,7 @@ public class FlashCardRepositoryIT extends AbstractCassandraIntegrationTest { private FlashCardRepository flashCardRepository; @Inject - private TagFlashcardCassandraRepository tagFlashcardCassandraRepository; + private TagFlashCardCassandraRepository tagFlashCardCassandraRepository; @Test public void testFindOne() { @@ -43,29 +43,29 @@ public void testFindOne() { @Test public void testFindAll() { - final List flashcards = Lists.newArrayList(flashCardRepository.findAll()); - assertThat(flashcards.size(), greaterThan(0)); + final List flashCards = Lists.newArrayList(flashCardRepository.findAll()); + assertThat(flashCards.size(), greaterThan(0)); } @Test public void testSave() { - final FlashCardCassandraEntity flashcard = new FlashCardCassandraBuilder() + final FlashCardCassandraEntity flashCard = new FlashCardCassandraBuilder() .withId(RandomUtils.nextLong(0L, Long.MAX_VALUE)) .withQuestion("new question") .withAnswer("new answer") .build(); - FlashCardCassandraEntity result = flashCardRepository.save(flashcard); - assertThat(result.getId(), is(flashcard.getId())); - assertThat(result.getQuestion(), is(flashcard.getQuestion())); - assertThat(result.getAnswer(), is(flashcard.getAnswer())); + FlashCardCassandraEntity result = flashCardRepository.save(flashCard); + assertThat(result.getId(), is(flashCard.getId())); + assertThat(result.getQuestion(), is(flashCard.getQuestion())); + assertThat(result.getAnswer(), is(flashCard.getAnswer())); } @Test public void testSave_WithTags() { final TagCassandraEntity tag1 = testUtils.createTagEntity(); final TagCassandraEntity tag2 = testUtils.createTagEntity(); - final FlashCardCassandraEntity flashcard = new FlashCardCassandraBuilder() + final FlashCardCassandraEntity flashCard = new FlashCardCassandraBuilder() .withId(RandomUtils.nextLong(0, Long.MAX_VALUE)) .withQuestion("new question") .withAnswer("new answer") @@ -73,17 +73,17 @@ public void testSave_WithTags() { .withTag(tag2) .build(); - FlashCardCassandraEntity result = flashCardRepository.save(flashcard); - assertThat(result.getId(), is(flashcard.getId())); + final FlashCardCassandraEntity result = flashCardRepository.save(flashCard); + assertThat(result.getId(), is(flashCard.getId())); assertThat(result.getTags().size(), is(2)); - List tagFlashcards = tagFlashcardCassandraRepository.findByTagId(tag1.getId()); - assertThat(tagFlashcards.size(), is(1)); + final List tagFlashCards = tagFlashCardCassandraRepository.findByTagId(tag1.getId()); + assertThat(tagFlashCards.size(), is(1)); } @Test public void testDelete() { - FlashCardCassandraEntity toDelete = testUtils.createFlashCardEntity(); + final FlashCardCassandraEntity toDelete = testUtils.createFlashCardEntity(); flashCardRepository.delete(toDelete.getId()); } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagFlashCardRepositoryIT.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagFlashCardRepositoryIT.java index d213c6833..22d0fc2e9 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagFlashCardRepositoryIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagFlashCardRepositoryIT.java @@ -22,7 +22,7 @@ public class TagFlashCardRepositoryIT extends AbstractCassandraIntegrationTest { private static final Long FLASHCARD_ID = 1L; @Inject - private TagFlashcardCassandraRepository repository; + private TagFlashCardCassandraRepository repository; @Test public void testFindOne() { @@ -45,10 +45,10 @@ public void testFindByTagId() { @Test public void testFindAll() { - final List tagFlashcards = Lists.newArrayList(repository.findAll()); - assertThat(tagFlashcards.size(), greaterThan(0)); - assertThat(tagFlashcards.get(0).getId(), is(notNullValue())); - assertThat(tagFlashcards.get(0).getId().getTagId(), is(notNullValue())); - assertThat(tagFlashcards.get(0).getId().getFlashCardId(), is(notNullValue())); + final List tagFlashCards = Lists.newArrayList(repository.findAll()); + assertThat(tagFlashCards.size(), greaterThan(0)); + assertThat(tagFlashCards.get(0).getId(), is(notNullValue())); + assertThat(tagFlashCards.get(0).getId().getTagId(), is(notNullValue())); + assertThat(tagFlashCards.get(0).getId().getFlashCardId(), is(notNullValue())); } } diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagRepositoryIT.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagRepositoryIT.java index 5b596b0de..c46a9a25d 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagRepositoryIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/TagRepositoryIT.java @@ -68,8 +68,8 @@ public void testUpdateAnExistingTag() { TagCassandraEntity result = tagRepository.save(existingEntity); assertThat(result.getName(), is(UPDATED_NAME)); - FlashCardCassandraEntity flashcard = flashCardRepository.findOne(FLASHCARD_ID); - assertThat(flashcard.getTags().get(TAG_ID), is(UPDATED_NAME)); + FlashCardCassandraEntity flashCard = flashCardRepository.findOne(FLASHCARD_ID); + assertThat(flashCard.getTags().get(TAG_ID), is(UPDATED_NAME)); } @Test diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/domain/FlashCardCassandraBuilder.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/domain/FlashCardCassandraBuilder.java index 3393f681e..cfbbeaea1 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/domain/FlashCardCassandraBuilder.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/domain/FlashCardCassandraBuilder.java @@ -1,30 +1,30 @@ package org.robbins.flashcards.cassandra.repository.domain; public class FlashCardCassandraBuilder { - private final FlashCardCassandraEntity flashcard = new FlashCardCassandraEntity(); + private final FlashCardCassandraEntity flashCard = new FlashCardCassandraEntity(); public FlashCardCassandraBuilder withId(final Long id) { - this.flashcard.setId(id); + this.flashCard.setId(id); return this; } public FlashCardCassandraBuilder withQuestion(final String question) { - this.flashcard.setQuestion(question); + this.flashCard.setQuestion(question); return this; } public FlashCardCassandraBuilder withAnswer(final String answer) { - this.flashcard.setQuestion(answer); + this.flashCard.setQuestion(answer); return this; } public FlashCardCassandraBuilder withTag(final TagCassandraEntity tag) { - this.flashcard.getTags().put(tag.getId(), tag.getName()); + this.flashCard.getTags().put(tag.getId(), tag.getName()); return this; } public FlashCardCassandraEntity build() { - return this.flashcard; + return this.flashCard; } } \ No newline at end of file diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultFlashCardFacadeIT.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultFlashCardFacadeIT.java index 4b661fc4e..de4e0beed 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultFlashCardFacadeIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultFlashCardFacadeIT.java @@ -6,12 +6,11 @@ import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.builder.FlashCardDtoBuilder; import org.robbins.flashcards.dto.builder.TagDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; -import org.robbins.flashcards.facade.FlashcardFacade; +import org.robbins.flashcards.exceptions.FlashCardsException; +import org.robbins.flashcards.facade.FlashCardFacade; import javax.inject.Inject; import java.util.List; -import java.util.UUID; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.greaterThan; @@ -27,10 +26,10 @@ public class DefaultFlashCardFacadeIT extends AbstractCassandraIntegrationTest { final String NEW_ANSWER = "new answer"; @Inject - private FlashcardFacade facade; + private FlashCardFacade facade; @Test - public void testList() throws FlashcardsException + public void testList() throws FlashCardsException { final List results = facade.list(); @@ -39,7 +38,8 @@ public void testList() throws FlashcardsException } @Test - public void testFindOne() throws FlashcardsException { + public void testFindOne() throws FlashCardsException + { final FlashCardDto result = facade.findOne(ID); assertThat(result, is(notNullValue())); @@ -47,14 +47,15 @@ public void testFindOne() throws FlashcardsException { } @Test - public void testFindOne_ShouldReturnNull_WhenIdDoesNotExist() throws FlashcardsException { + public void testFindOne_ShouldReturnNull_WhenIdDoesNotExist() throws FlashCardsException + { final FlashCardDto result = facade.findOne(NON_EXISTING_ID); assertThat(result, is(nullValue())); } @Test - public void testSave() throws FlashcardsException + public void testSave() throws FlashCardsException { final FlashCardDto dto = new FlashCardDtoBuilder() .withQuestion(NEW_QUESTION) @@ -68,7 +69,7 @@ public void testSave() throws FlashcardsException } @Test - public void testSave_WithExistingTags() throws FlashcardsException + public void testSave_WithExistingTags() throws FlashCardsException { final FlashCardDto dto = new FlashCardDtoBuilder() .withQuestion(NEW_QUESTION) @@ -83,7 +84,7 @@ public void testSave_WithExistingTags() throws FlashcardsException } @Test - public void testSave_WithNewTags() throws FlashcardsException + public void testSave_WithNewTags() throws FlashCardsException { final FlashCardDto dto = new FlashCardDtoBuilder() .withQuestion(NEW_QUESTION) @@ -98,7 +99,7 @@ public void testSave_WithNewTags() throws FlashcardsException } @Test - public void testSave_WithNewAndExistingTag() throws FlashcardsException + public void testSave_WithNewAndExistingTag() throws FlashCardsException { final FlashCardDto dto = new FlashCardDtoBuilder() .withQuestion(NEW_QUESTION) @@ -113,7 +114,7 @@ public void testSave_WithNewAndExistingTag() throws FlashcardsException } @Test - public void testUpdate() throws FlashcardsException + public void testUpdate() throws FlashCardsException { final String UPDATED_QUESTION = "updated question"; final FlashCardDto toUpdate = testUtils.createFlashCardDto(); @@ -126,7 +127,8 @@ public void testUpdate() throws FlashcardsException } @Test - public void testDelete() throws FlashcardsException { + public void testDelete() throws FlashCardsException + { final FlashCardDto toDelete = testUtils.createFlashCardDto(); facade.delete(toDelete.getId()); diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultTagFacadeIT.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultTagFacadeIT.java index a3f319457..12063cb38 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultTagFacadeIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultTagFacadeIT.java @@ -5,12 +5,11 @@ import org.robbins.flashcards.cassandra.repository.AbstractCassandraIntegrationTest; import org.robbins.flashcards.dto.TagDto; import org.robbins.flashcards.dto.builder.TagDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.TagFacade; import javax.inject.Inject; import java.util.List; -import java.util.UUID; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.greaterThan; @@ -27,7 +26,7 @@ public class DefaultTagFacadeIT extends AbstractCassandraIntegrationTest { private TagFacade tagFacade; @Test - public void testList() throws FlashcardsException + public void testList() throws FlashCardsException { final List results = tagFacade.list(); @@ -36,35 +35,39 @@ public void testList() throws FlashcardsException } @Test - public void testFindOne() throws FlashcardsException { + public void testFindOne() throws FlashCardsException + { final TagDto result = tagFacade.findOne(TAG_ID); assertThat(result.getId(), is(TAG_ID)); } @Test - public void testFindOne_ShouldReturnNull_WhenIdDoesNotExist() throws FlashcardsException { + public void testFindOne_ShouldReturnNull_WhenIdDoesNotExist() throws FlashCardsException + { final TagDto result = tagFacade.findOne(NON_EXISTING_TAG_ID); assertThat(result, is(nullValue())); } @Test - public void testFindByName() throws FlashcardsException { + public void testFindByName() throws FlashCardsException + { final TagDto result = tagFacade.findByName(TAG_NAME); assertThat(result.getName(), is(TAG_NAME)); } @Test - public void testFindByName_ShouldReturnNull_WhenNameDoesNotExist() throws FlashcardsException { + public void testFindByName_ShouldReturnNull_WhenNameDoesNotExist() throws FlashCardsException + { final TagDto result = tagFacade.findByName("tag does not exist"); assertThat(result, is(nullValue())); } @Test - public void testSave() throws FlashcardsException + public void testSave() throws FlashCardsException { final String TAG_NAME = "new name"; final TagDto tag = new TagDtoBuilder() @@ -76,7 +79,7 @@ public void testSave() throws FlashcardsException } @Test - public void testUpdate() throws FlashcardsException + public void testUpdate() throws FlashCardsException { final String UPDATED_NAME = "updated name"; final TagDto tagToUpdate = testUtils.createTagDto(); @@ -89,7 +92,8 @@ public void testUpdate() throws FlashcardsException } @Test - public void testDelete() throws FlashcardsException { + public void testDelete() throws FlashCardsException + { final TagDto tagToDelete = testUtils.createTagDto(); tagFacade.delete(tagToDelete.getId()); diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultUserFacadeIT.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultUserFacadeIT.java index 03c90844f..328e39099 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultUserFacadeIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/facade/impl/DefaultUserFacadeIT.java @@ -17,7 +17,7 @@ import org.robbins.flashcards.cassandra.repository.AbstractCassandraIntegrationTest; import org.robbins.flashcards.dto.UserDto; import org.robbins.flashcards.dto.builder.UserDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.UserFacade; public class DefaultUserFacadeIT extends AbstractCassandraIntegrationTest { @@ -30,7 +30,7 @@ public class DefaultUserFacadeIT extends AbstractCassandraIntegrationTest { private UserFacade userFacade; @Test - public void testList() throws FlashcardsException + public void testList() throws FlashCardsException { final List results = userFacade.list(); @@ -39,7 +39,8 @@ public void testList() throws FlashcardsException } @Test - public void testFindOne() throws FlashcardsException { + public void testFindOne() throws FlashCardsException + { final UserDto result = userFacade.findOne(ID); assertThat(result, is(notNullValue())); @@ -47,28 +48,31 @@ public void testFindOne() throws FlashcardsException { } @Test - public void testFindOne_ShouldReturnNull_WhenIdDoesNotExist() throws FlashcardsException { + public void testFindOne_ShouldReturnNull_WhenIdDoesNotExist() throws FlashCardsException + { final UserDto result = userFacade.findOne(NON_EXISTING_ID); assertThat(result, is(nullValue())); } @Test - public void testFindByOpenId() throws FlashcardsException { + public void testFindByOpenId() throws FlashCardsException + { final UserDto result = userFacade.findUserByOpenid(OPEN_ID); assertThat(result.getOpenid(), is(OPEN_ID)); } @Test - public void testFindByOpenId_ShouldReturnNull_WhenIdDoesNotExist() throws FlashcardsException { + public void testFindByOpenId_ShouldReturnNull_WhenIdDoesNotExist() throws FlashCardsException + { final UserDto result = userFacade.findUserByOpenid("open id does not exist"); assertThat(result, is(nullValue())); } @Test - public void testSave() throws FlashcardsException + public void testSave() throws FlashCardsException { final String OPEN_ID = "new open id"; final UserDto dto = new UserDtoBuilder() @@ -80,7 +84,7 @@ public void testSave() throws FlashcardsException } @Test - public void testUpdate() throws FlashcardsException + public void testUpdate() throws FlashCardsException { final String UPDATED_OPEN_ID = "updated open id"; final UserDto dtoToUpdate = createUser(); @@ -93,13 +97,15 @@ public void testUpdate() throws FlashcardsException } @Test - public void testDelete() throws FlashcardsException { + public void testDelete() throws FlashCardsException + { final UserDto dtoToDelete = createUser(); userFacade.delete(dtoToDelete.getId()); } - private UserDto createUser() throws FlashcardsException { + private UserDto createUser() throws FlashCardsException + { final UserDto dto = new UserDtoBuilder() .withOpenId(RandomStringUtils.randomAlphabetic(10)).build(); diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/util/IntegrationTestUtils.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/util/IntegrationTestUtils.java index 4e0822f53..f309a32e1 100644 --- a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/util/IntegrationTestUtils.java +++ b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/test/java/org/robbins/flashcards/cassandra/repository/util/IntegrationTestUtils.java @@ -15,8 +15,8 @@ import org.robbins.flashcards.dto.TagDto; import org.robbins.flashcards.dto.builder.FlashCardDtoBuilder; import org.robbins.flashcards.dto.builder.TagDtoBuilder; -import org.robbins.flashcards.exceptions.FlashcardsException; -import org.robbins.flashcards.facade.FlashcardFacade; +import org.robbins.flashcards.exceptions.FlashCardsException; +import org.robbins.flashcards.facade.FlashCardFacade; import org.robbins.flashcards.facade.TagFacade; import org.springframework.stereotype.Component; @@ -30,19 +30,19 @@ public class IntegrationTestUtils { private TagCassandraRepository tagRepository; @Inject - private FlashcardFacade flashCardFacade; + private FlashCardFacade flashCardFacade; @Inject private TagFacade tagFacade; public final FlashCardCassandraEntity createFlashCardEntity() { - final FlashCardCassandraEntity flashcard = new FlashCardCassandraBuilder() + final FlashCardCassandraEntity flashCard = new FlashCardCassandraBuilder() .withId(RandomUtils.nextLong(0L, Long.MAX_VALUE)) .withQuestion(RandomStringUtils.randomAlphabetic(10)) .withAnswer(RandomStringUtils.randomAlphabetic(10)) .build(); - return flashCardRepository.save(flashcard); + return flashCardRepository.save(flashCard); } public final TagCassandraEntity createTagEntity() { @@ -53,7 +53,8 @@ public final TagCassandraEntity createTagEntity() { return tagRepository.save(tag); } - public final FlashCardDto createFlashCardDto() throws FlashcardsException { + public final FlashCardDto createFlashCardDto() throws FlashCardsException + { final FlashCardDto dto = new FlashCardDtoBuilder() .withQuestion(RandomStringUtils.randomAlphabetic(10)) .withAnswer(RandomStringUtils.randomAlphabetic(10)) @@ -62,7 +63,8 @@ public final FlashCardDto createFlashCardDto() throws FlashcardsException { return flashCardFacade.save(dto); } - public final TagDto createTagDto() throws FlashcardsException { + public final TagDto createTagDto() throws FlashCardsException + { final TagDto tag = new TagDtoBuilder() .withName(RandomStringUtils.randomAlphabetic(10)).build(); diff --git a/FlashCards_Repository/FlashCards_Repository_Commons/src/main/java/org/robbins/flashcards/repository/TagRepository.java b/FlashCards_Repository/FlashCards_Repository_Commons/src/main/java/org/robbins/flashcards/repository/TagRepository.java index f79a66c2d..83b7829d7 100644 --- a/FlashCards_Repository/FlashCards_Repository_Commons/src/main/java/org/robbins/flashcards/repository/TagRepository.java +++ b/FlashCards_Repository/FlashCards_Repository_Commons/src/main/java/org/robbins/flashcards/repository/TagRepository.java @@ -7,5 +7,5 @@ public interface TagRepository extends FlashCardsAppRepository { E findByName(final String name); - List findByFlashcards_Id(final ID flashcardId); + List findByFlashCards_Id(final ID flashCardId); } diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/FlashCardRepositoryImpl.java b/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/FlashCardRepositoryImpl.java index 7936f6a43..a946a4828 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/FlashCardRepositoryImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/FlashCardRepositoryImpl.java @@ -1,22 +1,24 @@ package org.robbins.flashcards.jpa.repository; -import org.apache.commons.lang3.StringUtils; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.persistence.Query; + import org.joda.time.DateTime; import org.robbins.flashcards.jpa.repository.util.JpqlUtil; import org.robbins.flashcards.model.FlashCard; import org.robbins.flashcards.model.Tag; import org.robbins.flashcards.repository.FlashCardRepository; -import org.springframework.data.domain.*; -import org.springframework.data.domain.Sort.Order; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Repository; -import javax.persistence.Query; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - @Repository public class FlashCardRepositoryImpl extends AbstractCrudRepositoryImpl implements FlashCardRepository { diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/TagRepositoryImpl.java b/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/TagRepositoryImpl.java index a45db9a0d..469967845 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/TagRepositoryImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa/src/main/java/org/robbins/flashcards/jpa/repository/TagRepositoryImpl.java @@ -69,9 +69,9 @@ public long count() { } @Override - public List findByFlashcards_Id(final Long flashcardId) { - Query query = getEm().createQuery("SELECT t FROM Tag t JOIN t.flashcards f WHERE f.id = :flashcardId"); - query.setParameter("flashcardId", flashcardId); + public List findByFlashCards_Id(final Long flashCardId) { + Query query = getEm().createQuery("SELECT t FROM Tag t JOIN t.flashCards f WHERE f.id = :flashcardId"); + query.setParameter("flashcardId", flashCardId); return query.getResultList(); } diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa/src/test/java/org/robbins/flashcards/jpa/repository/TagRepositoryIT.java b/FlashCards_Repository/FlashCards_Repository_Jpa/src/test/java/org/robbins/flashcards/jpa/repository/TagRepositoryIT.java index 8766d5830..f848255f7 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa/src/test/java/org/robbins/flashcards/jpa/repository/TagRepositoryIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa/src/test/java/org/robbins/flashcards/jpa/repository/TagRepositoryIT.java @@ -49,7 +49,7 @@ public void findById() { @Test public void findByFlashCardsId() { final Long flashCardId = findFirstFlashCardId(); - final List tags = tagRepository.findByFlashcards_Id(flashCardId); + final List tags = tagRepository.findByFlashCards_Id(flashCardId); assertThat(tags.size(), is(1)); } @@ -60,7 +60,7 @@ private Long findFirstTagId() { private Long findFirstFlashCardId() { Optional firstTag = tagRepository.findAll() .stream() - .filter(tag -> tag.getFlashcards().size() > 0) + .filter(tag -> tag.getFlashCards().size() > 0) .findFirst(); return firstTag.isPresent() ? firstTag.get().getId() : null; diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/model/Tag.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/model/Tag.java index bd033a84d..4831a7002 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/model/Tag.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/model/Tag.java @@ -12,8 +12,8 @@ @Entity @Table(name = "tag") @AttributeOverride(name = "id", column = @Column(name = "TagId")) -@NamedEntityGraph(name = "Tag.flashcards", - attributeNodes = @NamedAttributeNode("flashcards")) +@NamedEntityGraph(name = "Tag.flashCards", + attributeNodes = @NamedAttributeNode("flashCards")) public class Tag extends AbstractAuditable implements Serializable { private static final long serialVersionUID = 3642775570292807703L; @@ -24,7 +24,7 @@ public class Tag extends AbstractAuditable implements Serializable { @ManyToMany(targetEntity = org.robbins.flashcards.model.FlashCard.class, cascade = { CascadeType.PERSIST, CascadeType.MERGE }, mappedBy = "tags", fetch = FetchType.LAZY) @OrderBy("question") - private Set flashcards = new HashSet(0); + private Set flashCards = new HashSet<>(0); public Tag() { } @@ -33,9 +33,9 @@ public Tag(final Long id) { setId(id); } - public Tag(final String name, final Set flashcards) { + public Tag(final String name, final Set flashCards) { this.name = name; - this.flashcards = flashcards; + this.flashCards = flashCards; } public String getName() { @@ -46,12 +46,12 @@ public void setName(final String name) { this.name = name; } - public Set getFlashcards() { - return this.flashcards; + public Set getFlashCards() { + return this.flashCards; } - public void setFlashcards(final Set flashcards) { - this.flashcards = flashcards; + public void setFlashCards(final Set flashCards) { + this.flashCards = flashCards; } @Override diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashcardDtoConverter.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashcardDtoConverter.java index 252124462..71a81af09 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashcardDtoConverter.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashcardDtoConverter.java @@ -14,7 +14,7 @@ import java.util.stream.Collectors; @Component("flashcardDtoConverter") -public class DefaultFlashcardDtoConverter extends AbstractDtoConverter implements DtoConverter { +public class DefaultFlashCardDtoConverter extends AbstractDtoConverter implements DtoConverter { @Override public FlashCardDto getDto(final FlashCard entity) throws RepositoryException { return getDto(entity, null); diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java index 5a7d9874e..44f887598 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/base/AbstractCrudRepositoryFacadeImpl.java @@ -10,7 +10,7 @@ import org.apache.commons.collections.CollectionUtils; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.exceptions.RepositoryException; import org.robbins.flashcards.facade.base.GenericCrudFacade; import org.robbins.flashcards.model.common.AbstractAuditable; @@ -50,9 +50,10 @@ public D save(final D dto) throws RepositoryException { @Transactional(propagation= Propagation.NEVER) @Override - public BatchLoadingReceiptDto save(final List dtos) throws FlashcardsException { + public BatchLoadingReceiptDto save(final List dtos) throws FlashCardsException + { if (CollectionUtils.isEmpty(dtos)) - throw new FlashcardsException("Expected list with at least one element"); + throw new FlashCardsException("Expected list with at least one element"); final List entities = getConverter().getEntities(dtos); final int count = getRepository().batchSave(entities); @@ -117,7 +118,8 @@ public void delete(final ID id) { } @Override - public List findByCreatedBy(final ID userId, final Set fields) throws FlashcardsException { + public List findByCreatedBy(final ID userId, final Set fields) throws FlashCardsException + { List results = getRepository().findByCreatedBy_Id(userId); return convertAndInitializeEntities(results, fields); } diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java index f8573311c..76a41a767 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java @@ -7,9 +7,9 @@ import org.robbins.flashcards.conversion.DtoConverter; import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.exceptions.RepositoryException; -import org.robbins.flashcards.facade.FlashcardFacade; +import org.robbins.flashcards.facade.FlashCardFacade; import org.robbins.flashcards.model.FlashCard; import org.robbins.flashcards.model.Tag; import org.robbins.flashcards.model.util.EntityAuditingUtil; @@ -29,8 +29,9 @@ @Transactional @Component("flashcardRepositoryFacade") -public class DefaultFlashcardRepositoryFacade extends - AbstractCrudRepositoryFacadeImpl implements FlashcardFacade { +public class DefaultFlashCardRepositoryFacade extends + AbstractCrudRepositoryFacadeImpl implements FlashCardFacade +{ @Inject private FlashCardRepository repository; @@ -40,7 +41,7 @@ public class DefaultFlashcardRepositoryFacade extends @Inject @Qualifier("flashcardDtoConverter") - private DtoConverter flashcardConverter; + private DtoConverter flashCardConverter; @Inject @Qualifier("tagDtoConverter") @@ -49,7 +50,7 @@ public class DefaultFlashcardRepositoryFacade extends @Override public DtoConverter getConverter() { - return flashcardConverter; + return flashCardConverter; } @Override @@ -102,7 +103,8 @@ public FlashCardDto findByQuestion(final String question) throws RepositoryExcep } @Override - public List findFlashcardsForTag(Long tagId, Set fields) throws FlashcardsException { + public List findFlashCardsForTag(Long tagId, Set fields) throws FlashCardsException + { List results = repository.findByTags_Id(tagId); return convertAndInitializeEntities(results, fields); } diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultTagRepositoryFacade.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultTagRepositoryFacade.java index a28cae6c1..de62e462d 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultTagRepositoryFacade.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultTagRepositoryFacade.java @@ -50,8 +50,8 @@ public TagDto findByName(final String name) throws RepositoryException { } @Override - public List findTagsForFlashcard(final Long flashcardId, final Set fields) throws RepositoryException { - List results = repository.findByFlashcards_Id(flashcardId); + public List findTagsForFlashCard(final Long flashCardId, final Set fields) throws RepositoryException { + List results = repository.findByFlashCards_Id(flashCardId); return convertAndInitializeEntities(results, fields); } } diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashcardDtoConverterUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashcardDtoConverterUT.java index c12bba32e..afafe3a54 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashcardDtoConverterUT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashcardDtoConverterUT.java @@ -13,11 +13,11 @@ import org.robbins.flashcards.conversion.DtoConverter; import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.model.FlashCard; -import org.robbins.flashcards.repository.conversion.impl.DefaultFlashcardDtoConverter; +import org.robbins.flashcards.repository.conversion.impl.DefaultFlashCardDtoConverter; import org.robbins.tests.BaseMockingTest; import org.springframework.test.util.ReflectionTestUtils; -public class DefaultFlashcardDtoConverterUT extends BaseMockingTest { +public class DefaultFlashCardDtoConverterUT extends BaseMockingTest { private DtoConverter converter; private FlashCard flashCard; private FlashCardDto flashCardDto; @@ -30,7 +30,7 @@ public class DefaultFlashcardDtoConverterUT extends BaseMockingTest { @Before public void setup() { - converter = new DefaultFlashcardDtoConverter(); + converter = new DefaultFlashCardDtoConverter(); ReflectionTestUtils.setField(converter, "mapper", mockMapper); flashCard = new FlashCard(); diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardFacadeUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardFacadeUT.java index 75aaf8e54..9ebcb955d 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardFacadeUT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardFacadeUT.java @@ -18,8 +18,8 @@ import org.mockito.Mock; 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.exceptions.FlashCardsException; +import org.robbins.flashcards.facade.FlashCardFacade; import org.robbins.flashcards.model.FlashCard; import org.robbins.flashcards.model.Tag; import org.robbins.flashcards.repository.FlashCardRepository; @@ -31,7 +31,7 @@ import org.springframework.test.util.ReflectionTestUtils; @Category(UnitTest.class) -public class DefaultFlashcardFacadeUT extends BaseMockingTest { +public class DefaultFlashCardFacadeUT extends BaseMockingTest { @Mock private FlashCardRepository repository; @@ -40,16 +40,16 @@ public class DefaultFlashcardFacadeUT extends BaseMockingTest { private TagRepository tagRepository; @Mock - private DtoConverter mockFlashcardConverter; + private DtoConverter mockFlashCardConverter; @Mock private DtoConverter mockTagConverter; @Mock - private FlashCard mockFlashcard; + private FlashCard mockFlashCard; @Mock - private FlashCardDto mockFlashcardDto; + private FlashCardDto mockFlashCardDto; @Mock private TagDto mockTagDto; @@ -60,24 +60,24 @@ public class DefaultFlashcardFacadeUT extends BaseMockingTest { @Mock private AuditingAwareUser auditorAware; - private FlashcardFacade flashCardFacade; + private FlashCardFacade flashCardFacade; @Before public void before() { - flashCardFacade = new DefaultFlashcardRepositoryFacade(); + flashCardFacade = new DefaultFlashCardRepositoryFacade(); ReflectionTestUtils.setField(flashCardFacade, "repository", repository); - ReflectionTestUtils.setField(flashCardFacade, "flashcardConverter", mockFlashcardConverter); + ReflectionTestUtils.setField(flashCardFacade, "flashCardConverter", mockFlashCardConverter); ReflectionTestUtils.setField(flashCardFacade, "tagConverter", mockTagConverter); ReflectionTestUtils.setField(flashCardFacade, "tagRepository", tagRepository); ReflectionTestUtils.setField(flashCardFacade, "auditorAware", auditorAware); } @Test - public void findByQuestion() throws FlashcardsException + public void findByQuestion() throws FlashCardsException { - when(repository.findByQuestion(any(String.class))).thenReturn(mockFlashcard); - when(mockFlashcardConverter.getDto(mockFlashcard, null)).thenReturn( - mockFlashcardDto); + when(repository.findByQuestion(any(String.class))).thenReturn(mockFlashCard); + when(mockFlashCardConverter.getDto(mockFlashCard, null)).thenReturn( + mockFlashCardDto); FlashCardDto result = flashCardFacade.findByQuestion(any(String.class)); @@ -86,13 +86,14 @@ public void findByQuestion() throws FlashcardsException } @Test - public void findByQuestionLike() throws FlashcardsException { - List mockFlashCardList = Arrays.asList(mockFlashcard); + public void findByQuestionLike() throws FlashCardsException + { + List mockFlashCardList = Arrays.asList(mockFlashCard); when(repository.findByQuestionLike(any(String.class))).thenReturn( mockFlashCardList); - when(mockFlashcardConverter.getDto(mockFlashcard)).thenReturn( - mockFlashcardDto); + when(mockFlashCardConverter.getDto(mockFlashCard)).thenReturn( + mockFlashCardDto); List results = flashCardFacade.findByQuestionLike(any(String.class)); @@ -102,14 +103,15 @@ public void findByQuestionLike() throws FlashcardsException { @SuppressWarnings("unchecked") @Test - public void findByTagsIn() throws FlashcardsException { - List mockFlashCardList = Arrays.asList(mockFlashcard); + public void findByTagsIn() throws FlashCardsException + { + List mockFlashCardList = Arrays.asList(mockFlashCard); Set mockTagDtos = new HashSet<>(Arrays.asList(mockTagDto)); List mockTagList = Arrays.asList(mockTag); when(repository.findByTagsIn(any(Set.class))).thenReturn(mockFlashCardList); - when(mockFlashcardConverter.getDto(mockFlashcard)).thenReturn( - mockFlashcardDto); + when(mockFlashCardConverter.getDto(mockFlashCard)).thenReturn( + mockFlashCardDto); when(mockTagConverter.getEntities(any(List.class))).thenReturn(mockTagList); List results = flashCardFacade.findByTagsIn(mockTagDtos); @@ -119,16 +121,17 @@ public void findByTagsIn() throws FlashcardsException { } @Test - public void save() throws FlashcardsException { + public void save() throws FlashCardsException + { - when(repository.save(any(FlashCard.class))).thenReturn(mockFlashcard); + when(repository.save(any(FlashCard.class))).thenReturn(mockFlashCard); when(tagRepository.findByName(any(String.class))).thenReturn(mockTag); - when(mockFlashcardConverter.getEntity(mockFlashcardDto)).thenReturn(mockFlashcard); - when(mockFlashcardConverter.getDto(mockFlashcard, null)).thenReturn(mockFlashcardDto); - when(mockFlashcardDto.getTags()).thenReturn( + when(mockFlashCardConverter.getEntity(mockFlashCardDto)).thenReturn(mockFlashCard); + when(mockFlashCardConverter.getDto(mockFlashCard, null)).thenReturn(mockFlashCardDto); + when(mockFlashCardDto.getTags()).thenReturn( new HashSet<>(Arrays.asList(mockTagDto))); - FlashCardDto result = flashCardFacade.save(mockFlashcardDto); + FlashCardDto result = flashCardFacade.save(mockFlashCardDto); verify(repository).save(any(FlashCard.class)); assertThat(result, is(FlashCardDto.class)); diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeIT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeIT.java index 039535118..8d019250e 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeIT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeIT.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.TagFacade; import org.robbins.tests.BaseIntegrationTest; import org.robbins.tests.IntegrationTest; @@ -33,7 +33,7 @@ public class DefaultTagFacadeIT extends BaseIntegrationTest { private static String TAG_NAME = "tag1"; @Test - public void findByName() throws FlashcardsException + public void findByName() throws FlashCardsException { TagDto result = tagFacade.findByName(TAG_NAME); assertThat(result, is(TagDto.class)); diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeUT.java index 60d07eaa0..1d4c82376 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeUT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultTagFacadeUT.java @@ -18,7 +18,7 @@ import org.mockito.Mock; import org.robbins.flashcards.conversion.DtoConverter; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.exceptions.ServiceException; import org.robbins.flashcards.facade.TagFacade; import org.robbins.flashcards.model.Tag; @@ -64,7 +64,7 @@ public void before() { } @Test - public void findByName() throws FlashcardsException + public void findByName() throws FlashCardsException { when(repository.findByName(any(String.class))).thenReturn(mockTag); when(converter.getDto(mockTag, null)).thenReturn(mockTagDto); @@ -76,7 +76,8 @@ public void findByName() throws FlashcardsException } @Test - public void findByName_ReturnNull() throws FlashcardsException { + public void findByName_ReturnNull() throws FlashCardsException + { when(repository.findByName(any(String.class))).thenReturn(null); TagDto result = tagFacade.findByName(any(String.class)); @@ -96,7 +97,8 @@ public void count() { } @Test - public void findOne() throws FlashcardsException { + public void findOne() throws FlashCardsException + { when(repository.findOne(any(String.class))).thenReturn(mockTag); when(converter.getDto(mockTag, null)).thenReturn(mockTagDto); @@ -108,7 +110,8 @@ public void findOne() throws FlashcardsException { } @Test - public void findOne_WithFields() throws FlashcardsException { + public void findOne_WithFields() throws FlashCardsException + { TagDto tagDto = new TagDto(); Set fields = new HashSet(Arrays.asList("flashcards")); @@ -123,7 +126,8 @@ public void findOne_WithFields() throws FlashcardsException { } @Test - public void findOne_ReturnsNull() throws FlashcardsException { + public void findOne_ReturnsNull() throws FlashCardsException + { when(repository.findOne(any(String.class))).thenReturn(null); TagDto result = tagFacade.findOne(any(Long.class)); @@ -140,7 +144,8 @@ public void delete() throws ServiceException { } @Test - public void save() throws FlashcardsException { + public void save() throws FlashCardsException + { when(repository.save(any(Tag.class))).thenReturn(mockTag); when(converter.getDto(mockTag, null)).thenReturn(mockTagDto); when(converter.getEntity(mockTagDto)).thenReturn(mockTag); diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultUserFacadeUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultUserFacadeUT.java index b64ea113d..1cf290065 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultUserFacadeUT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultUserFacadeUT.java @@ -6,7 +6,7 @@ import org.junit.experimental.categories.Category; import org.mockito.Mock; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.UserFacade; import org.robbins.flashcards.model.User; import org.robbins.flashcards.repository.UserRepository; @@ -52,7 +52,7 @@ public void before() { } @Test - public void findUserByOpenid() throws FlashcardsException + public void findUserByOpenid() throws FlashCardsException { when(repository.findUserByOpenid(any(String.class))).thenReturn(mockUser); when(converter.getDto(mockUser, null)).thenReturn(mockUserDto); @@ -64,7 +64,8 @@ public void findUserByOpenid() throws FlashcardsException } @Test - public void findByName_ReturnNull() throws FlashcardsException { + public void findByName_ReturnNull() throws FlashCardsException + { when(repository.findUserByOpenid(any(String.class))).thenReturn(null); UserDto result = userFacade.findUserByOpenid(any(String.class)); @@ -74,7 +75,8 @@ public void findByName_ReturnNull() throws FlashcardsException { } @Test - public void save() throws FlashcardsException { + public void save() throws FlashCardsException + { when(repository.save(any(User.class))).thenReturn(mockUser); when(repository.findOne(any(String.class))).thenReturn(mockUser); when(converter.getDto(mockUser, null)).thenReturn(mockUserDto); diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/util/FieldInitializerUtilUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/util/FieldInitializerUtilUT.java index 9f5979031..68d8f4368 100644 --- a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/util/FieldInitializerUtilUT.java +++ b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/util/FieldInitializerUtilUT.java @@ -47,7 +47,7 @@ public void before() { fieldInitializerUtil = new FieldInitializerUtil(); tagDto = new TagDto(); - tagDto.setFlashcards(new HashSet<>()); + tagDto.setFlashCards(new HashSet<>()); when(mockEntityManager.getEntityManagerFactory()).thenReturn( mockEntityManagerFactory); diff --git a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashcardRepositoryImpl.java b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashcardRepositoryImpl.java index 732a54d5b..8194626fa 100644 --- a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashcardRepositoryImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashcardRepositoryImpl.java @@ -15,7 +15,7 @@ import java.util.Set; @Repository -public class FlashcardRepositoryImpl extends AbstractCrudRepositoryImpl implements +public class FlashCardRepositoryImpl extends AbstractCrudRepositoryImpl implements FlashCardRepository { @Inject diff --git a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagRepositoryImpl.java b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagRepositoryImpl.java index 3168ff7c1..9c37b2b1c 100644 --- a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagRepositoryImpl.java +++ b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagRepositoryImpl.java @@ -11,7 +11,7 @@ import javax.inject.Inject; import java.util.List; -import static org.robbins.flashcards.springdata.repository.predicates.TagPredicates.hasFlashcardId; +import static org.robbins.flashcards.springdata.repository.predicates.TagPredicates.hasFlashCardId; import static org.robbins.flashcards.springdata.repository.predicates.TagPredicates.hasName; @Repository @@ -35,8 +35,8 @@ public Tag findByName(final String name) { } @Override - public List findByFlashcards_Id(final Long flashcardId) { - return toList(repository.findAll(hasFlashcardId(flashcardId))); + public List findByFlashCards_Id(final Long flashCardId) { + return toList(repository.findAll(hasFlashCardId(flashCardId))); } @Override diff --git a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagSpringDataRepository.java b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagSpringDataRepository.java index 1570619ad..e64a300c3 100644 --- a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagSpringDataRepository.java +++ b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/TagSpringDataRepository.java @@ -12,9 +12,9 @@ public interface TagSpringDataRepository extends JpaRepository, QueryDslPredicateExecutor { Tag findByName(String name); - List findByFlashcards_Id(String flashcardId); + List findByFlashCards_Id(String flashCardId); - @EntityGraph(value = "Tag.flashcards", type = EntityGraph.EntityGraphType.LOAD) + @EntityGraph(value = "Tag.flashCards", type = EntityGraph.EntityGraphType.LOAD) @Query("SELECT DISTINCT t FROM Tag t ORDER BY t.name") List findAll(); } diff --git a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/predicates/TagPredicates.java b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/predicates/TagPredicates.java index 2f9bfc732..26b038eef 100644 --- a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/predicates/TagPredicates.java +++ b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/predicates/TagPredicates.java @@ -10,8 +10,8 @@ public static Predicate hasName(final String name) { return tag.name.eq(name); } - public static Predicate hasFlashcardId(final Long flashCardId) { + public static Predicate hasFlashCardId(final Long flashCardId) { QTag tag = QTag.tag; - return tag.flashcards.any().id.eq(flashCardId); + return tag.flashCards.any().id.eq(flashCardId); } } diff --git a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/test/java/org/robbins/flashcards/repository/springdata/TagRepositoryIT.java b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/test/java/org/robbins/flashcards/repository/springdata/TagRepositoryIT.java index e049257cf..fe51e3bc6 100644 --- a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/test/java/org/robbins/flashcards/repository/springdata/TagRepositoryIT.java +++ b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/test/java/org/robbins/flashcards/repository/springdata/TagRepositoryIT.java @@ -44,7 +44,7 @@ public void findById() { @Test public void findByFlashCardsId() { final Long flashCardId = findFirstFlashCardId(); - final List tags = tagRepository.findByFlashcards_Id(flashCardId); + final List tags = tagRepository.findByFlashCards_Id(flashCardId); assertThat(tags.size(), is(1)); } @@ -56,9 +56,9 @@ private Long findFirstFlashCardId() { List tags = tagRepository.findAll(); Optional firstTag = tags.stream() - .filter(tag -> tag.getFlashcards().size() > 0) + .filter(tag -> tag.getFlashCards().size() > 0) .findFirst(); - return firstTag.isPresent() ? firstTag.get().getFlashcards().iterator().next().getId() : null; + return firstTag.isPresent() ? firstTag.get().getFlashCards().iterator().next().getId() : null; } } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/akka/actor/ItemSavingActor.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/akka/actor/ItemSavingActor.java index b83fd755f..17dc5ae7f 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/akka/actor/ItemSavingActor.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/akka/actor/ItemSavingActor.java @@ -8,7 +8,7 @@ import org.robbins.flashcards.akka.message.SingleSaveStartMessage; import org.robbins.flashcards.conversion.DtoConverter; import org.robbins.flashcards.dto.AbstractPersistableDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.model.common.AbstractAuditable; import org.robbins.flashcards.model.util.EntityAuditingUtil; import org.robbins.flashcards.repository.FlashCardsAppRepository; @@ -63,7 +63,7 @@ private SingleSaveResultMessage saveItem(final AbstractPersistableDto dto) { EntityAuditingUtil.configureCreatedByAndTime(entity, auditingUserId); repository.save(entity); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { LOGGER.error("Unable to create Dto {}, error: {}", dto.toString(), e.getMessage()); resultStatus = SingleSaveResultMessage.SaveResultStatus.FAILURE; } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardService.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardService.java index fc80e6bc3..586ce5bbe 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardService.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardService.java @@ -3,7 +3,7 @@ import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; import org.springframework.data.domain.PageRequest; @@ -13,10 +13,10 @@ public interface FlashCardService extends GenericPagingAndSortingService { - List findByTagsIn(final Set tags) throws FlashcardsException; - List findByTagsIn(final Set tags, final PageRequest page) throws FlashcardsException; - List findByQuestionLike(final String question) throws FlashcardsException; - List findByQuestionLike(final String question, PageRequest page) throws FlashcardsException; - FlashCardDto findByQuestion(final String question) throws FlashcardsException; - List findFlashcardsForTag(final Long tagId, final Set fields) throws FlashcardsException; + List findByTagsIn(final Set tags) throws FlashCardsException; + List findByTagsIn(final Set tags, final PageRequest page) throws FlashCardsException; + List findByQuestionLike(final String question) throws FlashCardsException; + List findByQuestionLike(final String question, PageRequest page) throws FlashCardsException; + FlashCardDto findByQuestion(final String question) throws FlashCardsException; + List findFlashCardsForTag(final Long tagId, final Set fields) throws FlashCardsException; } 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 index b34add5b4..baac60e38 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardServiceImpl.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/FlashCardServiceImpl.java @@ -3,8 +3,8 @@ 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.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; @@ -21,7 +21,7 @@ public class FlashCardServiceImpl extends AbstractCrudServiceImpl getFacade() { @@ -29,34 +29,39 @@ public GenericCrudFacade getFacade() { } @Override - public List findByTagsIn(final Set tags) throws FlashcardsException + public List findByTagsIn(final Set tags) throws FlashCardsException { return facade.findByTagsIn(tags); } @Override - public List findByTagsIn(final Set tags, final PageRequest page) throws FlashcardsException { + public List findByTagsIn(final Set tags, final PageRequest page) throws FlashCardsException + { return facade.findByTagsIn(tags, page); } @Override - public List findByQuestionLike(final String question) throws FlashcardsException { + public List findByQuestionLike(final String question) throws FlashCardsException + { return facade.findByQuestionLike(question); } @Override public List findByQuestionLike(final String question, - final PageRequest page) throws FlashcardsException { + final PageRequest page) throws FlashCardsException + { return facade.findByQuestionLike(question, page); } @Override - public FlashCardDto findByQuestion(final String question) throws FlashcardsException { + public FlashCardDto findByQuestion(final String question) throws FlashCardsException + { return facade.findByQuestion(question); } @Override - public List findFlashcardsForTag(final Long tagId, final Set fields) throws FlashcardsException { - return facade.findFlashcardsForTag(tagId, fields); + public List findFlashCardsForTag(final Long tagId, final Set fields) throws FlashCardsException + { + return facade.findFlashCardsForTag(tagId, fields); } } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagService.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagService.java index 24a0a30e9..62e91f16f 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagService.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagService.java @@ -2,7 +2,7 @@ package org.robbins.flashcards.service; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; import java.util.List; @@ -11,6 +11,6 @@ public interface TagService extends GenericPagingAndSortingService { - TagDto findByName(final String name) throws FlashcardsException; - List findTagsForFlashcard(final Long flashcardId, final Set fields) throws FlashcardsException; + TagDto findByName(final String name) throws FlashCardsException; + List findTagsForFlashCard(final Long flashCardId, final Set fields) throws FlashCardsException; } 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 index 4938189bf..d64e86cad 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagServiceImpl.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/TagServiceImpl.java @@ -2,7 +2,7 @@ package org.robbins.flashcards.service; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.TagFacade; import org.robbins.flashcards.facade.base.GenericCrudFacade; import org.robbins.flashcards.service.base.AbstractCrudServiceImpl; @@ -27,12 +27,14 @@ public GenericCrudFacade getFacade() { } @Override - public TagDto findByName(final String name) throws FlashcardsException { + public TagDto findByName(final String name) throws FlashCardsException + { return facade.findByName(name); } @Override - public List findTagsForFlashcard(final Long flashcardId, Set fields) throws FlashcardsException { - return facade.findTagsForFlashcard(flashcardId, fields); + public List findTagsForFlashCard(final Long flashCardId, Set fields) throws FlashCardsException + { + return facade.findTagsForFlashCard(flashCardId, fields); } } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserService.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserService.java index decb21490..a60a97076 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserService.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserService.java @@ -2,10 +2,10 @@ package org.robbins.flashcards.service; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; public interface UserService extends GenericPagingAndSortingService { - UserDto findUserByOpenid(final String openid) throws FlashcardsException; + UserDto findUserByOpenid(final String openid) throws FlashCardsException; } 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 index 12ad53edc..5b0e8a86c 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserServiceImpl.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/UserServiceImpl.java @@ -4,7 +4,7 @@ import javax.inject.Inject; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.UserFacade; import org.robbins.flashcards.facade.base.GenericCrudFacade; import org.robbins.flashcards.service.base.AbstractCrudServiceImpl; @@ -25,7 +25,8 @@ public GenericCrudFacade getFacade() { } @Override - public UserDto findUserByOpenid(final String openid) throws FlashcardsException { + public UserDto findUserByOpenid(final String openid) throws FlashCardsException + { return facade.findUserByOpenid(openid); } } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/AbstractCrudServiceImpl.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/AbstractCrudServiceImpl.java index ae8a35e9a..d7a966401 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/AbstractCrudServiceImpl.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/AbstractCrudServiceImpl.java @@ -3,10 +3,9 @@ import org.robbins.flashcards.akka.AkkaBatchSavingService; import org.robbins.flashcards.dto.AbstractAuditableDto; -import org.robbins.flashcards.dto.AbstractPersistableDto; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; import org.robbins.flashcards.exceptions.DataIntegrityException; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.dao.DataIntegrityViolationException; @@ -28,7 +27,8 @@ public abstract class AbstractCrudServiceImpl implem private AkkaBatchSavingService batchSavingService; @Override - public D save(final D dto) throws FlashcardsException { + public D save(final D dto) throws FlashCardsException + { try { return getFacade().save(dto); } catch (DataIntegrityViolationException integrityException) { @@ -39,7 +39,8 @@ public D save(final D dto) throws FlashcardsException { } @Override - public BatchLoadingReceiptDto save(List dtos) throws FlashcardsException { + public BatchLoadingReceiptDto save(List dtos) throws FlashCardsException + { return batchSavingService.save(getFacade(), (List) dtos); } @@ -49,12 +50,14 @@ public Long count() { } @Override - public D findOne(final ID id) throws FlashcardsException { + public D findOne(final ID id) throws FlashCardsException + { return getFacade().findOne(id); } @Override - public D findOne(final ID id, final Set fields) throws FlashcardsException { + public D findOne(final ID id, final Set fields) throws FlashCardsException + { return getFacade().findOne(id, fields); } @@ -64,22 +67,26 @@ public void delete(final ID id) { } @Override - public List findAll() throws FlashcardsException { + public List findAll() throws FlashCardsException + { return getFacade().list(); } @Override - public List findAll(final Optional page) throws FlashcardsException { + public List findAll(final Optional page) throws FlashCardsException + { return getFacade().list(page); } @Override - public List findAll(final Optional page, Set fields) throws FlashcardsException { + public List findAll(final Optional page, Set fields) throws FlashCardsException + { return getFacade().list(page, fields); } @Override - public List findByCreatedBy(final ID userId, final Set fields) throws FlashcardsException { + public List findByCreatedBy(final ID userId, final Set fields) throws FlashCardsException + { return getFacade().findByCreatedBy(userId, fields); } } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericCrudService.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericCrudService.java index 2679aac47..fcf5e2127 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericCrudService.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericCrudService.java @@ -5,7 +5,7 @@ import java.util.List; import org.robbins.flashcards.dto.BatchLoadingReceiptDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; public interface GenericCrudService { @@ -16,9 +16,9 @@ public interface GenericCrudService { * @param entity * @return the saved entity */ - T save(T entity) throws FlashcardsException; + T save(T entity) throws FlashCardsException; - BatchLoadingReceiptDto save(List entities) throws FlashcardsException; + BatchLoadingReceiptDto save(List entities) throws FlashCardsException; /** * Retrives an entity by its id. @@ -26,7 +26,7 @@ public interface GenericCrudService { * @param id must not be {@literal null}. * @return the entity with the given id or {@literal null} if none found */ - T findOne(ID id) throws FlashcardsException; + T findOne(ID id) throws FlashCardsException; /** * Returns the number of entities available. @@ -42,5 +42,5 @@ public interface GenericCrudService { */ void delete(ID id); - List findAll() throws FlashcardsException; + List findAll() throws FlashCardsException; } diff --git a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericPagingAndSortingService.java b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericPagingAndSortingService.java index 39c99766f..14b94785b 100644 --- a/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericPagingAndSortingService.java +++ b/FlashCards_Service/src/main/java/org/robbins/flashcards/service/base/GenericPagingAndSortingService.java @@ -6,19 +6,19 @@ import java.util.Optional; import java.util.Set; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.springframework.data.domain.Pageable; public interface GenericPagingAndSortingService extends GenericCrudService { List findAll(final Optional page) - throws FlashcardsException; + throws FlashCardsException; List findAll(final Optional page, - Set fields) throws FlashcardsException; + Set fields) throws FlashCardsException; - D findOne(ID id, Set fields) throws FlashcardsException; + D findOne(ID id, Set fields) throws FlashCardsException; - List findByCreatedBy(final ID userId, final Set fields) throws FlashcardsException; + List findByCreatedBy(final ID userId, final Set fields) throws FlashCardsException; } diff --git a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/FlashCardServiceImplUT.java b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/FlashCardServiceImplUT.java index 78831cd82..8756b4a36 100644 --- a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/FlashCardServiceImplUT.java +++ b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/FlashCardServiceImplUT.java @@ -19,8 +19,8 @@ import org.mockito.Mockito; 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.exceptions.FlashCardsException; +import org.robbins.flashcards.facade.FlashCardFacade; import org.robbins.tests.BaseMockingTest; import org.robbins.tests.UnitTest; import org.springframework.data.domain.PageRequest; @@ -30,7 +30,7 @@ public class FlashCardServiceImplUT extends BaseMockingTest { @Mock - private FlashcardFacade facade; + private FlashCardFacade facade; private FlashCardServiceImpl flashCardService; @@ -41,7 +41,8 @@ public void before() { } @Test - public void testFindByQuestion() throws FlashcardsException { + public void testFindByQuestion() throws FlashCardsException + { when(facade.findByQuestion(Matchers.anyString())).thenReturn( mock(FlashCardDto.class)); @@ -52,7 +53,8 @@ public void testFindByQuestion() throws FlashcardsException { } @Test - public void testFindByQuestionLike() throws FlashcardsException { + public void testFindByQuestionLike() throws FlashCardsException + { when(facade.findByQuestionLike(Matchers.anyString())).thenReturn( new ArrayList<>()); @@ -63,7 +65,8 @@ public void testFindByQuestionLike() throws FlashcardsException { } @Test - public void testFindByTagsIn() throws FlashcardsException { + public void testFindByTagsIn() throws FlashCardsException + { when(facade.findByTagsIn(new HashSet<>())).thenReturn( new ArrayList<>()); @@ -77,7 +80,8 @@ public void testFindByTagsIn() throws FlashcardsException { } @Test - public void testFindByTagsInWithPageRequest() throws FlashcardsException { + public void testFindByTagsInWithPageRequest() throws FlashCardsException + { when(facade.findByTagsIn(new HashSet<>(), mock(PageRequest.class))).thenReturn( new ArrayList<>()); @@ -92,7 +96,8 @@ public void testFindByTagsInWithPageRequest() throws FlashcardsException { } @Test - public void testFindByQuestionLikeWithPageRequest() throws FlashcardsException { + public void testFindByQuestionLikeWithPageRequest() throws FlashCardsException + { when(facade.findByQuestionLike("Question", mock(PageRequest.class))).thenReturn( new ArrayList<>()); diff --git a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/TagServiceImplUT.java b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/TagServiceImplUT.java index 88da0a5a7..c1a23c3fd 100644 --- a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/TagServiceImplUT.java +++ b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/TagServiceImplUT.java @@ -12,7 +12,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.TagFacade; import org.robbins.tests.BaseMockingTest; import org.robbins.tests.UnitTest; @@ -33,7 +33,8 @@ public void before() { } @Test - public void testFindByName() throws FlashcardsException { + public void testFindByName() throws FlashCardsException + { when(facade.findByName(Matchers.anyString())).thenReturn(new TagDto(1L)); TagDto tag = tagService.findByName("EJB"); diff --git a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/UserServiceImplUT.java b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/UserServiceImplUT.java index cd4149d10..fdebcbbbf 100644 --- a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/UserServiceImplUT.java +++ b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/UserServiceImplUT.java @@ -12,7 +12,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.UserFacade; import org.robbins.tests.BaseMockingTest; import org.robbins.tests.UnitTest; @@ -33,7 +33,8 @@ public void before() { } @Test - public void testFindUserByOpenid() throws FlashcardsException { + public void testFindUserByOpenid() throws FlashCardsException + { when(facade.findUserByOpenid(Matchers.anyString())).thenReturn(new UserDto()); UserDto user = userService.findUserByOpenid("open_id"); diff --git a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/base/AbstractCrudServiceImplUT.java b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/base/AbstractCrudServiceImplUT.java index 9fe0bf9f6..e78fc9c18 100644 --- a/FlashCards_Service/src/test/java/org/robbins/flashcards/service/base/AbstractCrudServiceImplUT.java +++ b/FlashCards_Service/src/test/java/org/robbins/flashcards/service/base/AbstractCrudServiceImplUT.java @@ -16,7 +16,7 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.TagFacade; import org.robbins.flashcards.service.TagServiceImpl; import org.robbins.tests.BaseMockingTest; @@ -46,7 +46,7 @@ public void before() { } @Test - public void save() throws FlashcardsException + public void save() throws FlashCardsException { when(facade.save(tagDto)).thenReturn(tagDto); @@ -68,7 +68,8 @@ public void count() { } @Test - public void findOne() throws FlashcardsException { + public void findOne() throws FlashCardsException + { when(facade.findOne(Matchers.anyLong())).thenReturn(tagDto); final TagDto result = tagService.findOne(uuid); @@ -93,7 +94,8 @@ public void deleteEntity() { } @Test - public void findAll() throws FlashcardsException { + public void findAll() throws FlashCardsException + { when(facade.list()).thenReturn(tags); final List results = tagService.findAll(); diff --git a/FlashCards_Test/src/main/java/org/robbins/flashcards/tests/webservices/GenericEntityRestTest.java b/FlashCards_Test/src/main/java/org/robbins/flashcards/tests/webservices/GenericEntityRestTest.java index 7a2fa423d..9ac6c868f 100644 --- a/FlashCards_Test/src/main/java/org/robbins/flashcards/tests/webservices/GenericEntityRestTest.java +++ b/FlashCards_Test/src/main/java/org/robbins/flashcards/tests/webservices/GenericEntityRestTest.java @@ -12,7 +12,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robbins.flashcards.client.GenericRestCrudFacade; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.domain.Persistable; @@ -43,7 +43,8 @@ public abstract class GenericEntityRestTest, ID extend * Test get entity list. */ @Test - public void testGetEntityList() throws FlashcardsException { + public void testGetEntityList() throws FlashCardsException + { final List entityList = getClient().list(); assertTrue(entityList.size() > 0); @@ -63,7 +64,8 @@ public void testGetEntityCount() { * Test get entity. */ @Test - public void testGetEntity() throws FlashcardsException { + public void testGetEntity() throws FlashCardsException + { final E retrievedEntity = getClient().findOne(getEntity().getId()); assertEquals(retrievedEntity.getId(), getEntity().getId()); @@ -82,7 +84,8 @@ public void testPostEntity() { * Test put entity. */ @Test - public void testPutEntity() throws FlashcardsException { + public void testPutEntity() throws FlashCardsException + { getClient().put(getEntity()); @@ -105,7 +108,8 @@ public void testDeleteEntity() { /** * Post entity. */ - public void postEntity() throws FlashcardsException { + public void postEntity() throws FlashCardsException + { setEntity(getClient().save(getEntity())); } @@ -113,7 +117,8 @@ public void postEntity() throws FlashcardsException { * Before. */ @Before - public void before() throws FlashcardsException{ + public void before() throws FlashCardsException + { LOGGER.debug("******************** BEFORE TEST ********************"); postEntity(); diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditFlashCardActivity.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditFlashCardActivity.java index 4125251da..75c52def2 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditFlashCardActivity.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditFlashCardActivity.java @@ -164,8 +164,8 @@ private void doSave() { } } - private void saveFlashCard(final FlashCardDto flashcard) { - flashCardService.postFlashCards(ConstsUtil.DEFAULT_AUTH_HEADER, flashcard, + private void saveFlashCard(final FlashCardDto flashCard) { + flashCardService.postFlashCards(ConstsUtil.DEFAULT_AUTH_HEADER, flashCard, new MethodCallback() { @Override @@ -186,12 +186,14 @@ public void onSuccess(final Method method, final FlashCardDto result) { }); } - private void updateFlashCard(final FlashCardDto flashcard) { - flashCardService.putFlashCard(ConstsUtil.DEFAULT_AUTH_HEADER, flashcard.getId(), - flashcard, new MethodCallback() { + private void updateFlashCard(final FlashCardDto flashCard) { + flashCardService.putFlashCard(ConstsUtil.DEFAULT_AUTH_HEADER, flashCard.getId(), + flashCard, new MethodCallback() + { @Override - public void onFailure(final Method method, final Throwable caught) { + public void onFailure(final Method method, final Throwable caught) + { GWT.log("EditFlashCardActivity: Error saving data"); Window.alert(getConstants().errorSavingTag()); EditFlashCardActivity.this.display.getSubmitEnabled().setEnabled( @@ -199,7 +201,8 @@ public void onFailure(final Method method, final Throwable caught) { } @Override - public void onSuccess(final Method method, final java.lang.Void result) { + public void onSuccess(final Method method, final java.lang.Void result) + { GWT.log("EditFlashCardActivity: FlashCard updated"); EditFlashCardActivity.this.display.getSubmitEnabled().setEnabled( true); diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditTagActivity.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditTagActivity.java index 4eccd7c86..3779ca293 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditTagActivity.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/EditTagActivity.java @@ -74,7 +74,7 @@ public void onSuccess(final Method method, final TagDto tag) { GWT.log("EditTagActivity: 'Load Tag' TagId: " + tag.getId()); setTag(tag); EditTagActivity.this.display.setTagData(tag); - EditTagActivity.this.display.setFlashCardsData(tag.getFlashcardsAsList()); + EditTagActivity.this.display.setFlashCardsData(tag.getFlashCardsAsList()); } @Override diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/FlashCardsActivity.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/FlashCardsActivity.java index 456044101..ca076c6fa 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/FlashCardsActivity.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/activity/FlashCardsActivity.java @@ -80,7 +80,7 @@ public void onLoadTag(final LoadTagEvent event) { new DeleteFlashCardEventHandler() { @Override - public void onDeleteFlashcard(final DeleteFlashCardEvent event) { + public void onDeleteFlashCard(final DeleteFlashCardEvent event) { GWT.log("FlashCardsActivity: 'Delete FlashCard' event"); flashCardService.deleteFlashCards( diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.java index 4cdf0d2aa..e29c36f90 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.java @@ -63,5 +63,5 @@ public interface AppConstants extends Constants { String tags(); - String thisTagIsNotAssignedToAnyFlashcards(); + String thisTagIsNotAssignedToAnyFlashCards(); } diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.properties b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.properties index 2f15fe6d1..84bcd598b 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.properties +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/AppConstants.properties @@ -27,4 +27,4 @@ tagName = Tag Name tagNameAlreadyExists = Tag name already exists tagNameIsRequired = Tag name is required tags = Tags -thisTagIsNotAssignedToAnyFlashcards = This Tag is not assigned to any Flashcards +thisTagIsNotAssignedToAnyFlashCards = This Tag is not assigned to any Flashcards diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/desktop/TagsViewImplDesktop.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/desktop/TagsViewImplDesktop.java index 27392e4ea..52a868e11 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/desktop/TagsViewImplDesktop.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/desktop/TagsViewImplDesktop.java @@ -151,7 +151,7 @@ public void update(final int index, final TagDto object, final String value) { @Override public List getValue(final TagDto object) { - return object.getFlashcardsAsList(); + return object.getFlashCardsAsList(); } }; flashCardsColumn.setSortable(false); @@ -192,7 +192,7 @@ public ImageResource getValue(final TagDto object) { @Override public void onBrowserEvent(final Context context, final Element elem, final TagDto object, final NativeEvent event) { - if (object.getFlashcards().size() == 0) { + if (object.getFlashCards().size() == 0) { GWT.log("Click on Delete cell for: " + object.getId()); eventBus.fireEvent(new DeleteTagEvent(object.getId())); } diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/DeleteTagImageCell.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/DeleteTagImageCell.java index 9eb7a2926..cb77ee1c2 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/DeleteTagImageCell.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/DeleteTagImageCell.java @@ -47,7 +47,7 @@ public DeleteTagImageCell() { @Override public void render(final Context context, final TagDto tag, final SafeHtmlBuilder sb) { if (tag != null) { - if ((tag.getFlashcards() != null) && (tag.getFlashcards().size() > 0)) { + if ((tag.getFlashCards() != null) && (tag.getFlashCards().size() > 0)) { sb.append(SafeHtmlUtils.fromTrustedString(AbstractImagePrototype.create( images.deleteDisabled()).getHTML())); } else { diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/FlashCardFlexTable.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/FlashCardFlexTable.java index 16e675c80..333917fdf 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/FlashCardFlexTable.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/client/ui/widgets/FlashCardFlexTable.java @@ -35,7 +35,7 @@ public void setInput(final List flashCards) { if (flashCards == null || flashCards.size() == 0) { this.setWidget(1, 0, - new Label(constants.thisTagIsNotAssignedToAnyFlashcards())); + new Label(constants.thisTagIsNotAssignedToAnyFlashCards())); return; } diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEvent.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEvent.java index 24fa0fbea..458be81ab 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEvent.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEvent.java @@ -42,6 +42,6 @@ public Type getAssociatedType() { @Override protected void dispatch(final DeleteFlashCardEventHandler handler) { - handler.onDeleteFlashcard(this); + handler.onDeleteFlashCard(this); } } diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEventHandler.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEventHandler.java index d860b843a..113708f05 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEventHandler.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/events/DeleteFlashCardEventHandler.java @@ -3,5 +3,5 @@ public interface DeleteFlashCardEventHandler { - void onDeleteFlashcard(DeleteFlashCardEvent event); + void onDeleteFlashCard(DeleteFlashCardEvent event); } diff --git a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/model/TagDto.java b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/model/TagDto.java index 680ec3216..e08eede9e 100644 --- a/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/model/TagDto.java +++ b/FlashCards_UI/FlashCards_GWT/src/main/java/org/robbins/flashcards/model/TagDto.java @@ -13,7 +13,7 @@ public class TagDto extends AbstractAuditable implements Seriali private String name; - private Set flashcards = new HashSet(0); + private Set flashCards = new HashSet(0); public TagDto() { } @@ -22,9 +22,9 @@ public TagDto(final String name) { this.name = name; } - public TagDto(final String name, final Set flashcards) { + public TagDto(final String name, final Set flashCards) { this.name = name; - this.flashcards = flashcards; + this.flashCards = flashCards; } public String getName() { @@ -35,20 +35,20 @@ public void setName(final String name) { this.name = name; } - public Set getFlashcards() { - return this.flashcards; + public Set getFlashCards() { + return this.flashCards; } - public void setFlashcards(final Set flashcards) { - this.flashcards = flashcards; + public void setFlashCards(final Set flashCards) { + this.flashCards = flashCards; } - public List getFlashcardsAsList() { - if (getFlashcards() == null) { + public List getFlashCardsAsList() { + if (getFlashCards() == null) { return null; } List flashCards = new ArrayList(); - for (FlashCardDto flashCard : getFlashcards()) { + for (FlashCardDto flashCard : getFlashCards()) { flashCards.add(flashCard); } return flashCards; diff --git a/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/FlashCardAction.java b/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/FlashCardAction.java index 84036068c..043841e87 100644 --- a/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/FlashCardAction.java +++ b/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/FlashCardAction.java @@ -3,13 +3,13 @@ import com.opensymphony.xwork2.ModelDriven; import com.opensymphony.xwork2.Preparable; -import org.apache.commons.lang3.StringUtils; + import org.apache.struts2.interceptor.SessionAware; import org.apache.struts2.interceptor.validation.SkipValidation; 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.exceptions.FlashCardsException; +import org.robbins.flashcards.facade.FlashCardFacade; import org.robbins.flashcards.facade.TagFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +27,8 @@ public class FlashCardAction extends FlashCardsAppBaseAction implements private static final Logger LOGGER = LoggerFactory.getLogger(FlashCardAction.class); @Inject - @Qualifier("presentationFlashcardFacade") - private transient FlashcardFacade flashcardFacade; + @Qualifier("presentationFlashCardFacade") + private transient FlashCardFacade flashCardFacade; @Inject @Qualifier("presentationTagFacade") @@ -36,7 +36,7 @@ public class FlashCardAction extends FlashCardsAppBaseAction implements private FlashCardDto flashCard = new FlashCardDto(); - // the exploded string (tag1, tag2, etc.) of the current Flashcard's Tags + // the exploded string (tag1, tag2, etc.) of the current FlashCard's Tags private String explodedTags; // used in Browse mode to switch between List View and Slideshow @@ -44,10 +44,10 @@ public class FlashCardAction extends FlashCardsAppBaseAction implements private Map httpSession; - // a list of Flashcards used in List and Browse mode + // a list of FlashCards used in List and Browse mode private List flashCardList = new ArrayList<>(); - // a separate list of Tags not belonging directly to the Flashcard + // a separate list of Tags not belonging directly to the FlashCard // usually a list of All the Tags in the DB private List tagList = new ArrayList<>(); @@ -62,7 +62,7 @@ public String list() { this.flashCardList = null; try { - this.flashCardList = flashcardFacade.list(); + this.flashCardList = flashCardFacade.list(); return "success"; } catch (Exception e) { @@ -98,18 +98,18 @@ public String saveOrUpdate() { this.flashCard.setTags(convertToTags(getExplodedTags())); if ((this.flashCard.getId() != null) && this.flashCard.getId().equals(0L)) { - FlashCardDto existingFlashCard = flashcardFacade.findOne(this.flashCard.getId()); + FlashCardDto existingFlashCard = flashCardFacade.findOne(this.flashCard.getId()); existingFlashCard.setQuestion(this.flashCard.getQuestion()); existingFlashCard.setAnswer(this.flashCard.getAnswer()); existingFlashCard.setTags(this.flashCard.getTags()); existingFlashCard.setLinks(this.flashCard.getLinks()); - flashcardFacade.save(existingFlashCard); + flashCardFacade.save(existingFlashCard); LOGGER.debug("Flash Card updated successfully"); this.addActionMessage(getText("actionmessage.flashcard.updated")); } else { - flashcardFacade.save(this.flashCard); + flashCardFacade.save(this.flashCard); LOGGER.debug("Flash Card created successfully"); this.addActionMessage(getText("actionmessage.flashcard.created")); @@ -121,7 +121,7 @@ public String saveOrUpdate() { } } - private Set convertToTags(final String explodedTags) throws FlashcardsException + private Set convertToTags(final String explodedTags) throws FlashCardsException { if (getExplodedTags() == null) { return null; @@ -148,7 +148,7 @@ private String tagNameAsString(final TagDto tag, final boolean addQuotes) { @SkipValidation public String delete() { try { - flashcardFacade.delete(this.flashCard.getId()); + flashCardFacade.delete(this.flashCard.getId()); LOGGER.debug("Flash Card deleted successfully"); @@ -165,9 +165,9 @@ public String delete() { public String display() { try { if ((this.flashCard.getId() != null) && this.flashCard.getId().equals(0L)) { - this.flashCard = flashcardFacade.findOne(this.flashCard.getId()); + this.flashCard = flashCardFacade.findOne(this.flashCard.getId()); } else if (this.flashCard.getQuestion() != null) { - this.flashCard = flashcardFacade.findByQuestion(this.flashCard.getQuestion()); + this.flashCard = flashCardFacade.findByQuestion(this.flashCard.getQuestion()); } this.setExplodedTags(convertFromTags(this.flashCard.getTags(), false)); @@ -218,7 +218,7 @@ else if (httpSession.containsKey("viewType")) { this.flashCard.setTags(convertToTags(getExplodedTags())); // get a list of Flash Cards from the data tier - this.flashCardList = flashcardFacade.findByTagsIn(this.flashCard.getTags()); + this.flashCardList = flashCardFacade.findByTagsIn(this.flashCard.getTags()); } // if we have the Tag filter saved in the HTTP Session else if ((httpSession.containsKey("explodedTags")) && (this.getExplodedTags() == null)) { @@ -233,14 +233,14 @@ else if ((httpSession.containsKey("explodedTags")) this.flashCard.setTags(convertToTags(getExplodedTags())); // get a list of Flash Cards from the data tier - this.flashCardList = flashcardFacade.findByTagsIn(this.flashCard.getTags()); + this.flashCardList = flashCardFacade.findByTagsIn(this.flashCard.getTags()); } // otherwise, let's grab all FlashCards for all Tags else { LOGGER.debug("Retrieving FlashCards for all Tags"); // retrieve all the FlashCards - this.flashCardList = flashcardFacade.list(); + this.flashCardList = flashCardFacade.list(); } // get a list of Tags from the data tier diff --git a/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/TagAction.java b/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/TagAction.java index 6deff00eb..b0ccb0200 100644 --- a/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/TagAction.java +++ b/FlashCards_UI/FlashCards_Struts/src/main/java/org/robbins/flashcards/presentation/action/TagAction.java @@ -7,11 +7,10 @@ import javax.inject.Inject; -import org.apache.commons.lang3.StringUtils; import org.apache.struts2.interceptor.SessionAware; import org.apache.struts2.interceptor.validation.SkipValidation; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.facade.TagFacade; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -90,7 +89,7 @@ public String delete() { this.addActionMessage(getText("error.tag.delete.failed")); // we'll assume the Tag was not deleted because it is already assigned to one - // or more Flashcards + // or more FlashCards // maybe need to add code later to prevent a delete attempt if the Tag has // FlashCards this.addActionMessage(getText("error.tag.delete.failed.extra.info")); @@ -136,7 +135,7 @@ public void validate() { addFieldError("tag.name", getText("error.tag.exists")); } } - catch (FlashcardsException e) + catch (FlashCardsException e) { LOGGER.error("Exception in display():", e); addFieldError("tag.name", getText("error.tag.validation.failure")); diff --git a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/FlashCardsResource.java b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/FlashCardsResource.java index 3ba9fee56..168bffcba 100644 --- a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/FlashCardsResource.java +++ b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/FlashCardsResource.java @@ -23,7 +23,7 @@ import org.robbins.flashcards.dto.FlashCardDto; import org.robbins.flashcards.dto.TagDto; import org.robbins.flashcards.dto.util.PagingUtils; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.FlashCardService; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; import org.robbins.flashcards.webservices.base.AbstractGenericResource; @@ -48,11 +48,11 @@ public class FlashCardsResource extends AbstractGenericResource getService() { - return flashcardService; + return flashCardService; } @GET @@ -84,11 +84,11 @@ private FlashCardDto[] searchFlashCards(final Integer page, final Integer size, // are we using pagination? if (page != null) { List results; - results = flashcardService.findByQuestionLike(question, + results = flashCardService.findByQuestionLike(question, new PageRequest(page, size)); return results.toArray(new FlashCardDto[results.size()]); } else { - List results = flashcardService.findByQuestionLike(question); + List results = flashCardService.findByQuestionLike(question); return results.toArray(new FlashCardDto[results.size()]); } } @@ -101,18 +101,18 @@ private FlashCardDto[] searchFlashCards(final Integer page, final Integer size, } // are we using Pagination? if (page != null) { - List results = flashcardService.findByTagsIn(tagsSet, + List results = flashCardService.findByTagsIn(tagsSet, new PageRequest(page, size)); return results.toArray(new FlashCardDto[results.size()]); } else { - List results = flashcardService.findByTagsIn(tagsSet); + List results = flashCardService.findByTagsIn(tagsSet); return results.toArray(new FlashCardDto[results.size()]); } } else { throw new GenericWebServiceException(Response.Status.BAD_REQUEST, "Invalid 'search' parameters"); } - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } @@ -127,8 +127,8 @@ public Response put(@PathParam("id") final Long id, final FlashCardDto dto) { if (dto.getCreatedBy().equals(0L)) { FlashCardDto orig; try { - orig = flashcardService.findOne(id, null); - } catch (FlashcardsException e) { + orig = flashCardService.findOne(id, null); + } catch (FlashCardsException e) { throw new GenericWebServiceException( Response.Status.INTERNAL_SERVER_ERROR, e); } @@ -153,7 +153,7 @@ public JResponse> list(final Integer page, final Integer siz LOGGER.error(e.getMessage(), e); throw new GenericWebServiceException(Response.Status.BAD_REQUEST, "Invalid sort parameter: '" + sort + "'", e); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } @@ -174,48 +174,48 @@ public JResponse> list(@PathParam("tagId") final Long tagId, @QueryParam("fields") final String fields) { if (tagId != null) { - return listFlashcardsForTag(tagId, page, size, sort, direction, fields); + return listFlashCardsForTag(tagId, page, size, sort, direction, fields); } else if (userId != null) { - return listFlashcardsForUser(userId, page, size, sort, direction, fields); + return listFlashCardsForUser(userId, page, size, sort, direction, fields); } else { return list(page, size, sort, direction, fields); } } - private JResponse> listFlashcardsForTag(final Long tagId, final Integer page, - final Integer size, final String sort, - final String direction, final String fields) { + private JResponse> listFlashCardsForTag(final Long tagId, final Integer page, + final Integer size, final String sort, + final String direction, final String fields) { try { - List entities = flashcardService.findFlashcardsForTag(tagId, this.getFieldsAsSet(fields)); + List entities = flashCardService.findFlashCardsForTag(tagId, this.getFieldsAsSet(fields)); if (CollectionUtils.isEmpty(entities)) { throw new GenericWebServiceException(Response.Status.NOT_FOUND, - "Flashcards not found for Tag: " + tagId); + "FlashCards not found for Tag: " + tagId); } return JResponse.ok(entities).build(); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } - private JResponse> listFlashcardsForUser(final Long userId, final Integer page, - final Integer size, final String sort, - final String direction, final String fields) { + private JResponse> listFlashCardsForUser(final Long userId, final Integer page, + final Integer size, final String sort, + final String direction, final String fields) { try { - List entities = flashcardService.findByCreatedBy(userId, this.getFieldsAsSet(fields)); + List entities = flashCardService.findByCreatedBy(userId, this.getFieldsAsSet(fields)); if (CollectionUtils.isEmpty(entities)) { throw new GenericWebServiceException(Response.Status.NOT_FOUND, - "Flashcards not found for User: " + userId); + "FlashCards not found for User: " + userId); } return JResponse.ok(entities).build(); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } @Path("/{flashcardId}/tags") - public Class findTagsForFlashcard() { + public Class findTagsForFlashCard() { return TagsResource.class; } } diff --git a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/TagsResource.java b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/TagsResource.java index 363f18f90..62fdb757a 100644 --- a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/TagsResource.java +++ b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/TagsResource.java @@ -18,7 +18,7 @@ import org.apache.commons.collections.CollectionUtils; import org.robbins.flashcards.dto.TagDto; import org.robbins.flashcards.dto.util.PagingUtils; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.TagService; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; import org.robbins.flashcards.webservices.base.AbstractGenericResource; @@ -61,7 +61,7 @@ public TagDto searchByName(@QueryParam("name") final String name) { tagDto = tagService.findByName(name); } - catch (FlashcardsException e) + catch (FlashCardsException e) { throw new GenericWebServiceException( Response.Status.INTERNAL_SERVER_ERROR, e); @@ -87,12 +87,12 @@ public Response put(@PathParam("id") final Long id, final TagDto dto) { orig = tagService.findOne(id); } - catch (FlashcardsException e) + catch (FlashCardsException e) { throw new GenericWebServiceException( Response.Status.INTERNAL_SERVER_ERROR, e); } - dto.setFlashcards(orig.getFlashcards()); + dto.setFlashCards(orig.getFlashCards()); dto.setCreatedBy(orig.getCreatedBy()); dto.setCreatedDate(orig.getCreatedDate()); } @@ -116,7 +116,7 @@ public JResponse> list(final Integer page, final Integer size, throw new GenericWebServiceException(Response.Status.BAD_REQUEST, "Invalid sort parameter: '" + sort + "'", e); } - catch (FlashcardsException e) + catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } @@ -130,7 +130,7 @@ public JResponse> list(final Integer page, final Integer size, } @GET - public JResponse> list(@PathParam("flashcardId") final Long flashcardId, + public JResponse> list(@PathParam("flashcardId") final Long flashCardId, @PathParam("userId") final Long userId, @QueryParam("page") final Integer page, @DefaultValue("25") @QueryParam("size") final Integer size, @@ -139,9 +139,9 @@ public JResponse> list(@PathParam("flashcardId") final Long flashca @QueryParam("fields") final String fields) { - if (flashcardId != null) + if (flashCardId != null) { - return listTagsForFlashcard(flashcardId, page, size, sort, direction, fields); + return listTagsForFlashCard(flashCardId, page, size, sort, direction, fields); } else if (userId != null) { @@ -153,21 +153,21 @@ else if (userId != null) } } - private JResponse> listTagsForFlashcard(final Long flashcardId, final Integer page, + private JResponse> listTagsForFlashCard(final Long flashCardId, final Integer page, final Integer size, final String sort, final String direction, final String fields) { try { - List entities = tagService.findTagsForFlashcard(flashcardId, this.getFieldsAsSet(fields)); + List entities = tagService.findTagsForFlashCard(flashCardId, this.getFieldsAsSet(fields)); if (CollectionUtils.isEmpty(entities)) { throw new GenericWebServiceException(Response.Status.NOT_FOUND, - "Tags not found for Flashcard: " + flashcardId); + "Tags not found for FlashCard: " + flashCardId); } return JResponse.ok(entities).build(); } - catch (FlashcardsException e) + catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } @@ -187,14 +187,14 @@ private JResponse> listTagsForUser(final Long userId, final Integer } return JResponse.ok(entities).build(); } - catch (FlashcardsException e) + catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } @Path("/{tagId}/flashcards") - public Class findFlashcardsForTag() + public Class findFlashCardsForTag() { return FlashCardsResource.class; } diff --git a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/UsersResource.java b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/UsersResource.java index 8867a4746..3cf448209 100644 --- a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/UsersResource.java +++ b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/UsersResource.java @@ -10,7 +10,7 @@ import javax.ws.rs.core.Response; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.UserService; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; import org.robbins.flashcards.webservices.base.AbstractGenericListingResource; @@ -41,13 +41,13 @@ protected GenericPagingAndSortingService getService() { public UserDto search(@QueryParam("openid") final String openid) { try { return userService.findUserByOpenid(openid); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } @Path("/{userId}/flashcards") - public Class findFlashcardsForUser() { + public Class findFlashCardsForUser() { return FlashCardsResource.class; } diff --git a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericListingResource.java b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericListingResource.java index 8232edee0..cbdf9140a 100644 --- a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericListingResource.java +++ b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericListingResource.java @@ -10,7 +10,7 @@ import javax.ws.rs.core.Response; import org.robbins.flashcards.dto.util.PagingUtils; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.webservices.exceptions.GenericWebServiceException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +40,7 @@ public JResponse> list(@QueryParam("page") final Integer page, LOGGER.error(e.getMessage(), e); throw new GenericWebServiceException(Response.Status.BAD_REQUEST, "Inavlid sort parameter: '" + sort + "'", e); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } diff --git a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericResource.java b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericResource.java index a7a6b7896..fc94618cc 100644 --- a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericResource.java +++ b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractGenericResource.java @@ -20,7 +20,7 @@ import org.robbins.flashcards.dto.BatchLoadingReceiptDto; import org.robbins.flashcards.exceptions.DataIntegrityException; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.base.GenericPagingAndSortingService; import org.robbins.flashcards.webservices.exceptions.GenericWebServiceException; import org.slf4j.Logger; @@ -53,7 +53,7 @@ public T findOne(@PathParam("id") final ID id, T entity; try { entity = getService().findOne(id, this.getFieldsAsSet(fields)); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } @@ -74,7 +74,7 @@ public T post(final T entity) { } catch (DataIntegrityException e) { throw new GenericWebServiceException(Response.Status.BAD_REQUEST, e); } - catch (FlashcardsException e) { + catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } @@ -90,7 +90,7 @@ public BatchLoadingReceiptDto post(final List entities) { } catch (DataIntegrityException e) { throw new GenericWebServiceException(Response.Status.BAD_REQUEST, e); } - catch (FlashcardsException e) { + catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } } @@ -102,7 +102,7 @@ public BatchLoadingReceiptDto post(final List entities) { public Response put(@PathParam("id") final ID id, final T entity) { try { getService().save(entity); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } return Response.noContent().build(); @@ -127,7 +127,7 @@ public Response update(@PathParam("id") final ID id, final T updatedEntity) { T originalEntity; try { originalEntity = getService().findOne(id); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } @@ -137,7 +137,7 @@ public Response update(@PathParam("id") final ID id, final T updatedEntity) { // persist the entity back to the db try { getService().save(originalEntity); - } catch (FlashcardsException e) { + } catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } diff --git a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractSecurityFilter.java b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractSecurityFilter.java index ebe3acc4f..b938ce1c4 100644 --- a/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractSecurityFilter.java +++ b/FlashCards_WebServices/src/main/java/org/robbins/flashcards/webservices/base/AbstractSecurityFilter.java @@ -5,7 +5,7 @@ import javax.ws.rs.core.Response; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.UserService; import org.robbins.flashcards.webservices.exceptions.GenericWebServiceException; import org.slf4j.Logger; @@ -60,7 +60,7 @@ protected void configureLoggedInUser() { + getLoggedInUser().getId()); } } - catch (FlashcardsException e) + catch (FlashCardsException e) { throw new GenericWebServiceException(Response.Status.INTERNAL_SERVER_ERROR, e); } diff --git a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceUT.java b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceUT.java index 08976b274..b7f5ef2b4 100644 --- a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceUT.java +++ b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/FlashCardsResourceUT.java @@ -20,7 +20,7 @@ import org.junit.experimental.categories.Category; import org.mockito.Mock; import org.robbins.flashcards.dto.FlashCardDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.FlashCardService; import org.robbins.flashcards.webservices.exceptions.GenericWebServiceException; import org.robbins.tests.BaseMockingTest; @@ -49,7 +49,7 @@ public void before() { mockFlashCardDtoList = Arrays.asList(new FlashCardDto()); resource = new FlashCardsResource(); - ReflectionTestUtils.setField(resource, "flashcardService", mockFlashCardService); + ReflectionTestUtils.setField(resource, "flashCardService", mockFlashCardService); } @Test(expected = GenericWebServiceException.class) @@ -58,7 +58,7 @@ public void search() { } @Test - public void searchCount() throws FlashcardsException + public void searchCount() throws FlashCardsException { when(mockFlashCardService.findByQuestionLike(any(String.class))).thenReturn( mockFlashCardDtoList); @@ -70,7 +70,8 @@ public void searchCount() throws FlashcardsException } @Test - public void search_byQuestion() throws FlashcardsException { + public void search_byQuestion() throws FlashCardsException + { when(mockFlashCardService.findByQuestionLike(any(String.class))).thenReturn( mockFlashCardDtoList); @@ -81,7 +82,8 @@ public void search_byQuestion() throws FlashcardsException { } @Test - public void search_byQuestion_withPage() throws FlashcardsException { + public void search_byQuestion_withPage() throws FlashCardsException + { when( mockFlashCardService.findByQuestionLike(any(String.class), any(PageRequest.class))).thenReturn( @@ -95,7 +97,8 @@ public void search_byQuestion_withPage() throws FlashcardsException { @SuppressWarnings("unchecked") @Test - public void search_byTags() throws FlashcardsException { + public void search_byTags() throws FlashCardsException + { when(mockFlashCardService.findByTagsIn(any(Set.class))).thenReturn( mockFlashCardDtoList); @@ -107,7 +110,8 @@ public void search_byTags() throws FlashcardsException { @SuppressWarnings("unchecked") @Test - public void search_byTags_withPage() throws FlashcardsException { + public void search_byTags_withPage() throws FlashCardsException + { when(mockFlashCardService.findByTagsIn(any(Set.class), any(PageRequest.class))).thenReturn( mockFlashCardDtoList); @@ -118,7 +122,8 @@ public void search_byTags_withPage() throws FlashcardsException { } @Test - public void put_withCreatedBy() throws FlashcardsException { + public void put_withCreatedBy() throws FlashCardsException + { when(mockFlashCardService.findOne(uuid, null)).thenReturn( mockFlashCardDto); when(mockFlashCardService.save(any(FlashCardDto.class))).thenReturn( @@ -131,9 +136,10 @@ public void put_withCreatedBy() throws FlashcardsException { } @Test(expected = GenericWebServiceException.class) - public void put_withGenericWebServiceException() throws FlashcardsException { + public void put_withGenericWebServiceException() throws FlashCardsException + { when(mockFlashCardService.findOne(uuid, null)).thenThrow( - new FlashcardsException("ERROR")); + new FlashCardsException("ERROR")); resource.put(uuid, mockFlashCardDto); } diff --git a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/TagsResourceUT.java b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/TagsResourceUT.java index 212c8643b..ee56355c8 100644 --- a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/TagsResourceUT.java +++ b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/TagsResourceUT.java @@ -15,7 +15,7 @@ import org.junit.experimental.categories.Category; import org.mockito.Mock; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.TagService; import org.robbins.flashcards.webservices.exceptions.GenericWebServiceException; import org.robbins.tests.BaseMockingTest; @@ -41,7 +41,7 @@ public void before() { } @Test - public void search() throws FlashcardsException + public void search() throws FlashCardsException { when(mockTagService.findByName(any(String.class))).thenReturn(mockTagDto); @@ -52,14 +52,16 @@ public void search() throws FlashcardsException } @Test(expected = GenericWebServiceException.class) - public void search_NotFound() throws FlashcardsException { + public void search_NotFound() throws FlashCardsException + { when(mockTagService.findByName(any(String.class))).thenReturn(null); resource.searchByName(any(String.class)); } @Test - public void put() throws FlashcardsException { + public void put() throws FlashCardsException + { when(mockTagService.findOne(any(Long.class))).thenReturn(mockTagDto); when(mockTagService.save(any(TagDto.class))).thenReturn(mockTagDto); @@ -70,7 +72,8 @@ public void put() throws FlashcardsException { } @Test - public void put_WithCreatedBy() throws FlashcardsException { + public void put_WithCreatedBy() throws FlashCardsException + { when(mockTagDto.getCreatedBy()).thenReturn(0L); when(mockTagService.save(any(TagDto.class))).thenReturn(mockTagDto); diff --git a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/UsersResourceUT.java b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/UsersResourceUT.java index 1857c24be..7c0ae8f56 100644 --- a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/UsersResourceUT.java +++ b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/UsersResourceUT.java @@ -15,7 +15,7 @@ import org.junit.experimental.categories.Category; import org.mockito.Mock; import org.robbins.flashcards.dto.UserDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.UserService; import org.robbins.tests.BaseMockingTest; import org.robbins.tests.UnitTest; @@ -40,7 +40,7 @@ public void before() { } @Test - public void search() throws FlashcardsException + public void search() throws FlashCardsException { when(mockUserService.findUserByOpenid(any(String.class))).thenReturn(mockUserDto); @@ -51,7 +51,8 @@ public void search() throws FlashcardsException } @Test - public void put() throws FlashcardsException { + public void put() throws FlashCardsException + { when(mockUserService.findOne(any(Long.class))).thenReturn(mockUserDto); when(mockUserService.save(any(UserDto.class))).thenReturn(mockUserDto); diff --git a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/base/AbstractGenericResourceUT.java b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/base/AbstractGenericResourceUT.java index f73bb48df..2cb6cdd76 100644 --- a/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/base/AbstractGenericResourceUT.java +++ b/FlashCards_WebServices/src/test/java/org/robbins/flashcards/webservices/base/AbstractGenericResourceUT.java @@ -21,13 +21,12 @@ import org.junit.experimental.categories.Category; import org.mockito.Mock; import org.robbins.flashcards.dto.TagDto; -import org.robbins.flashcards.exceptions.FlashcardsException; +import org.robbins.flashcards.exceptions.FlashCardsException; import org.robbins.flashcards.service.TagService; import org.robbins.flashcards.webservices.TagsResource; import org.robbins.flashcards.webservices.exceptions.GenericWebServiceException; import org.robbins.tests.BaseMockingTest; import org.robbins.tests.UnitTest; -import org.springframework.data.domain.PageRequest; import org.springframework.http.HttpStatus; import org.springframework.test.util.ReflectionTestUtils; @@ -57,7 +56,7 @@ public void before() { } @Test - public void list() throws FlashcardsException + public void list() throws FlashCardsException { when(mockTagService.findAll(any(Optional.class))).thenReturn(tagDtoList); @@ -68,7 +67,8 @@ public void list() throws FlashcardsException } @Test - public void list_NullResult() throws FlashcardsException { + public void list_NullResult() throws FlashCardsException + { when(mockTagService.findAll(any(Optional.class))).thenReturn(null); JResponse> results = resource.list(null, null, null, null, null); @@ -90,7 +90,8 @@ public void count() { @SuppressWarnings("unchecked") @Test - public void findOne() throws FlashcardsException { + public void findOne() throws FlashCardsException + { when(mockTagService.findOne(anyLong(), anySet())).thenReturn(new TagDto(uuid)); TagDto result = resource.findOne(uuid, null); @@ -101,7 +102,8 @@ public void findOne() throws FlashcardsException { @SuppressWarnings("unchecked") @Test - public void findOne_WithFields() throws FlashcardsException { + public void findOne_WithFields() throws FlashCardsException + { String fields = "name,flashcards,userpassword"; when(mockTagService.findOne(anyLong(), anySet())).thenReturn(new TagDto(uuid)); @@ -113,14 +115,16 @@ public void findOne_WithFields() throws FlashcardsException { @SuppressWarnings("unchecked") @Test(expected = GenericWebServiceException.class) - public void findOne_ReturnsNull() throws FlashcardsException { + public void findOne_ReturnsNull() throws FlashCardsException + { when(mockTagService.findOne(anyLong(), anySet())).thenReturn(null); resource.findOne(uuid, null); } @Test - public void post() throws FlashcardsException { + public void post() throws FlashCardsException + { when(mockTagService.save(any(TagDto.class))).thenReturn(new TagDto(uuid)); TagDto result = resource.post(new TagDto()); @@ -138,7 +142,8 @@ public void delete() { } @Test - public void update() throws FlashcardsException { + public void update() throws FlashCardsException + { when(mockTagService.findOne(any(Long.class))).thenReturn(mockTagDto); when(mockTagService.save(any(TagDto.class))).thenReturn(mockTagDto); From c405c2b2b3aa4f52008cb1ca035e13216d1871f7 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 13:55:40 -0700 Subject: [PATCH 02/13] Rename FlashcardFacade.java to FlashCardFacade.java --- .../facade/{FlashcardFacade.java => FlashCardFacade.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_API/src/main/java/org/robbins/flashcards/facade/{FlashcardFacade.java => FlashCardFacade.java} (100%) diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java b/FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashCardFacade.java similarity index 100% rename from FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashcardFacade.java rename to FlashCards_API/src/main/java/org/robbins/flashcards/facade/FlashCardFacade.java From 816acd41521f026224d0035ad908d9f0f5ed7fc4 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 13:56:09 -0700 Subject: [PATCH 03/13] Rename FlashcardClient.java to FlashCardClient.java --- .../client/{FlashcardClient.java => FlashCardClient.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Client/src/main/java/org/robbins/flashcards/client/{FlashcardClient.java => FlashCardClient.java} (100%) diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashCardClient.java similarity index 100% rename from FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardClient.java rename to FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashCardClient.java From 3c89419c5ba77eb3db767e50c8a6434f39d6fc47 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 13:56:29 -0700 Subject: [PATCH 04/13] Rename DefaultFlashcardsAppClient.java to DefaultFlashCardsAppClient.java --- ...ltFlashcardsAppClient.java => DefaultFlashCardsAppClient.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Client/src/main/java/org/robbins/flashcards/client/{DefaultFlashcardsAppClient.java => DefaultFlashCardsAppClient.java} (100%) diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardsAppClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashCardsAppClient.java similarity index 100% rename from FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardsAppClient.java rename to FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashCardsAppClient.java From c0ff368231ee087db3ac42f987f0a31f2cdf0ccd Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:01:20 -0700 Subject: [PATCH 05/13] Rename FlashcardsException.java to FlashCardsException.java --- .../{FlashcardsException.java => FlashCardsException.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/{FlashcardsException.java => FlashCardsException.java} (100%) diff --git a/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashcardsException.java b/FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashCardsException.java similarity index 100% rename from FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashcardsException.java rename to FlashCards_API/src/main/java/org/robbins/flashcards/exceptions/FlashCardsException.java From 3f5a196a245e215f4ffd7af4814e6ba671c97937 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:04:15 -0700 Subject: [PATCH 06/13] Rename DefaultFlashcardClient.java to DefaultFlashCardClient.java --- .../{DefaultFlashcardClient.java => DefaultFlashCardClient.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Client/src/main/java/org/robbins/flashcards/client/{DefaultFlashcardClient.java => DefaultFlashCardClient.java} (100%) diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashCardClient.java similarity index 100% rename from FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashcardClient.java rename to FlashCards_Client/src/main/java/org/robbins/flashcards/client/DefaultFlashCardClient.java From 4d68cc2aeb75a51756474a112eecc9aae72a9312 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:09:29 -0700 Subject: [PATCH 07/13] Rename FlashcardsAppClient.java to FlashCardsAppClient.java --- .../client/{FlashcardsAppClient.java => FlashCardsAppClient.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Client/src/main/java/org/robbins/flashcards/client/{FlashcardsAppClient.java => FlashCardsAppClient.java} (100%) diff --git a/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardsAppClient.java b/FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashCardsAppClient.java similarity index 100% rename from FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashcardsAppClient.java rename to FlashCards_Client/src/main/java/org/robbins/flashcards/client/FlashCardsAppClient.java From 7698ef740ddb0311f87c3e4785d833ca2d7bc4d7 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:13:11 -0700 Subject: [PATCH 08/13] Rename DefaultFlashcardDtoConverter.java to DefaultFlashCardDtoConverter.java --- ...ashcardDtoConverter.java => DefaultFlashCardDtoConverter.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/{DefaultFlashcardDtoConverter.java => DefaultFlashCardDtoConverter.java} (100%) diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashcardDtoConverter.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashCardDtoConverter.java similarity index 100% rename from FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashcardDtoConverter.java rename to FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/conversion/impl/DefaultFlashCardDtoConverter.java From 4509af0e0917872b1cbee409ac97263846d2296a Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:14:13 -0700 Subject: [PATCH 09/13] Rename DefaultFlashcardRepositoryFacade.java to DefaultFlashCardRepositoryFacade.java --- ...epositoryFacade.java => DefaultFlashCardRepositoryFacade.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/{DefaultFlashcardRepositoryFacade.java => DefaultFlashCardRepositoryFacade.java} (100%) diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashCardRepositoryFacade.java similarity index 100% rename from FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardRepositoryFacade.java rename to FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/main/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashCardRepositoryFacade.java From d8b8f0c5e37482dd77aa866e783b462f71649759 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:15:06 -0700 Subject: [PATCH 10/13] Rename FlashcardRepositoryImpl.java to FlashCardRepositoryImpl.java --- ...{FlashcardRepositoryImpl.java => FlashCardRepositoryImpl.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/{FlashcardRepositoryImpl.java => FlashCardRepositoryImpl.java} (100%) diff --git a/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashcardRepositoryImpl.java b/FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashCardRepositoryImpl.java similarity index 100% rename from FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashcardRepositoryImpl.java rename to FlashCards_Repository/FlashCards_Repository_SpringData_JPA/src/main/java/org/robbins/flashcards/springdata/repository/FlashCardRepositoryImpl.java From d758e90ab96cd5e0a22e9536ea306a56b0f9cdd6 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:15:54 -0700 Subject: [PATCH 11/13] Rename TagFlashcardCassandraRepository.java to TagFlashCardCassandraRepository.java --- ...sandraRepository.java => TagFlashCardCassandraRepository.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/{TagFlashcardCassandraRepository.java => TagFlashCardCassandraRepository.java} (100%) diff --git a/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashcardCassandraRepository.java b/FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashCardCassandraRepository.java similarity index 100% rename from FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashcardCassandraRepository.java rename to FlashCards_Repository/FlashCards_Repository_Cassandra/src/main/java/org/robbins/flashcards/cassandra/repository/TagFlashCardCassandraRepository.java From ed3c643c0647900846e74c0b7a0d86ca1c94a4f7 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:16:59 -0700 Subject: [PATCH 12/13] Rename DefaultFlashcardFacadeUT.java to DefaultFlashCardFacadeUT.java --- ...efaultFlashcardFacadeUT.java => DefaultFlashCardFacadeUT.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/{DefaultFlashcardFacadeUT.java => DefaultFlashCardFacadeUT.java} (100%) diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardFacadeUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashCardFacadeUT.java similarity index 100% rename from FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashcardFacadeUT.java rename to FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/facade/impl/DefaultFlashCardFacadeUT.java From 1d279071c60e84b3bebe01e61abc181c59f0c1a1 Mon Sep 17 00:00:00 2001 From: Justin Robbins Date: Sat, 2 Jan 2016 14:17:58 -0700 Subject: [PATCH 13/13] Rename DefaultFlashcardDtoConverterUT.java to DefaultFlashCardDtoConverterUT.java --- ...ardDtoConverterUT.java => DefaultFlashCardDtoConverterUT.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/{DefaultFlashcardDtoConverterUT.java => DefaultFlashCardDtoConverterUT.java} (100%) diff --git a/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashcardDtoConverterUT.java b/FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashCardDtoConverterUT.java similarity index 100% rename from FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashcardDtoConverterUT.java rename to FlashCards_Repository/FlashCards_Repository_Jpa_Commons/src/test/java/org/robbins/flashcards/repository/conversion/DefaultFlashCardDtoConverterUT.java