Author: tchemit Date: 2014-05-13 00:30:20 +0200 (Tue, 13 May 2014) New Revision: 3937 Url: http://forge.chorem.org/projects/pollen/repository/revisions/3937 Log: somebody lies to me\! He told me it did not need edited value in return, but he does in facts... D 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/PollApi.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/PollService.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 22:29:33 UTC (rev 3936) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java 2014-05-12 22:30:20 UTC (rev 3937) @@ -61,10 +61,12 @@ } - public void editChoice(ChoiceService choiceService, String pollId, Choice choice) throws InvalidFormException { + public Choice editChoice(ChoiceService choiceService, String pollId, Choice choice) throws InvalidFormException { - choiceService.editChoice(pollId, choice); + Choice editChoice = choiceService.editChoice(pollId, choice); + return editChoice; + } public void deleteChoice(ChoiceService choiceService, String pollId, String choiceId) { 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 22:29:33 UTC (rev 3936) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java 2014-05-12 22:30:20 UTC (rev 3937) @@ -61,10 +61,12 @@ } - public void editComment(CommentService commentService, String pollId, Comment comment) throws InvalidFormException { + public Comment editComment(CommentService commentService, String pollId, Comment comment) throws InvalidFormException { - commentService.editComment(pollId, comment); + Comment editComment = commentService.editComment(pollId, comment); + return editComment; + } public void deleteComment(CommentService commentService, String pollId, String commentId) { 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 22:29:33 UTC (rev 3936) +++ trunk/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java 2014-05-12 22:30:20 UTC (rev 3937) @@ -106,10 +106,12 @@ } - public void editPoll(PollService pollService, Poll poll) throws InvalidFormException { + public Poll editPoll(PollService pollService, Poll poll) throws InvalidFormException { - pollService.editPoll(poll); + Poll editPoll = pollService.editPoll(poll); + return editPoll; + } public void deletePoll(PollService pollService, String pollId) { 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 22:29:33 UTC (rev 3936) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java 2014-05-12 22:30:20 UTC (rev 3937) @@ -117,7 +117,7 @@ } - public void editChoice(String pollId, Choice choice) throws InvalidFormException { + public Choice editChoice(String pollId, Choice choice) throws InvalidFormException { checkNotNull(choice); checkIsPersisted(choice); @@ -134,6 +134,8 @@ getNotificationService().onChoiceEdited(poll, result); + return copy(result); + } public void deleteChoice(String pollId, String choiceId) { 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 22:29:33 UTC (rev 3936) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java 2014-05-12 22:30:20 UTC (rev 3937) @@ -83,7 +83,7 @@ } - public void editComment(String pollId, Comment comment) throws InvalidFormException { + public Comment editComment(String pollId, Comment comment) throws InvalidFormException { checkNotNull(pollId); checkNotNull(comment); @@ -99,6 +99,8 @@ getNotificationService().onCommentEdited(poll, result); + return copy(result); + } public void deleteComment(String pollId, String commentId) { 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 22:29:33 UTC (rev 3936) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java 2014-05-12 22:30:20 UTC (rev 3937) @@ -156,7 +156,7 @@ } - public void editPoll(Poll poll) throws InvalidFormException { + public Poll editPoll(Poll poll) throws InvalidFormException { checkNotNull(poll); checkIsPersisted(poll); @@ -170,6 +170,8 @@ getNotificationService().onPollEdited(savedPoll); + return copy(savedPoll); + } public void deletePoll(String pollId) {