[Pollen-commits] 02/03: [iso] use inline variables

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 0ca419920ef287a9e1ee1cb7b42d5791a95b795d Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 11:02:08 2017 +0100 [iso] use inline variables --- .../pollen/persistence/entity/ChoiceTopiaDao.java | 3 +- .../pollen/persistence/entity/CommentTopiaDao.java | 4 +- .../pollen/persistence/entity/PollTopiaDao.java | 3 +- .../entity/PollenPrincipalTopiaDao.java | 3 +- .../persistence/entity/PollenUserTopiaDao.java | 3 +- .../persistence/entity/SessionTokenTopiaDao.java | 3 +- .../pollen/persistence/entity/VoteTopiaDao.java | 3 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 17 ++--- .../rest/api/PollenRestApiApplicationContext.java | 6 +- .../rest/api/PollenRestApiRequestContext.java | 3 +- .../rest/api/PollenRestApiRequestFilter.java | 7 +- .../rest/api/PollenTopiaTransactionFilter.java | 4 +- .../pollen/rest/api/converter/JsonConverter.java | 7 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 3 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 12 ++-- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 12 ++-- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 12 ++-- .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 24 +++---- .../org/chorem/pollen/rest/api/v1/PollApi.java | 30 +++----- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 12 ++-- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 15 ++-- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 6 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 30 +++----- .../pollen/rest/api/AbstractPollenRestApiTest.java | 6 +- .../services/DefaultPollenServiceContext.java | 12 ++-- .../pollen/services/TopiaEntityCopyVisitor.java | 7 +- .../services/bean/PaginationParameterBean.java | 3 +- .../chorem/pollen/services/bean/PollenBeans.java | 8 +-- .../pollen/services/bean/PollenEntityId.java | 3 +- .../pollen/services/bean/PollenEntityRef.java | 24 +++---- .../services/config/PollenServiceConfig.java | 43 ++++-------- .../pollen/services/service/ChoiceService.java | 9 +-- .../pollen/services/service/CommentService.java | 19 ++---- .../services/service/FavoriteListService.java | 36 ++++------ .../pollen/services/service/PollService.java | 27 +++----- .../services/service/PollenResourceService.java | 3 +- .../services/service/PollenServiceSupport.java | 79 ++++++++-------------- .../pollen/services/service/PollenUserService.java | 19 ++---- .../services/service/VoteCountingService.java | 6 +- .../pollen/services/service/VoteService.java | 15 ++-- .../pollen/services/service/VoterListService.java | 36 ++++------ .../pollen/services/service/mail/PollenMail.java | 3 +- .../service/security/PollenSecurityRealm.java | 4 +- .../services/service/security/SecurityService.java | 6 +- .../test/FakePollenApplicationContext.java | 3 +- .../pollen/votecounting/AbstractVoteCounting.java | 10 +-- .../votecounting/AbstractVoteCountingStrategy.java | 6 +- .../model/GroupVoteCountingResult.java | 3 +- .../votecounting/BordaVoteCountingStrategy.java | 3 +- .../CondorcetVoteCountingStrategy.java | 3 +- .../votecounting/CoombsVoteCountingStrategy.java | 3 +- .../InstantRunoffVoteCountingStrategy.java | 3 +- .../votecounting/NormalVoteCountingStrategy.java | 3 +- .../votecounting/NumberVoteCountingStrategy.java | 3 +- .../PercentageVoteCountingStrategy.java | 3 +- 55 files changed, 206 insertions(+), 427 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java index 94bfb02..41f6af7 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/ChoiceTopiaDao.java @@ -27,10 +27,9 @@ public class ChoiceTopiaDao extends AbstractChoiceTopiaDao<Choice> { public List<Choice> findAll(Poll poll) { - List<Choice> choices = forPollEquals(poll). + return forPollEquals(poll). setOrderByArguments(Choice.PROPERTY_CHOICE_ORDER). findAll(); - return choices; } diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java index db1b647..0e89028 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/CommentTopiaDao.java @@ -28,10 +28,8 @@ public class CommentTopiaDao extends AbstractCommentTopiaDao<Comment> { public PaginationResult<Comment> find(Poll poll, PaginationParameter paginationParameter) { - PaginationResult<Comment> comments = forPollEquals(poll) + return forPollEquals(poll) .findPage(paginationParameter); - return comments; - } } diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java index 4e275fd..93d1c6d 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java @@ -37,8 +37,7 @@ import java.util.Set; public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { public PaginationResult<Poll> findAllCreated(PollenUser user, PaginationParameter paginationParameter) { - PaginationResult<Poll> polls = forEquals(Poll.PROPERTY_CREATOR + "." + PollenPrincipal.PROPERTY_POLLEN_USER, user).findPage(paginationParameter); - return polls; + return forEquals(Poll.PROPERTY_CREATOR + "." + PollenPrincipal.PROPERTY_POLLEN_USER, user).findPage(paginationParameter); } public PaginationResult<Poll> findAllInvited(PollenUser user, PaginationParameter paginationParameter) { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenPrincipalTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenPrincipalTopiaDao.java index 5d606b3..271245e 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenPrincipalTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenPrincipalTopiaDao.java @@ -25,8 +25,7 @@ public class PollenPrincipalTopiaDao extends AbstractPollenPrincipalTopiaDao<Pol public PollenPrincipal findByPermissionToken(String permissionToken) { - PollenPrincipal principal = forEquals(PollenPrincipal.PROPERTY_PERMISSION + "." + PollenToken.PROPERTY_TOKEN, permissionToken).findUnique(); - return principal; + return forEquals(PollenPrincipal.PROPERTY_PERMISSION + "." + PollenToken.PROPERTY_TOKEN, permissionToken).findUnique(); } } diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java index 90b5482..b6f841f 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollenUserTopiaDao.java @@ -30,8 +30,7 @@ import java.util.List; public class PollenUserTopiaDao extends AbstractPollenUserTopiaDao<PollenUser> { public boolean emailExists(String email) { - boolean exists = forEmailEquals(email).exists(); - return exists; + return forEmailEquals(email).exists(); } @Override diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java index 0b9d94a..f1e97c1 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/SessionTokenTopiaDao.java @@ -32,8 +32,7 @@ public class SessionTokenTopiaDao extends AbstractSessionTokenTopiaDao<SessionTo public SessionToken findUniqueOrNullByToken(String token) { - SessionToken sessionToken = forEquals(SessionToken.PROPERTY_POLLEN_TOKEN + "." + PollenToken.PROPERTY_TOKEN, token).findUniqueOrNull(); - return sessionToken; + return forEquals(SessionToken.PROPERTY_POLLEN_TOKEN + "." + PollenToken.PROPERTY_TOKEN, token).findUniqueOrNull(); } diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java index 9c49d2f..263ca19 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/VoteTopiaDao.java @@ -27,10 +27,9 @@ public class VoteTopiaDao extends AbstractVoteTopiaDao<Vote> { public List<Vote> findAll(Poll poll) { - List<Vote> votes = forPollEquals(poll) + return forPollEquals(poll) .setOrderByArguments(Vote.PROPERTY_TOPIA_CREATE_DATE) .findAll(); - return votes; } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java index 259bddc..aecb0d3 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/JsonHelper.java @@ -163,9 +163,7 @@ public class JsonHelper { map.put(key, errors.get(key)); } - JsonElement result = context.serialize(map); - - return result; + return context.serialize(map); } @@ -182,9 +180,7 @@ public class JsonHelper { Map<String, Object> map = new HashMap<>(); map.put("error", error); - JsonElement result = context.serialize(map); - - return result; + return context.serialize(map); } @@ -254,22 +250,19 @@ public class JsonHelper { public String toJson(Object model) { - String json = gson.toJson(model); - return json; + return gson.toJson(model); } public <O> O fromJson(String json, Class<O> type) { - O o = gson.fromJson(json, type); - return o; + return gson.fromJson(json, type); } public <O> O fromJson(String json, Type type) { - O o = gson.fromJson(json, type); - return o; + return gson.fromJson(json, type); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java index 8f79dec..483a2a7 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiApplicationContext.java @@ -85,9 +85,8 @@ public class PollenRestApiApplicationContext implements PollenApplicationContext } public static PollenRestApiApplicationContext getApplicationContext(ServletContext servletContext) { - PollenRestApiApplicationContext result = (PollenRestApiApplicationContext) + return (PollenRestApiApplicationContext) servletContext.getAttribute(APPLICATION_CONTEXT_PARAMETER); - return result; } public static void setApplicationContext(PollenRestApiApplicationContext applicationContext) { @@ -144,8 +143,7 @@ public class PollenRestApiApplicationContext implements PollenApplicationContext @Override public PollenTopiaPersistenceContext newPersistenceContext() { - PollenTopiaPersistenceContext persistenceContext = topiaApplicationContext.newPersistenceContext(); - return persistenceContext; + return topiaApplicationContext.newPersistenceContext(); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java index f66f957..824c011 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestContext.java @@ -38,9 +38,8 @@ public class PollenRestApiRequestContext { public static PollenRestApiRequestContext getRequestContext(HttpContext httpContext) { - PollenRestApiRequestContext result = (PollenRestApiRequestContext) + return (PollenRestApiRequestContext) httpContext.getRequest().getAttribute(REQUEST_POLLEN_REQUEST_CONTEXT); - return result; } public static void setRequestContext(HttpContext httpContext, diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java index 91c45e2..11855ce 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenRestApiRequestFilter.java @@ -121,10 +121,8 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { PollenPrincipal mainPrincipal = securityService.getPollenPrincipalByPermissionToken(credentialParam); // --- create security context --- // - PollenSecurityContext securityContext = - applicationContext.newSecurityContext(sessionToken, mainPrincipal); - return securityContext; + return applicationContext.newSecurityContext(sessionToken, mainPrincipal); } @@ -159,8 +157,7 @@ public class PollenRestApiRequestFilter extends WebMotionFilter { } - Locale locale = new Locale(language); - return locale; + return new Locale(language); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenTopiaTransactionFilter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenTopiaTransactionFilter.java index 2a60f80..a830cc7 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenTopiaTransactionFilter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/PollenTopiaTransactionFilter.java @@ -46,9 +46,7 @@ public class PollenTopiaTransactionFilter extends TypedTopiaTransactionFilter<Po PollenRestApiApplicationContext applicationContext = PollenRestApiApplicationContext.getApplicationContext(request.getServletContext()); - PollenTopiaPersistenceContext persistenceContext = applicationContext.newPersistenceContext(); - - return persistenceContext; + return applicationContext.newPersistenceContext(); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java index 4452a36..f27cf13 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/converter/JsonConverter.java @@ -64,8 +64,7 @@ public class JsonConverter<O> extends AbstractConverter { @Override protected String convertToString(Object value) throws Throwable { - String result = jsonHelper.toJson(value); - return result; + return jsonHelper.toJson(value); } @@ -84,9 +83,7 @@ public class JsonConverter<O> extends AbstractConverter { } - T result = (T) jsonHelper.fromJson(stringValue, implementationClass); - - return result; + return (T) jsonHelper.fromJson(stringValue, implementationClass); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java index 251a8e9..a2909e7 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/AuthApi.java @@ -37,8 +37,7 @@ public class AuthApi extends WebMotionController { public PollenEntityRef<PollenUser> login(SecurityService securityService, String login, String password, Boolean rememberMe) throws PollenAuthenticationException { - PollenEntityRef<PollenUser> principalRef = securityService.login(login, password, rememberMe); - return principalRef; + return securityService.login(login, password, rememberMe); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java index 1c7eb56..6d6a6a7 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ChoiceApi.java @@ -42,29 +42,25 @@ public class ChoiceApi extends WebMotionController { public List<ChoiceBean> getChoices(ChoiceService choiceService, PollenEntityId<Poll> pollId) { - List<ChoiceBean> choices = choiceService.getChoices(pollId.getEntityId()); - return choices; + return choiceService.getChoices(pollId.getEntityId()); } public ChoiceBean getChoice(ChoiceService choiceService, PollenEntityId<Poll> pollId, PollenEntityId<Choice> choiceId) { - ChoiceBean choice = choiceService.getChoice(pollId.getEntityId(), choiceId.getEntityId()); - return choice; + return choiceService.getChoice(pollId.getEntityId(), choiceId.getEntityId()); } public PollenEntityRef<Choice> addChoice(ChoiceService choiceService, PollenEntityId<Poll> pollId, ChoiceBean choice) throws InvalidFormException { - PollenEntityRef<Choice> principalRef = choiceService.addChoice(pollId.getEntityId(), choice); - return principalRef; + return choiceService.addChoice(pollId.getEntityId(), choice); } public ChoiceBean editChoice(ChoiceService choiceService, PollenEntityId<Poll> pollId, ChoiceBean choice) throws InvalidFormException { - ChoiceBean editChoice = choiceService.editChoice(pollId.getEntityId(), choice); - return editChoice; + return choiceService.editChoice(pollId.getEntityId(), choice); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java index 8c8280e..2f0a665 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/CommentApi.java @@ -43,29 +43,25 @@ public class CommentApi extends WebMotionController { public PaginationResultBean<CommentBean> getComments(CommentService commentService, PollenEntityId<Poll> pollId, PaginationParameterBean paginationParameter) { - PaginationResultBean<CommentBean> comments = commentService.getComments(pollId.getEntityId(), paginationParameter); - return comments; + return commentService.getComments(pollId.getEntityId(), paginationParameter); } public CommentBean getComment(CommentService commentService, PollenEntityId<Poll> pollId, PollenEntityId<Comment> commentId) { - CommentBean comment = commentService.getComment(pollId.getEntityId(), commentId.getReducedId()); - return comment; + return commentService.getComment(pollId.getEntityId(), commentId.getReducedId()); } public PollenEntityRef<Comment> addComment(CommentService commentService, PollenEntityId<Poll> pollId, CommentBean comment) throws InvalidFormException { - PollenEntityRef<Comment> principalRef = commentService.addComment(pollId.getEntityId(), comment); - return principalRef; + return commentService.addComment(pollId.getEntityId(), comment); } public CommentBean editComment(CommentService commentService, PollenEntityId<Poll> pollId, CommentBean comment) throws InvalidFormException { - CommentBean editComment = commentService.editComment(pollId.getEntityId(), comment); - return editComment; + return commentService.editComment(pollId.getEntityId(), comment); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java index 6eafb1f..0c8c3af 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/ErrorAction.java @@ -60,8 +60,7 @@ public class ErrorAction extends WebMotionController { PollenRestApiUtil.prepareResponse(context); - Render render = renderError(HttpServletResponse.SC_NOT_FOUND, e.getMessage()); - return render; + return renderError(HttpServletResponse.SC_NOT_FOUND, e.getMessage()); } @@ -69,8 +68,7 @@ public class ErrorAction extends WebMotionController { PollenRestApiUtil.prepareResponse(context); - Render render = renderError(HttpServletResponse.SC_UNAUTHORIZED, e.getMessage()); - return render; + return renderError(HttpServletResponse.SC_UNAUTHORIZED, e.getMessage()); } @@ -78,8 +76,7 @@ public class ErrorAction extends WebMotionController { PollenRestApiUtil.prepareResponse(context); - Render render = renderError(HttpServletResponse.SC_FORBIDDEN, e.getMessage()); - return render; + return renderError(HttpServletResponse.SC_FORBIDDEN, e.getMessage()); } @@ -87,8 +84,7 @@ public class ErrorAction extends WebMotionController { PollenRestApiUtil.prepareResponse(context); - Render render = renderError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage()); - return render; + return renderError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage()); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java index 3ebd423..2732882 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/FavoriteListApi.java @@ -47,29 +47,25 @@ public class FavoriteListApi extends WebMotionController { public PaginationResultBean<FavoriteListBean> getFavoriteLists(FavoriteListService favoriteListService, PaginationParameterBean paginationParameter) { - PaginationResultBean<FavoriteListBean> favoriteLists = favoriteListService.getFavoriteLists(paginationParameter); - return favoriteLists; + return favoriteListService.getFavoriteLists(paginationParameter); } public FavoriteListBean getFavoriteList(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId) { - FavoriteListBean favoriteList = favoriteListService.getFavoriteList(favoriteListId.getEntityId()); - return favoriteList; + return favoriteListService.getFavoriteList(favoriteListId.getEntityId()); } public PollenEntityRef<FavoriteList> createFavoriteList(FavoriteListService favoriteListService, FavoriteListBean favoriteList) throws InvalidFormException { - PollenEntityRef<FavoriteList> principalRef = favoriteListService.createFavoriteList(favoriteList); - return principalRef; + return favoriteListService.createFavoriteList(favoriteList); } public FavoriteListBean editFavoriteList(FavoriteListService favoriteListService, FavoriteListBean favoriteList) throws InvalidFormException { - FavoriteListBean editedFavoriteList = favoriteListService.editFavoriteList(favoriteList); - return editedFavoriteList; + return favoriteListService.editFavoriteList(favoriteList); } @@ -93,29 +89,25 @@ public class FavoriteListApi extends WebMotionController { public PaginationResultBean<FavoriteListMemberBean> getMembers(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, PaginationParameterBean paginationParameter) { - PaginationResultBean<FavoriteListMemberBean> members = favoriteListService.getFavoriteListMembers(favoriteListId.getEntityId(), paginationParameter); - return members; + return favoriteListService.getFavoriteListMembers(favoriteListId.getEntityId(), paginationParameter); } public FavoriteListMemberBean getMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, PollenEntityId<FavoriteListMember> memberId) { - FavoriteListMemberBean member = favoriteListService.getFavoriteListMember(favoriteListId.getEntityId(), memberId.getEntityId()); - return member; + return favoriteListService.getFavoriteListMember(favoriteListId.getEntityId(), memberId.getEntityId()); } public PollenEntityRef<FavoriteListMember> addMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, FavoriteListMemberBean member) throws InvalidFormException { - PollenEntityRef<FavoriteListMember> principalRef = favoriteListService.addFavoriteListMember(favoriteListId.getEntityId(), member); - return principalRef; + return favoriteListService.addFavoriteListMember(favoriteListId.getEntityId(), member); } public FavoriteListMemberBean editMember(FavoriteListService favoriteListService, PollenEntityId<FavoriteList> favoriteListId, FavoriteListMemberBean member) throws InvalidFormException { - FavoriteListMemberBean editedFavoriteListMember = favoriteListService.editFavoriteListMember(favoriteListId.getEntityId(), member); - return editedFavoriteListMember; + return favoriteListService.editFavoriteListMember(favoriteListId.getEntityId(), member); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java index 618c21d..57afcef 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollApi.java @@ -46,43 +46,37 @@ public class PollApi extends WebMotionController { public PollBean getNewPoll(PollService pollService) { - PollBean newPoll = pollService.getNewPoll(); - return newPoll; + return pollService.getNewPoll(); } public PaginationResultBean<PollBean> getPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PaginationResultBean<PollBean> polls = pollService.getPolls(paginationParameter); - return polls; + return pollService.getPolls(paginationParameter); } public PaginationResultBean<PollBean> getCreatedPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PaginationResultBean<PollBean> polls = pollService.getCreatedPolls(paginationParameter); - return polls; + return pollService.getCreatedPolls(paginationParameter); } public PaginationResultBean<PollBean> getInvitedPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PaginationResultBean<PollBean> polls = pollService.getInvitedPolls(paginationParameter); - return polls; + return pollService.getInvitedPolls(paginationParameter); } public PaginationResultBean<PollBean> getParticipatedPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PaginationResultBean<PollBean> polls = pollService.getParticipatedPolls(paginationParameter); - return polls; + return pollService.getParticipatedPolls(paginationParameter); } public PollBean getPoll(PollService pollService, PollenEntityId<Poll> pollId) { - PollBean poll = pollService.getPoll(pollId.getEntityId()); - return poll; + return pollService.getPoll(pollId.getEntityId()); } @@ -92,15 +86,13 @@ public class PollApi extends WebMotionController { List<ChoiceBean> choiceList = PollenRestApiUtil.toList(choices); - PollenEntityRef<Poll> principalRef = pollService.createPoll(poll, choiceList); - return principalRef; + return pollService.createPoll(poll, choiceList); } public PollBean editPoll(PollService pollService, PollBean poll) throws InvalidFormException { - PollBean editPoll = pollService.editPoll(poll); - return editPoll; + return pollService.editPoll(poll); } @@ -112,8 +104,7 @@ public class PollApi extends WebMotionController { public PollenEntityRef<Poll> clonePoll(PollService pollService, PollenEntityId<Poll> pollId) { - PollenEntityRef<Poll> clonedPoll = pollService.clonePoll(pollId.getEntityId()); - return clonedPoll; + return pollService.clonePoll(pollId.getEntityId()); } @@ -125,8 +116,7 @@ public class PollApi extends WebMotionController { public File exportPoll(PollService pollService, PollenEntityId<Poll> pollId) { - File exportedPollFile = pollService.exportPoll(pollId.getEntityId()); - return exportedPollFile; + return pollService.exportPoll(pollId.getEntityId()); } } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java index 4acba50..dd62bc9 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/PollenUserApi.java @@ -43,15 +43,13 @@ public class PollenUserApi extends WebMotionController { public PaginationResultBean<PollenUserBean> getUsers(PollenUserService pollenUserService, PaginationParameterBean paginationParameter) { - PaginationResultBean<PollenUserBean> users = pollenUserService.getUsers(paginationParameter); - return users; + return pollenUserService.getUsers(paginationParameter); } public PollenUserBean getUser(PollenUserService pollenUserService, PollenEntityId<PollenUser> userId) { - PollenUserBean user = pollenUserService.getUser(userId.getEntityId()); - return user; + return pollenUserService.getUser(userId.getEntityId()); } @@ -59,16 +57,14 @@ public class PollenUserApi extends WebMotionController { PollenUserBean user, boolean generatePassword) throws InvalidFormException { - PollenEntityRef<PollenUser> principalRef = pollenUserService.createUser(user, generatePassword); - return principalRef; + return pollenUserService.createUser(user, generatePassword); } public PollenUserBean editUser(PollenUserService pollenUserService, PollenUserBean user) throws InvalidFormException { - PollenUserBean editedPollUser = pollenUserService.editUser(user); - return editedPollUser; + return pollenUserService.editUser(user); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteApi.java index 2dc7e89..f3fc646 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteApi.java @@ -42,36 +42,31 @@ public class VoteApi extends WebMotionController { public VoteBean getNewVote(VoteService voteService, PollenEntityId<Poll> pollId) { - VoteBean newVote = voteService.getNewVote(pollId.getEntityId()); - return newVote; + return voteService.getNewVote(pollId.getEntityId()); } public List<VoteBean> getVotes(VoteService voteService, PollenEntityId<Poll> pollId) { - List<VoteBean> votes = voteService.getVotes(pollId.getEntityId()); - return votes; + return voteService.getVotes(pollId.getEntityId()); } public VoteBean getVote(VoteService voteService, PollenEntityId<Poll> pollId, PollenEntityId<Vote> voteId) { - VoteBean vote = voteService.getVote(pollId.getEntityId(), voteId.getEntityId()); - return vote; + return voteService.getVote(pollId.getEntityId(), voteId.getEntityId()); } public PollenEntityRef<Vote> addVote(VoteService voteService, PollenEntityId<Poll> pollId, VoteBean vote) throws InvalidFormException { - PollenEntityRef<Vote> principalRef = voteService.addVote(pollId.getEntityId(), vote); - return principalRef; + return voteService.addVote(pollId.getEntityId(), vote); } public VoteBean editVote(VoteService voteService, PollenEntityId<Poll> pollId, VoteBean vote) throws InvalidFormException { - VoteBean editedVote = voteService.editVote(pollId.getEntityId(), vote); - return editedVote; + return voteService.editVote(pollId.getEntityId(), vote); } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java index 8d987c0..ef3fbf4 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoteCountingApi.java @@ -38,15 +38,13 @@ public class VoteCountingApi extends WebMotionController { public VoteCountingResultBean getMainResult(VoteCountingService voteCountingService, PollenEntityId<Poll> pollId) { - VoteCountingResultBean result = voteCountingService.getMainResult(pollId.getEntityId()); - return result; + return voteCountingService.getMainResult(pollId.getEntityId()); } public GroupVoteCountingResultBean getGroupResult(VoteCountingService voteCountingService, PollenEntityId<Poll> pollId) { - GroupVoteCountingResultBean result = voteCountingService.getGroupResult(pollId.getEntityId()); - return result; + return voteCountingService.getGroupResult(pollId.getEntityId()); } } diff --git a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java index 035bfa4..8f7bdb7 100644 --- a/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java +++ b/pollen-rest-api/src/main/java/org/chorem/pollen/rest/api/v1/VoterListApi.java @@ -47,29 +47,25 @@ public class VoterListApi extends WebMotionController { public PollenEntityRef<VoterList> importFavoriteListNewGroup(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<FavoriteList> favoriteListId) { - PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), null, favoriteListId.getEntityId()); - return principalRef; + return voterListService.importFavoriteList(pollId.getEntityId(), null, favoriteListId.getEntityId()); } public PollenEntityRef<VoterList> importFavoriteList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId, PollenEntityId<FavoriteList> favoriteListId) { - PollenEntityRef<VoterList> principalRef = voterListService.importFavoriteList(pollId.getEntityId(), voterListId.getEntityId(),favoriteListId.getEntityId()); - return principalRef; + return voterListService.importFavoriteList(pollId.getEntityId(), voterListId.getEntityId(), favoriteListId.getEntityId()); } public List<VoterListBean> getVoterLists(VoterListService voterListService, PollenEntityId<Poll> pollId) { - List<VoterListBean> voterLists = voterListService.getVoterLists(pollId.getEntityId()); - return voterLists; + return voterListService.getVoterLists(pollId.getEntityId()); } public VoterListBean getVoterList(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId) { - VoterListBean voterList = voterListService.getVoterList(pollId.getEntityId(), voterListId.getEntityId()); - return voterList; + return voterListService.getVoterList(pollId.getEntityId(), voterListId.getEntityId()); } @@ -77,15 +73,13 @@ public class VoterListApi extends WebMotionController { List<VoterListMemberBean> memberList = PollenRestApiUtil.toList(members); - PollenEntityRef<VoterList> principalRef = voterListService.addVoterList(pollId.getEntityId(), voterList, memberList); - return principalRef; + return voterListService.addVoterList(pollId.getEntityId(), voterList, memberList); } public VoterListBean editVoterList(VoterListService voterListService, PollenEntityId<Poll> pollId, VoterListBean voterList) throws InvalidFormException { - VoterListBean editedVoterList = voterListService.editVoterList(pollId.getEntityId(), voterList); - return editedVoterList; + return voterListService.editVoterList(pollId.getEntityId(), voterList); } @@ -97,29 +91,25 @@ public class VoterListApi extends WebMotionController { public Set<VoterListMemberBean> getMembers(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId) { - Set<VoterListMemberBean> members = voterListService.getVoterListMembers(pollId.getEntityId(), voterListId.getEntityId()); - return members; + return voterListService.getVoterListMembers(pollId.getEntityId(), voterListId.getEntityId()); } public VoterListMemberBean getMember(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId, PollenEntityId<VoterListMember> memberId) { - VoterListMemberBean member = voterListService.getVoterListMember(pollId.getEntityId(), voterListId.getEntityId(), memberId.getEntityId()); - return member; + return voterListService.getVoterListMember(pollId.getEntityId(), voterListId.getEntityId(), memberId.getEntityId()); } public VoterListMemberBean addMember(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId, VoterListMemberBean member) throws InvalidFormException { - VoterListMemberBean principalRef = voterListService.addVoterListMember(pollId.getEntityId(), voterListId.getEntityId(), member); - return principalRef; + return voterListService.addVoterListMember(pollId.getEntityId(), voterListId.getEntityId(), member); } public VoterListMemberBean editMember(VoterListService voterListService, PollenEntityId<Poll> pollId, PollenEntityId<VoterList> voterListId, VoterListMemberBean member) throws InvalidFormException { - VoterListMemberBean editedMember = voterListService.editVoterListMember(pollId.getEntityId(), voterListId.getEntityId(), member); - return editedMember; + return voterListService.editVoterListMember(pollId.getEntityId(), voterListId.getEntityId(), member); } diff --git a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java index 863e04e..3c668fb 100644 --- a/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java +++ b/pollen-rest-api/src/test/java/org/chorem/pollen/rest/api/AbstractPollenRestApiTest.java @@ -96,8 +96,7 @@ public class AbstractPollenRestApiTest extends WebMotionTest { protected String encodeId(String entityId) { TopiaIdFactory topiaIdFactory = application.getTopiaApplicationContext().getTopiaIdFactory(); - String encode = PollenEntityId.encode(topiaIdFactory, entityId); - return encode; + return PollenEntityId.encode(topiaIdFactory, entityId); } @@ -110,14 +109,13 @@ public class AbstractPollenRestApiTest extends WebMotionTest { @Override public PollenServiceContext newServiceContext(PollenPersistenceContext persistenceContext, Locale locale) { - FakePollenServiceContext serviceContext = FakePollenServiceContext.newServiceContext( + return FakePollenServiceContext.newServiceContext( DateUtil.createDate(1, 1, 2014), Locale.FRANCE, application.getApplicationConfig(), application.getTopiaApplicationContext(), application.newPersistenceContext(), application.getVoteCountingFactory()); - return serviceContext; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java index 66788d4..8cb863b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java @@ -95,8 +95,7 @@ public class DefaultPollenServiceContext implements PollenServiceContext { @Override public Date getNow() { - Date now = new Date(); - return now; + return new Date(); } @Override @@ -111,8 +110,7 @@ public class DefaultPollenServiceContext implements PollenServiceContext { RandomNumberGenerator generator = getHashService().getRandomNumberGenerator(); ByteSource byteSource = generator.nextBytes(); - String salt = byteSource.toBase64(); - return salt; + return byteSource.toBase64(); } @@ -132,8 +130,7 @@ public class DefaultPollenServiceContext implements PollenServiceContext { } // encode it in base64 (url safe version) - String result = Base64.encodeBase64URLSafeString(decode); - return result; + return Base64.encodeBase64URLSafeString(decode); } @@ -149,8 +146,7 @@ public class DefaultPollenServiceContext implements PollenServiceContext { HashRequest hashRequest = new HashRequest.Builder().setSalt(salt).setSource(password).build(); Hash hash = getHashService().computeHash(hashRequest); - String encodedToken = hash.toBase64(); - return encodedToken; + return hash.toBase64(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/TopiaEntityCopyVisitor.java b/pollen-services/src/main/java/org/chorem/pollen/services/TopiaEntityCopyVisitor.java index d33a31f..119c53f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/TopiaEntityCopyVisitor.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/TopiaEntityCopyVisitor.java @@ -95,9 +95,7 @@ public class TopiaEntityCopyVisitor<T extends TopiaApplicationContext> implement source.accept(visitor); - E target = (E) visitor.last; - - return target; + return (E) visitor.last; } finally { @@ -311,9 +309,8 @@ public class TopiaEntityCopyVisitor<T extends TopiaApplicationContext> implement protected boolean acceptEntity(Object entity) { - boolean add = entity instanceof TopiaEntity && + return entity instanceof TopiaEntity && alreadyExplored.add(((TopiaEntity) entity).getTopiaId()); - return add; } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java index c5a9c94..f23ca6b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java @@ -46,8 +46,7 @@ public class PaginationParameterBean { protected boolean desc; public static PaginationParameterBean of(int pageNumber, int pageSize) { - PaginationParameterBean result = of (pageNumber, pageSize, null, false); - return result; + return of (pageNumber, pageSize, null, false); } public static PaginationParameterBean of(int pageNumber, int pageSize, String order, boolean desc) { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java index 0b84392..b5255bc 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java @@ -97,9 +97,7 @@ public class PollenBeans { copy.add(bean); } - ImmutableSet<B> result = ImmutableSet.copyOf(copy); - - return result; + return ImmutableSet.copyOf(copy); } @@ -112,9 +110,7 @@ public class PollenBeans { copy.add(bean); } - ImmutableList<B> result = ImmutableList.copyOf(copy); - - return result; + return ImmutableList.copyOf(copy); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityId.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityId.java index 2a1e0b1..e20ea8c 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityId.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityId.java @@ -59,8 +59,7 @@ public class PollenEntityId<E extends TopiaEntity> { public static String encode(TopiaIdFactory topiaIdFactory, String entityId) { String randomPart = topiaIdFactory.getRandomPart(entityId); - String encodedId = new String(Base64.encodeBase64URLSafe(randomPart.getBytes())); - return encodedId; + return new String(Base64.encodeBase64URLSafe(randomPart.getBytes())); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityRef.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityRef.java index 7f803bf..45fc609 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityRef.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenEntityRef.java @@ -46,50 +46,43 @@ public class PollenEntityRef<E extends TopiaEntity> extends PollenEntityId<E> { public static PollenEntityRef<Poll> of(Poll entity) { - PollenEntityRef<Poll> ref = of(entity, entity.getCreator().getPermission()); - return ref; + return of(entity, entity.getCreator().getPermission()); } public static PollenEntityRef<Choice> of(Choice entity) { - PollenEntityRef<Choice> ref = of(entity, entity.getCreator().getPermission()); - return ref; + return of(entity, entity.getCreator().getPermission()); } public static PollenEntityRef<Comment> of(Comment entity) { - PollenEntityRef<Comment> ref = of(entity, entity.getAuthor().getPermission()); - return ref; + return of(entity, entity.getAuthor().getPermission()); } public static PollenEntityRef<Vote> of(Vote entity) { - PollenEntityRef<Vote> ref = of(entity, entity.getVoter().getPermission()); - return ref; + return of(entity, entity.getVoter().getPermission()); } public static PollenEntityRef<PollenUser> of(SessionToken result) { - PollenEntityRef<PollenUser> ref = of(result.getPollenUser(), result.getPollenToken()); - return ref; + return of(result.getPollenUser(), result.getPollenToken()); } public static <E extends TopiaEntity> PollenEntityRef<E> of(E result) { - PollenEntityRef<E> ref = new PollenEntityRef<>(result, null); - return ref; + return new PollenEntityRef<>(result, null); } public static <E extends TopiaEntity> PollenEntityRef<E> of(E id, PollenToken permission) { - PollenEntityRef<E> ref = new PollenEntityRef<>(id, permission == null ? null : permission.getToken()); - return ref; + return new PollenEntityRef<>(id, permission == null ? null : permission.getToken()); } @@ -102,8 +95,7 @@ public class PollenEntityRef<E extends TopiaEntity> extends PollenEntityId<E> { public static <E extends TopiaEntity> PollenEntityRef<E> newRef(Class<E> entityType) { - PollenEntityRef<E> ref = new PollenEntityRef<>(entityType); - return ref; + return new PollenEntityRef<>(entityType); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java index 959b91e..e3fa291 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/config/PollenServiceConfig.java @@ -102,9 +102,7 @@ public class PollenServiceConfig { } public boolean isLogConfigurationProvided() { - boolean logConfigurationProvided = - StringUtils.isNotBlank(applicationConfig.getOption(PollenServiceConfigOption.LOG_CONFIGURATION_FILE.key)); - return logConfigurationProvided; + return StringUtils.isNotBlank(applicationConfig.getOption(PollenServiceConfigOption.LOG_CONFIGURATION_FILE.key)); } public File getDataDirectory() { @@ -116,85 +114,72 @@ public class PollenServiceConfig { } public boolean isDevMode() { - boolean isDevMode = applicationConfig.getOptionAsBoolean(PollenServiceConfigOption.DEV_MODE.key); - return isDevMode; + return applicationConfig.getOptionAsBoolean(PollenServiceConfigOption.DEV_MODE.key); } public int getDefaultVoteCountingType() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.DEFAULT_VOTE_COUNTING_TYPE.key); - return result; } public PollType getDefaultPollType() { - PollType result = applicationConfig.getOption( + return applicationConfig.getOption( PollType.class, PollenServiceConfigOption.DEFAULT_POLL_TYPE.key); - return result; } public VoteVisibility getDefaultVoteVisibility() { - VoteVisibility result = applicationConfig.getOption( + return applicationConfig.getOption( VoteVisibility.class, PollenServiceConfigOption.DEFAULT_VOTE_VISIBILITY.key); - return result; } public CommentVisibility getDefaultCommentVisibility() { - CommentVisibility result = applicationConfig.getOption( + return applicationConfig.getOption( CommentVisibility.class, PollenServiceConfigOption.DEFAULT_COMMENT_VISIBILITY.key); - return result; } public ResultVisibility getDefaultResultVisibility() { - ResultVisibility result = applicationConfig.getOption( + return applicationConfig.getOption( ResultVisibility.class, PollenServiceConfigOption.DEFAULT_RESULT_VISIBILITY.key); - return result; } public ChoiceType getDefaultChoiceType() { - ChoiceType result = applicationConfig.getOption( + return applicationConfig.getOption( ChoiceType.class, PollenServiceConfigOption.DEFAULT_CHOICE_TYPE.key); - return result; } public int getDefaultPollPaginationSize() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.DEFAULT_POLLS_PAGE_SIZE.key); - return result; } public int getDefaultCommentPaginationSize() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.DEFAULT_COMMENTS_PAGE_SIZE.key); - return result; } public int getDefaultFavoriteListPaginationSize() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.DEFAULT_FAVORITE_LISTS_PAGE_SIZE.key); - return result; } public int getDefaultFavoriteListMemberPaginationSize() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.DEFAULT_FAVORITE_LIST_MEMBERS_PAGE_SIZE.key); - return result; } public int getDefaultPollenUserPaginationSize() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.DEFAULT_POLLEN_USERS_PAGE_SIZE.key); - return result; } public int getSessionTimeoutDelay() { - int result = applicationConfig.getOptionAsInt( + return applicationConfig.getOptionAsInt( PollenServiceConfigOption.SESSION_TIMEOUT_DELAY.key); - return result; } /** diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 0f80240..58d7ed8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -67,8 +67,7 @@ public class ChoiceService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); List<Choice> choices = getChoiceDao().findAll(poll); - List<ChoiceBean> choiceBeans = toBeanList(ChoiceBean.class, choices, choiceBeanFunction); - return choiceBeans; + return toBeanList(ChoiceBean.class, choices, choiceBeanFunction); } @@ -81,8 +80,7 @@ public class ChoiceService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); Choice choice = getChoice(poll, choiceId); - ChoiceBean choiceBean = toBean(ChoiceBean.class, choice, choiceBeanFunction); - return choiceBean; + return toBean(ChoiceBean.class, choice, choiceBeanFunction); } @@ -130,8 +128,7 @@ public class ChoiceService extends PollenServiceSupport { getNotificationService().onChoiceAdded(poll, result); - PollenEntityRef<Choice> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java index f549e94..d9f0be3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/CommentService.java @@ -63,9 +63,7 @@ public class CommentService extends PollenServiceSupport { PaginationResult<Comment> comments = getCommentDao().find(poll, page); - PaginationResultBean<CommentBean> commentBeans = toPaginationListBean(CommentBean.class, comments, commentFunction); - - return commentBeans; + return toPaginationListBean(CommentBean.class, comments, commentFunction); } @@ -74,9 +72,8 @@ public class CommentService extends PollenServiceSupport { checkNotNull(pollId); Poll poll = getPollService().getPoll0(pollId); - long result = getCommentDao().forPollEquals(poll).count(); - return result; + return getCommentDao().forPollEquals(poll).count(); } public CommentBean getComment(String pollId, String commentId) { @@ -88,9 +85,8 @@ public class CommentService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); Comment comment = getComment(poll, commentId); - CommentBean commentBean = toBean(CommentBean.class, comment, commentFunction); - return commentBean; + return toBean(CommentBean.class, comment, commentFunction); } @@ -110,8 +106,7 @@ public class CommentService extends PollenServiceSupport { getNotificationService().onCommentAdded(poll, result); - PollenEntityRef<Comment> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -131,8 +126,7 @@ public class CommentService extends PollenServiceSupport { getNotificationService().onCommentEdited(poll, result); - CommentBean commentBean = toBean(CommentBean.class, result); - return commentBean; + return toBean(CommentBean.class, result); } @@ -238,8 +232,7 @@ public class CommentService extends PollenServiceSupport { } - PaginationParameter parameter = paginationParameter.toPaginationParameter(); - return parameter; + return paginationParameter.toPaginationParameter(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java index 3fa6df6..54237e7 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/FavoriteListService.java @@ -65,8 +65,7 @@ public class FavoriteListService extends PollenServiceSupport { PaginationParameter page = getFavoriteListPaginationParameter(paginationParameter); PaginationResult<FavoriteList> favoriteLists = getFavoriteListDao().forPollenUserEquals(user).findPage(page); - PaginationResultBean<FavoriteListBean> favoriteListBeans = toPaginationListBean(FavoriteListBean.class, favoriteLists); - return favoriteListBeans; + return toPaginationListBean(FavoriteListBean.class, favoriteLists); } @@ -78,8 +77,7 @@ public class FavoriteListService extends PollenServiceSupport { PollenUser user = getConnectedUser(); FavoriteList favoriteList = getFavoriteList0(user, favoriteListId); - FavoriteListBean favoriteListBean = toBean(FavoriteListBean.class, favoriteList); - return favoriteListBean; + return toBean(FavoriteListBean.class, favoriteList); } @@ -101,8 +99,7 @@ public class FavoriteListService extends PollenServiceSupport { getNotificationService().onFavoriteListAdded(user, result); - PollenEntityRef<FavoriteList> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -125,8 +122,7 @@ public class FavoriteListService extends PollenServiceSupport { getNotificationService().onFavoriteListEdited(user, result); - FavoriteListBean favoriteListBean = toBean(FavoriteListBean.class, result); - return favoriteListBean; + return toBean(FavoriteListBean.class, result); } @@ -159,8 +155,7 @@ public class FavoriteListService extends PollenServiceSupport { PaginationParameter page = getFavoriteListPaginationParameter(paginationParameter); PaginationResult<FavoriteListMember> members = getFavoriteListMemberDao().forFavoriteListEquals(favoriteList).findPage(page); - PaginationResultBean<FavoriteListMemberBean> memberBeans = toPaginationListBean(FavoriteListMemberBean.class, members); - return memberBeans; + return toPaginationListBean(FavoriteListMemberBean.class, members); } @@ -175,8 +170,7 @@ public class FavoriteListService extends PollenServiceSupport { FavoriteList favoriteList = getFavoriteList0(user, favoriteListId); FavoriteListMember member = getFavoriteListMember0(favoriteList, memberId); - FavoriteListMemberBean memberBean = toBean(FavoriteListMemberBean.class, member); - return memberBean; + return toBean(FavoriteListMemberBean.class, member); } @@ -200,8 +194,7 @@ public class FavoriteListService extends PollenServiceSupport { FavoriteListMember result = saveFavoriteListMember(favoriteList, member); commit(); - PollenEntityRef<FavoriteListMember> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -225,8 +218,7 @@ public class FavoriteListService extends PollenServiceSupport { FavoriteListMember result = saveFavoriteListMember(favoriteList, member); commit(); - FavoriteListMemberBean memberBean = toBean(FavoriteListMemberBean.class, result); - return memberBean; + return toBean(FavoriteListMemberBean.class, result); } @@ -282,8 +274,7 @@ public class FavoriteListService extends PollenServiceSupport { protected List<FavoriteList> getFavoriteLists0(PollenUser user) { - List<FavoriteList> favoriteLists = getFavoriteListDao().forPollenUserEquals(user).findAll(); - return favoriteLists; + return getFavoriteListDao().forPollenUserEquals(user).findAll(); } @@ -303,8 +294,7 @@ public class FavoriteListService extends PollenServiceSupport { protected List<FavoriteListMember> getFavoriteListMembers0(FavoriteList favoriteList) { - List<FavoriteListMember> members = getFavoriteListMemberDao().forFavoriteListEquals(favoriteList).findAll(); - return members; + return getFavoriteListMemberDao().forFavoriteListEquals(favoriteList).findAll(); } @@ -486,8 +476,7 @@ public class FavoriteListService extends PollenServiceSupport { paginationParameter.setOrder(FavoriteList.PROPERTY_NAME); } - PaginationParameter parameter = paginationParameter.toPaginationParameter(); - return parameter; + return paginationParameter.toPaginationParameter(); } @@ -500,8 +489,7 @@ public class FavoriteListService extends PollenServiceSupport { } - PaginationParameter parameter = paginationParameter.toPaginationParameter(); - return parameter; + return paginationParameter.toPaginationParameter(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java index e68dd38..557e6af 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollService.java @@ -96,8 +96,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().forAll().findPage(page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); - return pollBeans; + return toPaginationListBean(PollBean.class, polls, pollBeanFunction); } @@ -109,8 +108,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllCreated(connectedUser, page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); - return pollBeans; + return toPaginationListBean(PollBean.class, polls, pollBeanFunction); } @@ -122,8 +120,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllInvited(connectedUser, page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); - return pollBeans; + return toPaginationListBean(PollBean.class, polls, pollBeanFunction); } @@ -135,8 +132,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllParticipated(connectedUser, page); - PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls, pollBeanFunction); - return pollBeans; + return toPaginationListBean(PollBean.class, polls, pollBeanFunction); } @@ -147,9 +143,7 @@ public class PollService extends PollenServiceSupport { Poll poll = getPoll0(pollId); - PollBean pollBean = toBean(PollBean.class, poll, pollBeanFunction); - - return pollBean; + return toBean(PollBean.class, poll, pollBeanFunction); } @@ -195,9 +189,7 @@ public class PollService extends PollenServiceSupport { getNotificationService().onPollCreated(savedPoll); - PollenEntityRef<Poll> createBeanRef = PollenEntityRef.of(savedPoll); - - return createBeanRef; + return PollenEntityRef.of(savedPoll); } @@ -215,8 +207,7 @@ public class PollService extends PollenServiceSupport { getNotificationService().onPollEdited(savedPoll); - PollBean pollBean = toBean(PollBean.class, savedPoll, pollBeanFunction); - return pollBean; + return toBean(PollBean.class, savedPoll, pollBeanFunction); } @@ -281,9 +272,7 @@ public class PollService extends PollenServiceSupport { getNotificationService().onPollCreated(savedPoll); - PollenEntityRef<Poll> createBeanRef = PollenEntityRef.of(savedPoll); - - return createBeanRef; + return PollenEntityRef.of(savedPoll); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java index c9a88da..5abdb6e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenResourceService.java @@ -90,9 +90,8 @@ public class PollenResourceService extends PollenServiceSupport implements Polle } protected PollenResource getResource0(String resourceId) { - PollenResource resource = getPollenResourceDao().forTopiaIdEquals(resourceId).findUnique(); - return resource; + return getPollenResourceDao().forTopiaIdEquals(resourceId).findUnique(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java index 18032c6..ea0b0ed 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenServiceSupport.java @@ -231,15 +231,13 @@ public abstract class PollenServiceSupport implements PollenService { protected boolean isPermitted(PermissionVerb verb, String id) { String permission = getSecurityService().createPermission(verb, id); - boolean permitted = getSecurityService().isPermitted(permission); - return permitted; + return getSecurityService().isPermitted(permission); } protected boolean isNotPermitted(PermissionVerb verb, String id) { - boolean notPermietted = !isPermitted(verb, id); - return notPermietted; + return !isPermitted(verb, id); } @@ -281,169 +279,146 @@ public abstract class PollenServiceSupport implements PollenService { protected boolean check(Multimap<String, String> errors, String field, boolean condition, String error) { - boolean valid = condition; - if (!valid) { + if (!condition) { errors.put(field, error); } - return valid; + return condition; } protected boolean checkNot(Multimap<String, String> errors, String field, boolean condition, String error) { - boolean valid = check(errors, field, !condition, error); - return valid; + return check(errors, field, !condition, error); } protected boolean checkNotNull(Multimap<String, String> errors, String field, Object value, String error) { - boolean valid = check(errors, field, value != null, error); - return valid; + return check(errors, field, value != null, error); } protected boolean checkEmpty(Multimap<String, String> errors, String field, Collection<?> value, String error) { - boolean valid = check(errors, field, CollectionUtils.isEmpty(value), error); - return valid; + return check(errors, field, CollectionUtils.isEmpty(value), error); } protected boolean checkNotEmpty(Multimap<String, String> errors, String field, Collection<?> value, String error) { - boolean valid = check(errors, field, CollectionUtils.isNotEmpty(value), error); - return valid; + return check(errors, field, CollectionUtils.isNotEmpty(value), error); } protected boolean checkNotBlank(Multimap<String, String> errors, String field, String value, String error) { - boolean valid = check(errors, field, StringUtils.isNotBlank(value), error); - return valid; + return check(errors, field, StringUtils.isNotBlank(value), error); } protected boolean checkValidEmail(Multimap<String, String> errors, String field, String value, String error) { - boolean valid = check(errors, field, StringUtil.isEmail(value), error); - return valid; + return check(errors, field, StringUtil.isEmail(value), error); } protected boolean checkNot(ErrorMap errors, String field, boolean condition, String error) { - boolean valid = check(errors, field, !condition, error); - return valid; + return check(errors, field, !condition, error); } protected boolean checkNotNull(ErrorMap errors, String field, Object value, String error) { - boolean valid = check(errors, field, value != null, error); - return valid; + return check(errors, field, value != null, error); } protected boolean checkEmpty(ErrorMap errors, String field, Collection<?> value, String error) { - boolean valid = check(errors, field, CollectionUtils.isEmpty(value), error); - return valid; + return check(errors, field, CollectionUtils.isEmpty(value), error); } protected boolean checkNotEmpty(ErrorMap errors, String field, Collection<?> value, String error) { - boolean valid = check(errors, field, CollectionUtils.isNotEmpty(value), error); - return valid; + return check(errors, field, CollectionUtils.isNotEmpty(value), error); } protected boolean checkNotBlank(ErrorMap errors, String field, String value, String error) { - boolean valid = check(errors, field, StringUtils.isNotBlank(value), error); - return valid; + return check(errors, field, StringUtils.isNotBlank(value), error); } protected boolean checkValidEmail(ErrorMap errors, String field, String value, String error) { - boolean valid = check(errors, field, StringUtil.isEmail(value), error); - return valid; + return check(errors, field, StringUtil.isEmail(value), error); } protected boolean check(ErrorMap errors, String field, boolean condition, String error) { - boolean valid = condition; - if (!valid) { + if (!condition) { errors.addError(field, error); } - return valid; + return condition; } protected PollenUser getConnectedUser() { - PollenUser pollenUser = serviceContext.getSecurityContext().getPollenUser(); - return pollenUser; + return serviceContext.getSecurityContext().getPollenUser(); } protected <T extends TopiaEntity, B extends PollenBean<T>> B toBean(Class<B> beanType, T entity) { - B bean = toBean(beanType, entity, null); - return bean; + return toBean(beanType, entity, null); } protected <T extends TopiaEntity, B extends PollenBean<T>> B toBean(Class<B> beanType, T entity, Function<B, B> beanFunction) { - B bean = PollenBeans.toBean(beanType, entity, beanFunction); - return bean; + return PollenBeans.toBean(beanType, entity, beanFunction); } protected <T extends TopiaEntity, B extends PollenBean<T>> ImmutableList<B> toBeanList(Class<B> beanType, Collection<T> entities) { - ImmutableList<B> list = toBeanList(beanType, entities, null); - return list; + return toBeanList(beanType, entities, null); } protected <T extends TopiaEntity, B extends PollenBean<T>> ImmutableList<B> toBeanList(Class<B> beanType, Collection<T> entities, Function<B, B> beanFunction) { - ImmutableList<B> list = PollenBeans.toBeanList(beanType, entities, beanFunction); - return list; + return PollenBeans.toBeanList(beanType, entities, beanFunction); } protected <T extends TopiaEntity, B extends PollenBean<T>> ImmutableSet<B> toBeanSet(Class<B> beanType, Collection<T> entities) { - ImmutableSet<B> set = toBeanSet(beanType, entities, null); - return set; + return toBeanSet(beanType, entities, null); } protected <T extends TopiaEntity, B extends PollenBean<T>> ImmutableSet<B> toBeanSet(Class<B> beanType, Collection<T> entities, Function<B, B> beanFunction) { - ImmutableSet<B> set = PollenBeans.toBeanSet(beanType, entities, beanFunction); - return set; + return PollenBeans.toBeanSet(beanType, entities, beanFunction); } protected <E extends TopiaEntity, B extends PollenBean<E>> PaginationResultBean<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities) { - PaginationResultBean<B> result = toPaginationListBean(beanType, entities, null); - return result; + return toPaginationListBean(beanType, entities, null); } protected <E extends TopiaEntity, B extends PollenBean<E>> PaginationResultBean<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities, Function<B, B> beanFunction) { - PaginationResultBean<B> result = PollenBeans.toBean(beanType, entities, beanFunction); - return result; + return PollenBeans.toBean(beanType, entities, beanFunction); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java index 1602636..f42b2ec 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/PollenUserService.java @@ -73,9 +73,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } PaginationResult<PollenUser> pollenUsers = getPollenUserDao().forAll().findPage(page); - PaginationResultBean<PollenUserBean> pollenUserBeans = toPaginationListBean(PollenUserBean.class, pollenUsers, pollenUserFunction); - - return pollenUserBeans; + return toPaginationListBean(PollenUserBean.class, pollenUsers, pollenUserFunction); } @@ -85,9 +83,8 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer checkNotNull(userId); PollenUser pollenUser = getUser0(userId); - PollenUserBean pollenUserBean = toBean(PollenUserBean.class, pollenUser, pollenUserFunction); - return pollenUserBean; + return toBean(PollenUserBean.class, pollenUser, pollenUserFunction); } @@ -109,8 +106,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer getNotificationService().onUserCreated(result, user.getPassword()); - PollenEntityRef<PollenUser> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -127,8 +123,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer getNotificationService().onUserEdited(result); - PollenUserBean pollenUserBean = toBean(PollenUserBean.class, result); - return pollenUserBean; + return toBean(PollenUserBean.class, result); } @@ -390,8 +385,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer protected PollenUser getUser0(String userId) { - PollenUser pollenUser = getPollenUserDao().forTopiaIdEquals(userId).findUnique(); - return pollenUser; + return getPollenUserDao().forTopiaIdEquals(userId).findUnique(); } @@ -408,8 +402,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer paginationParameter.setOrder(PollenUser.PROPERTY_NAME); } - PaginationParameter parameter = paginationParameter.toPaginationParameter(); - return parameter; + return paginationParameter.toPaginationParameter(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java index c9a1673..2f1f4a9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteCountingService.java @@ -157,8 +157,7 @@ public class VoteCountingService extends PollenServiceSupport { Set<Voter> voter = builder.getVoters(); - GroupOfVoter result = GroupOfVoter.newVoter(null, 1.0, voter); - return result; + return GroupOfVoter.newVoter(null, 1.0, voter); } @@ -216,8 +215,7 @@ public class VoteCountingService extends PollenServiceSupport { Set<Voter> voter = builder.getVoters(); - GroupOfVoter result = GroupOfVoter.newVoter(null, 1.0, voter); - return result; + return GroupOfVoter.newVoter(null, 1.0, voter); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java index 7c1aa6a..4cf5cc6 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoteService.java @@ -93,8 +93,7 @@ public class VoteService extends PollenServiceSupport { } } - List<VoteBean> voteBeans = toBeanList(VoteBean.class, votes, voteBeanFunction); - return voteBeans; + return toBeanList(VoteBean.class, votes, voteBeanFunction); } @@ -107,8 +106,7 @@ public class VoteService extends PollenServiceSupport { Vote result = getVote(poll, voteId); - VoteBean voteBean = toBean(VoteBean.class, result, voteBeanFunction); - return voteBean; + return toBean(VoteBean.class, result, voteBeanFunction); } @@ -129,8 +127,7 @@ public class VoteService extends PollenServiceSupport { getNotificationService().onVoteAdded(poll, result); - PollenEntityRef<Vote> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -150,8 +147,7 @@ public class VoteService extends PollenServiceSupport { getNotificationService().onVoteEdited(poll, result); - VoteBean voteBean = toBean(VoteBean.class, result); - return voteBean; + return toBean(VoteBean.class, result); } @@ -353,8 +349,7 @@ public class VoteService extends PollenServiceSupport { protected List<Vote> getVotes0(Poll poll) { - List<Vote> votes = getVoteDao().findAll(poll); - return votes; + return getVoteDao().findAll(poll); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java index ef7436d..cff3571 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/VoterListService.java @@ -125,8 +125,7 @@ public class VoterListService extends PollenServiceSupport { commit(); - PollenEntityRef<VoterList> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -137,8 +136,7 @@ public class VoterListService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); List<VoterList> voterLists = getVoterLists0(poll); - List<VoterListBean> voterListBeans = toBeanList(VoterListBean.class, voterLists); - return voterListBeans; + return toBeanList(VoterListBean.class, voterLists); } @@ -149,8 +147,7 @@ public class VoterListService extends PollenServiceSupport { checkPermission(PermissionVerb.readPoll, pollId); VoterList voterList = getVoterList0(pollId, voterListId); - VoterListBean voterListBean = toBean(VoterListBean.class, voterList); - return voterListBean; + return toBean(VoterListBean.class, voterList); } @@ -186,8 +183,7 @@ public class VoterListService extends PollenServiceSupport { //TODO Notify - PollenEntityRef<VoterList> createBeanRef = PollenEntityRef.of(result); - return createBeanRef; + return PollenEntityRef.of(result); } @@ -210,8 +206,7 @@ public class VoterListService extends PollenServiceSupport { commit(); //TODO Notify - VoterListBean voterListBean = toBean(VoterListBean.class, result); - return voterListBean; + return toBean(VoterListBean.class, result); } @@ -238,8 +233,7 @@ public class VoterListService extends PollenServiceSupport { VoterList voterList = getVoterList0(pollId, voterListId); List<VoterListMember> members = getVoterListMembers0(voterList); - Set<VoterListMemberBean> memberBeans = toBeanSet(VoterListMemberBean.class, members); - return memberBeans; + return toBeanSet(VoterListMemberBean.class, members); } @@ -253,8 +247,7 @@ public class VoterListService extends PollenServiceSupport { VoterList voterList = getVoterList0(pollId, voterListId); VoterListMember member = getVoterListMember0(voterList, memberId); - VoterListMemberBean memberBean = toBean(VoterListMemberBean.class, member); - return memberBean; + return toBean(VoterListMemberBean.class, member); } @@ -276,8 +269,7 @@ public class VoterListService extends PollenServiceSupport { VoterListMember result = saveVoterListMember(voterList, member); commit(); - VoterListMemberBean memberBean = toBean(VoterListMemberBean.class, result); - return memberBean; + return toBean(VoterListMemberBean.class, result); } @@ -299,8 +291,7 @@ public class VoterListService extends PollenServiceSupport { VoterListMember result = saveVoterListMember(voterList, member); commit(); - VoterListMemberBean memberBean = toBean(VoterListMemberBean.class, result); - return memberBean; + return toBean(VoterListMemberBean.class, result); } @@ -322,8 +313,7 @@ public class VoterListService extends PollenServiceSupport { protected List<VoterList> getVoterLists0(Poll poll) { - List<VoterList> voterLists = getVoterListDao().forPollEquals(poll).findAll(); - return voterLists; + return getVoterListDao().forPollEquals(poll).findAll(); } @@ -348,15 +338,13 @@ public class VoterListService extends PollenServiceSupport { Poll poll = getPollService().getPoll0(pollId); - VoterList result = getVoterList0(poll, voterListId); - return result; + return getVoterList0(poll, voterListId); } protected List<VoterListMember> getVoterListMembers0(VoterList voterList) { - List<VoterListMember> members = getVoterListMemberDao().forVoterListEquals(voterList).findAll(); - return members; + return getVoterListMemberDao().forVoterListEquals(voterList).findAll(); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java index d29a0a6..0e8e73b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/mail/PollenMail.java @@ -80,9 +80,8 @@ public abstract class PollenMail { } public boolean isRecipientProvided() { - boolean isRecipientProvided = CollectionUtils.isNotEmpty(getBccs()) + return CollectionUtils.isNotEmpty(getBccs()) || CollectionUtils.isNotEmpty(getTos()); - return isRecipientProvided; } } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java index c39fba9..3b150e3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/PollenSecurityRealm.java @@ -90,9 +90,7 @@ public class PollenSecurityRealm extends AuthorizingRealm { String salt = pollenUser.getSalt(); - SimpleAuthenticationInfo result = - new SimpleAuthenticationInfo(username, pollenUser.getPassword(), new SimpleByteSource(salt), getName()); - return result; + return new SimpleAuthenticationInfo(username, pollenUser.getPassword(), new SimpleByteSource(salt), getName()); } finally { persistenceContext.close(); diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java index 7be5b19..5ec7c7a 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/security/SecurityService.java @@ -83,8 +83,7 @@ public class SecurityService extends PollenServiceSupport { SessionToken.PROPERTY_POLLEN_USER, user); commit(); - PollenEntityRef<PollenUser> createBeanRef = PollenEntityRef.of(sessionToken); - return createBeanRef; + return PollenEntityRef.of(sessionToken); } @@ -289,8 +288,7 @@ public class SecurityService extends PollenServiceSupport { log.info("Check permission: " + permission); } - boolean permitted = subject.isPermitted(permission); - return permitted; + return subject.isPermitted(permission); } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java index 63f9b22..ce7b69f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/test/FakePollenApplicationContext.java @@ -226,14 +226,13 @@ public class FakePollenApplicationContext extends TestWatcher implements PollenA @Override public FakePollenServiceContext newServiceContext(PollenPersistenceContext persistenceContext, Locale locale) { - FakePollenServiceContext serviceContext = FakePollenServiceContext.newServiceContext( + return FakePollenServiceContext.newServiceContext( DateUtil.createDate(1, 1, 2014), Locale.FRANCE, getApplicationConfig(), getTopiaApplicationContext(), newPersistenceContext(), getVoteCountingFactory()); - return serviceContext; } diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java index eea80bf..d05c337 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java @@ -71,23 +71,19 @@ public abstract class AbstractVoteCounting<S extends VoteCountingStrategy> imple @Override public final String getName(Locale locale) { - String result = l(locale, i18nName); - return result; + return l(locale, i18nName); } @Override public final String getShortHelp(Locale locale) { String voteName = l(locale, i18nName); String voteHelp = l(locale, i18nShortHelp); - String result = - l(locale, "pollen.voteCountingType.help", voteName, voteHelp); - return result; + return l(locale, "pollen.voteCountingType.help", voteName, voteHelp); } @Override public final String getHelp(Locale locale) { - String result = l(locale, i18nHelp); - return result; + return l(locale, i18nHelp); } @Override diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java index 979e4a9..e7d05f7 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java @@ -74,9 +74,8 @@ public abstract class AbstractVoteCountingStrategy implements VoteCountingStrate Set<GroupOfVoter> groups = Sets.newHashSet(); voteCount(group, groups); - GroupVoteCountingResult result = GroupVoteCountingResult.newResult( + return GroupVoteCountingResult.newResult( group, groups); - return result; } public Map<String, ChoiceScore> newEmptyChoiceScoreMap(Set<Voter> voters) { @@ -122,8 +121,7 @@ public abstract class AbstractVoteCountingStrategy implements VoteCountingStrate Collections.sort(orderedScores); // transform map of result to list of them (and sort them) - VoteCountingResult result = VoteCountingResult.newResult(orderedScores); - return result; + return VoteCountingResult.newResult(orderedScores); } public Set<String> getAllChoiceIds(Set<Voter> voters) { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java index eeb2166..e42b91d 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java @@ -61,8 +61,7 @@ public class GroupVoteCountingResult implements Serializable { public VoteCountingResult getGroupResult(String groupId) { GroupOfVoter groupOfVoter = groups.get(groupId); - VoteCountingResult result = groupOfVoter.getResult(); - return result; + return groupOfVoter.getResult(); } public void setVoter(GroupOfVoter voter) { diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java index 67f226b..22150b8 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java @@ -78,7 +78,6 @@ public class BordaVoteCountingStrategy extends AbstractVoteCountingStrategy { } // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } } diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java index b31151e..011da92 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java @@ -55,8 +55,7 @@ public class CondorcetVoteCountingStrategy extends AbstractVoteCountingStrategy } // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } protected void addVoterChoices(Voter voter, diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java index 294aef8..9e591c1 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java @@ -71,8 +71,7 @@ public class CoombsVoteCountingStrategy extends AbstractVoteCountingStrategy { totalWeight); // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } protected void round(Map<Voter, List<Set<String>>> topRankChoices, diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java index 62bf3ca..5947816 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java @@ -70,8 +70,7 @@ public class InstantRunoffVoteCountingStrategy extends AbstractVoteCountingStrat totalWeight); // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } protected void round(Map<Voter, List<Set<String>>> topRankChoices, diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java index b931cbe..404348b 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java @@ -51,8 +51,7 @@ public class NormalVoteCountingStrategy extends AbstractVoteCountingStrategy { } // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } protected void addVoterChoices(Voter voter, diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java index 4ba32b0..1c0484f 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java @@ -49,8 +49,7 @@ public class NumberVoteCountingStrategy extends AbstractVoteCountingStrategy { } // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } protected void addVoterChoices(Voter voter, diff --git a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java index 140c4a6..1efb888 100644 --- a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java +++ b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java @@ -49,8 +49,7 @@ public class PercentageVoteCountingStrategy extends AbstractVoteCountingStrategy } // order scores (using their value) and return result - VoteCountingResult result = orderByValues(scores.values()); - return result; + return orderByValues(scores.values()); } protected void addVoterChoices(Voter voter, -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.