Author: tchemit Date: 2014-05-13 00:03:48 +0200 (Tue, 13 May 2014) New Revision: 3933 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3933 Log: do not send back an edited object + clean some api Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.0 */ -public class ChoiceApi extends WebMotionController { +public class ChoiceApi extends WebMotionController { public List<Choice> getChoices(ChoiceService choiceService, String pollId) { @@ -61,10 +61,9 @@ } - public Choice editChoice(ChoiceService choiceService, String pollId, Choice choice) throws InvalidFormException { + public void editChoice(ChoiceService choiceService, String pollId, Choice choice) throws InvalidFormException { - Choice editedChoice = choiceService.editChoice(pollId, choice); - return editedChoice; + choiceService.editChoice(pollId, choice); } @@ -73,4 +72,5 @@ choiceService.deleteChoice(pollId, choiceId); } + } \ No newline at end of file Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -61,10 +61,9 @@ } - public Comment editComment(CommentService commentService, String pollId, Comment comment) throws InvalidFormException { + public void editComment(CommentService commentService, String pollId, Comment comment) throws InvalidFormException { - Comment editedComment = commentService.editComment(pollId, comment); - return editedComment; + commentService.editComment(pollId, comment); } @@ -73,4 +72,5 @@ commentService.deleteComment(pollId, commentId); } + } Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -65,10 +65,9 @@ } - public FavoriteList editFavoriteList(FavoriteListService favoriteListService, FavoriteList favoriteList) throws InvalidFormException { + public void editFavoriteList(FavoriteListService favoriteListService, FavoriteList favoriteList) throws InvalidFormException { - FavoriteList editedFavoriteList = favoriteListService.editFavoriteList(favoriteList); - return editedFavoriteList; + favoriteListService.editFavoriteList(favoriteList); } @@ -114,10 +113,9 @@ } - public FavoriteListMember editMember(FavoriteListService favoriteListService, String favoriteListId, FavoriteListMember member) throws InvalidFormException { + public void editMember(FavoriteListService favoriteListService, String favoriteListId, FavoriteListMember member) throws InvalidFormException { - FavoriteListMember editedMember = favoriteListService.editFavoriteListMember(favoriteListId, member); - return editedMember; + favoriteListService.editFavoriteListMember(favoriteListId, member); } Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -106,10 +106,9 @@ } - public Poll editPoll(PollService pollService, Poll poll) throws InvalidFormException { + public void editPoll(PollService pollService, Poll poll) throws InvalidFormException { - Poll editedPoll = pollService.editPoll(poll); - return editedPoll; + pollService.editPoll(poll); } Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -65,11 +65,10 @@ } - public PollenUser editUser(PollenUserService pollenUserService, + public void editUser(PollenUserService pollenUserService, PollenUser user) throws InvalidFormException { - PollenUser editedUser = pollenUserService.editUser(user); - return editedUser; + pollenUserService.editUser(user); } Modified: trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java =================================================================== --- trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -55,25 +55,24 @@ } - public PollenPrincipalRef<VoterList> getVoterList(VoterListService voterListService, String pollId, String voterListId) { + public VoterList getVoterList(VoterListService voterListService, String pollId, String voterListId) { VoterList voterList = voterListService.getVoterList(pollId, voterListId); - PollenPrincipalRef<VoterList> principalRef = PollenPrincipalRef.newRef(voterList); - return principalRef; + return voterList; } - public VoterList createVoterList(VoterListService voterListService, String pollId, VoterList voterList) throws InvalidFormException { + public PollenPrincipalRef<VoterList> createVoterList(VoterListService voterListService, String pollId, VoterList voterList) throws InvalidFormException { VoterList createdVoterList = voterListService.addVoterList(pollId, voterList); - return createdVoterList; + PollenPrincipalRef<VoterList> principalRef = PollenPrincipalRef.newRef(createdVoterList); + return principalRef; } - public VoterList editVoterList(VoterListService voterListService, String pollId, VoterList voterList) throws InvalidFormException { + public void editVoterList(VoterListService voterListService, String pollId, VoterList voterList) throws InvalidFormException { - VoterList editedVoterList = voterListService.editVoterList(pollId, voterList); - return editedVoterList; + voterListService.editVoterList(pollId, voterList); } @@ -105,10 +104,9 @@ } - public VoterListMember editMember(VoterListService voterListService, String pollId, String voterListId, VoterListMember member) throws InvalidFormException { + public void editMember(VoterListService voterListService, String pollId, String voterListId, VoterListMember member) throws InvalidFormException { - VoterListMember editedMember = voterListService.editVoterListMember(pollId, voterListId, member); - return editedMember; + voterListService.editVoterListMember(pollId, voterListId, member); } @@ -117,4 +115,5 @@ voterListService.deleteVoterListMember(pollId, voterListId, memberId); } + } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -47,7 +47,7 @@ checkNotNull(pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<Choice> choices = getChoiceDao().findAll(poll); return copyAsList(choices); @@ -60,7 +60,7 @@ checkNotNull(choiceId); checkPermission(PermissionVerb.readChoice, choiceId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Choice result = getChoice(poll, choiceId); return copy(result); @@ -99,7 +99,7 @@ checkIsNotPersisted(choice); checkPermission(PermissionVerb.editPoll, pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<Choice> existingChoices = getChoiceDao().findAll(poll); ErrorMap errorMap = checkChoice(existingChoices, choice); @@ -117,13 +117,13 @@ } - public Choice editChoice(String pollId, Choice choice) throws InvalidFormException { + public void editChoice(String pollId, Choice choice) throws InvalidFormException { checkNotNull(choice); checkIsPersisted(choice); checkPermission(PermissionVerb.editChoice, choice.getTopiaId()); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<Choice> existingChoices = getChoiceDao().findAll(poll); ErrorMap errorMap = checkChoice(existingChoices, choice); @@ -134,8 +134,6 @@ getNotificationService().onChoiceEdited(poll, result); - return copy(result); - } public void deleteChoice(String pollId, String choiceId) { @@ -144,7 +142,7 @@ checkNotNull(choiceId); checkPermission(PermissionVerb.deleteChoice, choiceId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Choice choice = getChoice(poll, choiceId); getChoiceDao().delete(choice); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -44,7 +44,7 @@ checkNotNull(pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<Comment> comments = getCommentDao().forPollEquals(poll).findAll(); return copyAsList(comments); @@ -56,7 +56,7 @@ checkNotNull(commentId); checkPermission(PermissionVerb.readComment, commentId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Comment result = getComment(poll, commentId); return copy(result); @@ -73,7 +73,7 @@ ErrorMap errorMap = checkComment(comment); errorMap.failIfNotEmpty(); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Comment result = saveComment(poll, comment); commit(); @@ -83,7 +83,7 @@ } - public Comment editComment(String pollId, Comment comment) throws InvalidFormException { + public void editComment(String pollId, Comment comment) throws InvalidFormException { checkNotNull(pollId); checkNotNull(comment); @@ -93,14 +93,12 @@ ErrorMap errorMap = checkComment(comment); errorMap.failIfNotEmpty(); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Comment result = saveComment(poll, comment); commit(); getNotificationService().onCommentEdited(poll, result); - return copy(result); - } public void deleteComment(String pollId, String commentId) { @@ -109,7 +107,7 @@ checkNotNull(commentId); checkPermission(PermissionVerb.deleteComment, commentId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Comment comment = getComment(poll, commentId); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -71,7 +71,7 @@ PollenUser user = getConnectedUser(); List<FavoriteList> result = user.getFavoriteList(); - return ImmutableList.copyOf(result); + return copyAsList(result); } @@ -83,7 +83,7 @@ PollenUser user = getConnectedUser(); FavoriteList result = getFavoriteList(user, favoriteListId); - return result; + return copy(result); } @@ -103,12 +103,13 @@ FavoriteList result = saveFavoriteList(user, favoriteList); commit(); - getNotificationService().onFavoriteListAdded(user, favoriteList); + getNotificationService().onFavoriteListAdded(user, result); - return result; + return copy(result); + } - public FavoriteList editFavoriteList(FavoriteList favoriteList) throws InvalidFormException { + public void editFavoriteList(FavoriteList favoriteList) throws InvalidFormException { checkIsConnected(); checkNotNull(favoriteList); @@ -124,9 +125,8 @@ FavoriteList result = saveFavoriteList(user, favoriteList); commit(); - getNotificationService().onFavoriteListEdited(user, favoriteList); + getNotificationService().onFavoriteListEdited(user, result); - return result; } public void deleteFavoriteList(String favoriteListId) { @@ -155,7 +155,7 @@ FavoriteList favoriteList = getFavoriteList(user, favoriteListId); Set<FavoriteListMember> member = favoriteList.getMember(); - return ImmutableSet.copyOf(member); + return copyAsSet(member); } @@ -170,7 +170,7 @@ FavoriteList favoriteList = getFavoriteList(user, favoriteListId); FavoriteListMember result = getFavoriteListMember(favoriteList, memberId); - return result; + return copy(result); } @@ -194,11 +194,11 @@ FavoriteListMember result = saveFavoriteListMember(favoriteList, member); commit(); - return result; + return copy(result); } - public FavoriteListMember editFavoriteListMember(String favoriteListId, + public void editFavoriteListMember(String favoriteListId, FavoriteListMember member) throws InvalidFormException { checkIsConnected(); @@ -218,8 +218,6 @@ FavoriteListMember result = saveFavoriteListMember(favoriteList, member); commit(); - return result; - } public void deleteFavoriteListMember(String favoriteListId, Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -95,7 +95,7 @@ checkNotNull(pollId); checkPermission(PermissionVerb.readPoll, pollId); - Poll result = getPollDao().findByTopiaId(pollId); + Poll result = getPoll0(pollId); if (isNotPermitted(PermissionVerb.editPoll, pollId)) { @@ -150,13 +150,13 @@ Poll savedPoll = savePoll(poll, choices, voterLists); commit(); - getNotificationService().onPollCreated(poll); + getNotificationService().onPollCreated(savedPoll); return copy(savedPoll); } - public Poll editPoll(Poll poll) throws InvalidFormException { + public void editPoll(Poll poll) throws InvalidFormException { checkNotNull(poll); checkIsPersisted(poll); @@ -168,10 +168,8 @@ Poll savedPoll = savePoll(poll, null, null); commit(); - getNotificationService().onPollEdited(poll); + getNotificationService().onPollEdited(savedPoll); - return copy(savedPoll); - } public void deletePoll(String pollId) { @@ -179,7 +177,7 @@ checkNotNull(pollId); checkPermission(PermissionVerb.deletePoll, pollId); - Poll poll = getPollDao().findByTopiaId(pollId); + Poll poll = getPoll0(pollId); getPollDao().delete(poll); commit(); @@ -193,7 +191,7 @@ checkNotNull(pollId); checkPermission(PermissionVerb.clonePoll, pollId); - Poll poll = getPoll(pollId); + Poll poll = getPoll0(pollId); //TODO commit(); @@ -209,7 +207,7 @@ checkNotNull(pollId); checkPermission(PermissionVerb.closePoll, pollId); - Poll poll = getPoll(pollId); + Poll poll = getPoll0(pollId); //TODO commit(); @@ -223,7 +221,7 @@ checkNotNull(pollId); checkPermission(PermissionVerb.exportPoll, pollId); - Poll poll = getPoll(pollId); + Poll poll = getPoll0(pollId); //TODO return null; @@ -234,19 +232,15 @@ boolean pollExists = poll.isPersisted(); - List<Choice> existingChoices; - Poll toSave; if (pollExists) { - toSave = getPoll(poll.getTopiaId()); - existingChoices = getChoiceDao().findAll(poll); + toSave = getPoll0(poll.getTopiaId()); } else { toSave = getPollDao().create(); - existingChoices = new ArrayList<>(); PollenPrincipal creatorToPersist = getSecurityService().generatePollenPrincipal(); @@ -298,6 +292,17 @@ if (CollectionUtils.isNotEmpty(choices)) { + List<Choice> existingChoices; + + if (pollExists) { + + existingChoices = getChoiceDao().findAll(poll); + + } else { + + existingChoices = new ArrayList<>(); + + } ChoiceService choiceService = getChoiceService(); for (Choice choice : choices) { @@ -326,6 +331,12 @@ } + protected Poll getPoll0(String pollId) { + + return getPollDao().findByTopiaId(pollId); + + } + protected ErrorMap checkPoll(Poll poll) { ErrorMap errors = new ErrorMap(); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -56,11 +56,15 @@ checkNotNull(userId); - PollenUser result = getPollenUserDao().findByTopiaId(userId); + PollenUser result = getUser0(userId); return copy(result); } + protected PollenUser getUser0(String userId) { + return getPollenUserDao().findByTopiaId(userId); + } + public PollenUser createUser(PollenUser user, boolean generatePassword) throws InvalidFormException { checkNotNull(user); @@ -78,7 +82,7 @@ } - public PollenUser editUser(PollenUser user) throws InvalidFormException { + public void editUser(PollenUser user) throws InvalidFormException { checkNotNull(user); checkIsPersisted(user); @@ -89,17 +93,15 @@ PollenUser result = savePollenUser(user, false); commit(); - getNotificationService().onUserEdited(user); + getNotificationService().onUserEdited(result); - return copy(result); - } public void deleteUser(String userId) { checkNotNull(userId); - PollenUser user = getPollenUserDao().findByTopiaId(userId); + PollenUser user = getUser0(userId); getPollenUserDao().delete(user); commit(); @@ -116,7 +118,7 @@ checkNotNull(oldPassword); checkNotNull(newPassword); - PollenUser user = getPollenUserDao().findByTopiaId(userId); + PollenUser user = getUser0(userId); // check old password getSecurityService().checkUserPassword(user, oldPassword); @@ -136,7 +138,7 @@ checkNotNull(userId); checkNotNull(token); - PollenUser user = getPollenUserDao().findByTopiaId(userId); + PollenUser user = getUser0(userId); getSecurityService().checkUserEmailValidation(user, token); @@ -171,7 +173,7 @@ ErrorMap errors = new ErrorMap(); boolean userExists = user.isPersisted(); - PollenUser persisted = userExists ? getUser(user.getTopiaId()) : null; + PollenUser persisted = userExists ? getUser0(user.getTopiaId()) : null; PollenUserTopiaDao dao = getPollenUserDao(); String userLogin = user.getLogin(); @@ -243,7 +245,7 @@ if (userExists) { - toSave = getPollenUserDao().findByTopiaId(user.getTopiaId()); + toSave = getUser0(user.getTopiaId()); boolean emailChanged = !Objects.equals(toSave.getEmail(), cleanMail); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -38,7 +38,7 @@ //GET /poll/{pollId}/results public PollResult getResult(String pollId) { Preconditions.checkNotNull(pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); //TODO return null; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -44,7 +44,7 @@ checkNotNull(pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<Vote> votes = getVoteDao().forPollEquals(poll).findAll(); return ImmutableList.copyOf(votes); @@ -55,7 +55,7 @@ checkNotNull(voteId); checkPermission(PermissionVerb.readVote, voteId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Vote result = getVote(poll, voteId); return result; @@ -70,7 +70,7 @@ checkIsNotPersisted(vote); checkPermission(PermissionVerb.addVote, pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); ErrorMap errorMap = checkVote(poll, vote); errorMap.failIfNotEmpty(); @@ -90,7 +90,7 @@ checkIsPersisted(vote); checkPermission(PermissionVerb.editVote, vote.getTopiaId()); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); ErrorMap errorMap = checkVote(poll, vote); errorMap.failIfNotEmpty(); @@ -110,7 +110,7 @@ checkNotNull(voteId); checkPermission(PermissionVerb.deleteVote, voteId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); Vote vote = getVote(poll, voteId); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java 2014-05-12 16:50:51 UTC (rev 3932) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java 2014-05-12 22:03:48 UTC (rev 3933) @@ -23,7 +23,6 @@ * #L% */ -import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.FavoriteList; @@ -53,7 +52,7 @@ checkNotNull(pollId); checkNotNull(favoriteListId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); FavoriteList favoriteList = getFavoriteListService().getFavoriteList(favoriteListId); @@ -77,7 +76,7 @@ commit(); - return result; + return copy(result); } @@ -85,9 +84,9 @@ checkNotNull(pollId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<VoterList> voterLists = getVoterListDao().forPollEquals(poll).findAll(); - return ImmutableList.copyOf(voterLists); + return copyAsList(voterLists); } @@ -96,10 +95,10 @@ checkNotNull(pollId); checkNotNull(voterListId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); VoterList result = getVoterList(poll, voterListId); - return result; + return copy(result); } @@ -109,7 +108,7 @@ checkNotNull(voterList); checkIsNotPersisted(voterList); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<VoterList> existingVoterLists = getVoterListDao().forPollEquals(poll).findAll(); @@ -120,17 +119,19 @@ VoterList result = saveVoterList(poll, voterList); commit(); - return result; + //TODO Notify + return copy(result); + } - public VoterList editVoterList(String pollId, VoterList voterList) throws InvalidFormException { + public void editVoterList(String pollId, VoterList voterList) throws InvalidFormException { checkNotNull(pollId); checkNotNull(voterList); checkIsPersisted(voterList); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); List<VoterList> existingVoterLists = getVoterListDao().forPollEquals(poll).findAll(); @@ -140,7 +141,7 @@ VoterList result = saveVoterList(poll, voterList); commit(); - return result; + //TODO Notify } @@ -149,7 +150,7 @@ checkNotNull(pollId); checkNotNull(voterListId); - Poll poll = getPollService().getPoll(pollId); + Poll poll = getPollService().getPoll0(pollId); VoterList voterList = getVoterList(poll, voterListId); getVoterListDao().delete(voterList); @@ -165,7 +166,7 @@ VoterList voterList = getVoterList(pollId, voterListId); Set<VoterListMember> result = voterList.getMember(); - return result; + return copyAsSet(result); } @@ -179,7 +180,7 @@ VoterListMember result = getVoterListMember(voterList, memberId); - return result; + return copy(result); } @@ -200,12 +201,12 @@ VoterListMember result = saveVoterListMember(voterList, member); commit(); - return result; + return copy(result); } - public VoterListMember editVoterListMember(String pollId, String voterListId, VoterListMember member) throws InvalidFormException { + public void editVoterListMember(String pollId, String voterListId, VoterListMember member) throws InvalidFormException { checkNotNull(pollId); checkNotNull(voterListId); @@ -222,8 +223,6 @@ VoterListMember result = saveVoterListMember(voterList, member); commit(); - return result; - } public void deleteVoterListMember(String pollId, String voterListId, String memberId) {