This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 7b34066b2d3c4109754e69ea7163c3c085a17ee0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed May 28 08:15:30 2014 +0200 rename pagination beans --- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 8 ++++---- .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 8 ++++---- .../org/chorem/pollen/rest/api/v1/PollApi.java | 20 +++++++++--------- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 8 ++++---- ...Parameter.java => PaginationParameterBean.java} | 6 +++--- ...ginationList.java => PaginationResultBean.java} | 2 +- .../chorem/pollen/services/bean/PollenBeans.java | 4 ++-- .../pollen/services/service/CommentService.java | 12 +++++------ .../services/service/FavoriteListService.java | 12 +++++------ .../pollen/services/service/PollService.java | 24 +++++++++++----------- .../services/service/PollenServiceSupport.java | 10 ++++----- .../pollen/services/service/PollenUserService.java | 12 +++++------ .../services/service/PollenUserServiceTest.java | 4 ++-- 13 files changed, 65 insertions(+), 65 deletions(-) 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 cfbcdfd..e1002f6 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 @@ -26,10 +26,10 @@ package org.chorem.pollen.rest.api.v1; import org.chorem.pollen.persistence.entity.Comment; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.services.bean.CommentBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.service.CommentService; import org.chorem.pollen.services.service.InvalidFormException; import org.debux.webmotion.server.WebMotionController; @@ -43,9 +43,9 @@ import org.debux.webmotion.server.WebMotionController; */ public class CommentApi extends WebMotionController { - public PollenPaginationList<CommentBean> getComments(CommentService commentService, PollenEntityId<Poll> pollId, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<CommentBean> getComments(CommentService commentService, PollenEntityId<Poll> pollId, PaginationParameterBean paginationParameter) { - PollenPaginationList<CommentBean> comments = commentService.getComments(pollId.getEntityId(), paginationParameter); + PaginationResultBean<CommentBean> comments = commentService.getComments(pollId.getEntityId(), paginationParameter); return comments; } 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 101e4d8..76e7d8f 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 @@ -27,10 +27,10 @@ import org.chorem.pollen.persistence.entity.FavoriteList; import org.chorem.pollen.persistence.entity.FavoriteListMember; import org.chorem.pollen.services.bean.FavoriteListBean; import org.chorem.pollen.services.bean.FavoriteListMemberBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; import org.chorem.pollen.services.service.FavoriteListImportException; import org.chorem.pollen.services.service.FavoriteListService; import org.chorem.pollen.services.service.InvalidFormException; @@ -47,9 +47,9 @@ import java.util.Set; */ public class FavoriteListApi extends WebMotionController { - public PollenPaginationList<FavoriteListBean> getFavoriteLists(FavoriteListService favoriteListService, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<FavoriteListBean> getFavoriteLists(FavoriteListService favoriteListService, PaginationParameterBean paginationParameter) { - PollenPaginationList<FavoriteListBean> favoriteLists = favoriteListService.getFavoriteLists(paginationParameter); + PaginationResultBean<FavoriteListBean> favoriteLists = favoriteListService.getFavoriteLists(paginationParameter); return favoriteLists; } 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 a1937b5..ece5097 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 @@ -26,11 +26,11 @@ package org.chorem.pollen.rest.api.v1; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.rest.api.PollenRestApiUtil; import org.chorem.pollen.services.bean.ChoiceBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollBean; import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.VoterListBean; import org.chorem.pollen.services.service.InvalidFormException; import org.chorem.pollen.services.service.PollService; @@ -54,30 +54,30 @@ public class PollApi extends WebMotionController { } - public PollenPaginationList<PollBean> getPolls(PollService pollService, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PollenPaginationList<PollBean> polls = pollService.getPolls(paginationParameter); + PaginationResultBean<PollBean> polls = pollService.getPolls(paginationParameter); return polls; } - public PollenPaginationList<PollBean> getCreatedPolls(PollService pollService, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getCreatedPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PollenPaginationList<PollBean> polls = pollService.getCreatedPolls(paginationParameter); + PaginationResultBean<PollBean> polls = pollService.getCreatedPolls(paginationParameter); return polls; } - public PollenPaginationList<PollBean> getInvitedPolls(PollService pollService, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getInvitedPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PollenPaginationList<PollBean> polls = pollService.getInvitedPolls(paginationParameter); + PaginationResultBean<PollBean> polls = pollService.getInvitedPolls(paginationParameter); return polls; } - public PollenPaginationList<PollBean> getParticipatedPolls(PollService pollService, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getParticipatedPolls(PollService pollService, PaginationParameterBean paginationParameter) { - PollenPaginationList<PollBean> polls = pollService.getParticipatedPolls(paginationParameter); + PaginationResultBean<PollBean> polls = pollService.getParticipatedPolls(paginationParameter); return polls; } 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 5be41ec..5bf3b60 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 @@ -24,10 +24,10 @@ package org.chorem.pollen.rest.api.v1; */ import org.chorem.pollen.persistence.entity.PollenUser; +import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollenEntityId; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.service.InvalidFormException; import org.chorem.pollen.services.service.PollenUserService; @@ -43,9 +43,9 @@ import org.debux.webmotion.server.WebMotionController; */ public class PollenUserApi extends WebMotionController { - public PollenPaginationList<PollenUserBean> getUsers(PollenUserService pollenUserService, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollenUserBean> getUsers(PollenUserService pollenUserService, PaginationParameterBean paginationParameter) { - PollenPaginationList<PollenUserBean> users = pollenUserService.getUsers(paginationParameter); + PaginationResultBean<PollenUserBean> users = pollenUserService.getUsers(paginationParameter); return users; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenPaginationParameter.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java similarity index 90% rename from pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenPaginationParameter.java rename to pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java index 46a631d..a621328 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenPaginationParameter.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationParameterBean.java @@ -29,7 +29,7 @@ import org.nuiton.util.pagination.PaginationParameter; * @author Tony Chemit <chemit@codelutin.com> * @since 2.0 */ -public class PollenPaginationParameter { +public class PaginationParameterBean { /** * 0-based page number @@ -41,8 +41,8 @@ public class PollenPaginationParameter { */ protected int pageSize; - public static PollenPaginationParameter of(int pageNumber, int pageSize) { - PollenPaginationParameter result = new PollenPaginationParameter(); + public static PaginationParameterBean of(int pageNumber, int pageSize) { + PaginationParameterBean result = new PaginationParameterBean(); result.setPageNumber(pageNumber); result.setPageSize(pageSize); return result; diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenPaginationList.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java similarity index 96% rename from pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenPaginationList.java rename to pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java index c14dbb3..79b08c3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenPaginationList.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java @@ -29,7 +29,7 @@ import java.util.List; * @author Tony Chemit <chemit@codelutin.com> * @since 2.0 */ -public class PollenPaginationList<O extends PollenBean> { +public class PaginationResultBean<O extends PollenBean> { protected List<O> elements; 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 0f460c5..7a2c2fc 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 @@ -60,11 +60,11 @@ public class PollenBeans { } - public static <E extends TopiaEntity, B extends PollenBean<E>> PollenPaginationList<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities, Function<B, B> beanFunction) { + public static <E extends TopiaEntity, B extends PollenBean<E>> PaginationResultBean<B> toBean(Class<B> beanType, PaginationResult<E> entities, Function<B, B> beanFunction) { ImmutableList<B> bs = toBeanList(beanType, entities.getElements(), beanFunction); - PollenPaginationList<B> result = new PollenPaginationList<>(); + PaginationResultBean<B> result = new PaginationResultBean<>(); result.setElements(bs); result.setPageSize(entities.getCurrentPage().getPageSize()); result.setCurrentPage(entities.getCurrentPage().getPageNumber()); 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 bceb5ba..34ec81f 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 @@ -28,9 +28,9 @@ import org.chorem.pollen.persistence.entity.Comment; import org.chorem.pollen.persistence.entity.Poll; import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.services.bean.CommentBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.service.security.PermissionVerb; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -53,7 +53,7 @@ public class CommentService extends PollenServiceSupport { } }; - public PollenPaginationList<CommentBean> getComments(String pollId, PollenPaginationParameter paginationParameter) { + public PaginationResultBean<CommentBean> getComments(String pollId, PaginationParameterBean paginationParameter) { checkNotNull(pollId); @@ -62,7 +62,7 @@ public class CommentService extends PollenServiceSupport { PaginationResult<Comment> comments = getCommentDao().find(poll, page); - PollenPaginationList<CommentBean> commentBeans = toPaginationListBean(CommentBean.class, comments, commentFunction); + PaginationResultBean<CommentBean> commentBeans = toPaginationListBean(CommentBean.class, comments, commentFunction); return commentBeans; @@ -205,12 +205,12 @@ public class CommentService extends PollenServiceSupport { } - protected PaginationParameter getPaginationParameter(PollenPaginationParameter paginationParameter) { + protected PaginationParameter getPaginationParameter(PaginationParameterBean paginationParameter) { if (paginationParameter == null) { int pageSize = getPollenServiceConfig().getDefaultCommentPaginationSize(); - paginationParameter = PollenPaginationParameter.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, pageSize); } 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 ba9a07b..4c14481 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 @@ -35,9 +35,9 @@ import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.services.PollenTechnicalException; import org.chorem.pollen.services.bean.FavoriteListBean; import org.chorem.pollen.services.bean.FavoriteListMemberBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; import org.nuiton.util.StringUtil; import org.nuiton.util.pagination.PaginationParameter; import org.nuiton.util.pagination.PaginationResult; @@ -69,7 +69,7 @@ import static org.nuiton.i18n.I18n.l; */ public class FavoriteListService extends PollenServiceSupport { - public PollenPaginationList<FavoriteListBean> getFavoriteLists(PollenPaginationParameter paginationParameter) { + public PaginationResultBean<FavoriteListBean> getFavoriteLists(PaginationParameterBean paginationParameter) { checkIsConnected(); @@ -78,7 +78,7 @@ public class FavoriteListService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<FavoriteList> favoriteLists = getFavoriteListDao().forPollenUserEquals(user).findPage(page); - PollenPaginationList<FavoriteListBean> favoriteListBeans = toPaginationListBean(FavoriteListBean.class, favoriteLists); + PaginationResultBean<FavoriteListBean> favoriteListBeans = toPaginationListBean(FavoriteListBean.class, favoriteLists); return favoriteListBeans; } @@ -640,12 +640,12 @@ public class FavoriteListService extends PollenServiceSupport { } - protected PaginationParameter getPaginationParameter(PollenPaginationParameter paginationParameter) { + protected PaginationParameter getPaginationParameter(PaginationParameterBean paginationParameter) { if (paginationParameter == null) { int pageSize = getPollenServiceConfig().getDefaultFavoriteListPaginationSize(); - paginationParameter = PollenPaginationParameter.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, pageSize); } 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 af9f7a1..3212d22 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 @@ -31,10 +31,10 @@ import org.chorem.pollen.persistence.entity.PollenPrincipal; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.VoterList; import org.chorem.pollen.services.bean.ChoiceBean; +import org.chorem.pollen.services.bean.PaginationParameterBean; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollBean; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; import org.chorem.pollen.services.bean.VoterListBean; import org.chorem.pollen.services.service.security.PermissionVerb; import org.nuiton.util.pagination.PaginationParameter; @@ -66,19 +66,19 @@ public class PollService extends PollenServiceSupport { } }; - public PollenPaginationList<PollBean> getPolls(PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getPolls(PaginationParameterBean paginationParameter) { checkIsConnected(); checkIsAdmin(); PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().forAll().findPage(page); - PollenPaginationList<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); return pollBeans; } - public PollenPaginationList<PollBean> getCreatedPolls(PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getCreatedPolls(PaginationParameterBean paginationParameter) { checkIsConnected(); @@ -86,12 +86,12 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllCreated(connectedUser, page); - PollenPaginationList<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); return pollBeans; } - public PollenPaginationList<PollBean> getInvitedPolls(PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getInvitedPolls(PaginationParameterBean paginationParameter) { checkIsConnected(); @@ -99,12 +99,12 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllInvited(connectedUser, page); - PollenPaginationList<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); return pollBeans; } - public PollenPaginationList<PollBean> getParticipatedPolls(PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollBean> getParticipatedPolls(PaginationParameterBean paginationParameter) { checkIsConnected(); @@ -112,7 +112,7 @@ public class PollService extends PollenServiceSupport { PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<Poll> polls = getPollDao().findAllParticipated(connectedUser, page); - PollenPaginationList<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); + PaginationResultBean<PollBean> pollBeans = toPaginationListBean(PollBean.class, polls); return pollBeans; } @@ -431,12 +431,12 @@ public class PollService extends PollenServiceSupport { } - protected PaginationParameter getPaginationParameter(PollenPaginationParameter paginationParameter) { + protected PaginationParameter getPaginationParameter(PaginationParameterBean paginationParameter) { if (paginationParameter == null) { int pageSize = getPollenServiceConfig().getDefaultPollPaginationSize(); - paginationParameter = PollenPaginationParameter.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, pageSize); } 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 b4ceb4d..77e8a12 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 @@ -48,7 +48,7 @@ import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.bean.PollenBean; import org.chorem.pollen.services.bean.PollenBeans; -import org.chorem.pollen.services.bean.PollenPaginationList; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.config.PollenServiceConfig; import org.chorem.pollen.services.service.mail.EmailService; import org.chorem.pollen.services.service.security.PermissionVerb; @@ -429,16 +429,16 @@ public abstract class PollenServiceSupport implements PollenService { } - protected <E extends TopiaEntity, B extends PollenBean<E>> PollenPaginationList<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities) { + protected <E extends TopiaEntity, B extends PollenBean<E>> PaginationResultBean<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities) { - PollenPaginationList<B> result = toPaginationListBean(beanType, entities, null); + PaginationResultBean<B> result = toPaginationListBean(beanType, entities, null); return result; } - protected <E extends TopiaEntity, B extends PollenBean<E>> PollenPaginationList<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities, Function<B, B> beanFunction) { + protected <E extends TopiaEntity, B extends PollenBean<E>> PaginationResultBean<B> toPaginationListBean(Class<B> beanType, PaginationResult<E> entities, Function<B, B> beanFunction) { - PollenPaginationList<B> result = PollenBeans.toPaginationListBean(beanType, entities, beanFunction); + PaginationResultBean<B> result = PollenBeans.toBean(beanType, entities, beanFunction); return result; } 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 f5d011e..f61fe51 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 @@ -29,9 +29,9 @@ import org.chorem.pollen.persistence.entity.PollenToken; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.persistence.entity.PollenUserTopiaDao; import org.chorem.pollen.services.PollenService; +import org.chorem.pollen.services.bean.PaginationParameterBean; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; -import org.chorem.pollen.services.bean.PollenPaginationParameter; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.service.security.PollenInvalidEmailActivationTokenException; import org.chorem.pollen.services.service.security.PollenInvalidPasswordException; @@ -56,7 +56,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } }; - public PollenPaginationList<PollenUserBean> getUsers(PollenPaginationParameter paginationParameter) { + public PaginationResultBean<PollenUserBean> getUsers(PaginationParameterBean paginationParameter) { checkIsConnected(); checkIsAdmin(); @@ -64,7 +64,7 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer PaginationParameter page = getPaginationParameter(paginationParameter); PaginationResult<PollenUser> pollenUsers = getPollenUserDao().forAll().findPage(page); - PollenPaginationList<PollenUserBean> pollenUserBeans = toPaginationListBean(PollenUserBean.class, pollenUsers, pollenUserFunction); + PaginationResultBean<PollenUserBean> pollenUserBeans = toPaginationListBean(PollenUserBean.class, pollenUsers, pollenUserFunction); return pollenUserBeans; @@ -326,12 +326,12 @@ public class PollenUserService extends PollenServiceSupport implements PollenSer } - protected PaginationParameter getPaginationParameter(PollenPaginationParameter paginationParameter) { + protected PaginationParameter getPaginationParameter(PaginationParameterBean paginationParameter) { if (paginationParameter == null) { int pageSize = getPollenServiceConfig().getDefaultPollenUserPaginationSize(); - paginationParameter = PollenPaginationParameter.of(0, pageSize); + paginationParameter = PaginationParameterBean.of(0, pageSize); } diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java index 6f964d1..0cdac80 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/service/PollenUserServiceTest.java @@ -26,8 +26,8 @@ package org.chorem.pollen.services.service; import org.apache.commons.collections4.CollectionUtils; import org.chorem.pollen.persistence.entity.PollenUser; import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.bean.PaginationResultBean; import org.chorem.pollen.services.bean.PollenEntityRef; -import org.chorem.pollen.services.bean.PollenPaginationList; import org.chorem.pollen.services.bean.PollenUserBean; import org.chorem.pollen.services.service.security.PollenAuthenticationException; import org.chorem.pollen.services.service.security.PollenInvalidSessionTokenException; @@ -68,7 +68,7 @@ public class PollenUserServiceTest extends AbstractPollenServiceTest { login("jean", "fake"); - PollenPaginationList<PollenUserBean> users = service.getUsers(null); + PaginationResultBean<PollenUserBean> users = service.getUsers(null); Assert.assertNotNull(users); Assert.assertTrue(CollectionUtils.isNotEmpty(users.getElements())); -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.