Author: athimel Date: 2014-05-22 00:10:11 +0200 (Thu, 22 May 2014) New Revision: 3126 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3126 Log: refs #3208 PaginationParameter : use builder internaly Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java 2014-05-21 21:56:15 UTC (rev 3125) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/PaginationParameter.java 2014-05-21 22:10:11 UTC (rev 3126) @@ -25,8 +25,8 @@ */ import java.io.Serializable; -import java.util.ArrayList; import java.util.Collections; +import java.util.LinkedList; import java.util.List; import com.google.common.base.Preconditions; @@ -48,7 +48,7 @@ protected List<PaginationOrder> orderClauses; private PaginationParameter(int pageNumber, int pageSize) { - this(pageNumber, pageSize, new ArrayList<PaginationOrder>()); + this(pageNumber, pageSize, new LinkedList<PaginationOrder>()); } private PaginationParameter(int pageNumber, int pageSize, List<PaginationOrder> orderClauses) { @@ -64,32 +64,29 @@ public static PaginationParameter of(int pageNumber, int pageSize, String orderClause1, boolean orderDesc1) { - List<PaginationOrder> orderClauses = Lists.newArrayListWithCapacity(3); - orderClauses.add(new PaginationOrder(orderClause1, orderDesc1)); - PaginationParameter result = new PaginationParameter(pageNumber, pageSize, orderClauses); - return result; + return builder(pageNumber, pageSize) + .addOrder(orderClause1, orderDesc1) + .build(); } public static PaginationParameter of(int pageNumber, int pageSize, String orderClause1, boolean orderDesc1, String orderClause2, boolean orderDesc2) { - List<PaginationOrder> orderClauses = Lists.newArrayListWithCapacity(3); - orderClauses.add(new PaginationOrder(orderClause1, orderDesc1)); - orderClauses.add(new PaginationOrder(orderClause2, orderDesc2)); - PaginationParameter result = new PaginationParameter(pageNumber, pageSize, orderClauses); - return result; + return builder(pageNumber, pageSize) + .addOrder(orderClause1, orderDesc1) + .addOrder(orderClause2, orderDesc2) + .build(); } public static PaginationParameter of(int pageNumber, int pageSize, String orderClause1, boolean orderDesc1, String orderClause2, boolean orderDesc2, String orderClause3, boolean orderDesc3) { - List<PaginationOrder> orderClauses = Lists.newArrayListWithCapacity(3); - orderClauses.add(new PaginationOrder(orderClause1, orderDesc1)); - orderClauses.add(new PaginationOrder(orderClause2, orderDesc2)); - orderClauses.add(new PaginationOrder(orderClause3, orderDesc3)); - PaginationParameter result = new PaginationParameter(pageNumber, pageSize, orderClauses); - return result; + return builder(pageNumber, pageSize) + .addOrder(orderClause1, orderDesc1) + .addOrder(orderClause2, orderDesc2) + .addOrder(orderClause3, orderDesc3) + .build(); } public static PaginationParameter.Builder builder(int pageNumber, int pageSize) { @@ -141,7 +138,7 @@ public Builder addOrder(String clause, boolean desc) { if (orderClauses == null) { - orderClauses = Lists.newArrayList(); + orderClauses = Lists.newLinkedList(); } PaginationOrder paginationOrder = new PaginationOrder(clause, desc); orderClauses.add(paginationOrder); @@ -169,7 +166,7 @@ public Builder addOrderClauses(Iterable<PaginationOrder> clauses) { if (orderClauses == null) { - orderClauses = Lists.newArrayList(); + orderClauses = Lists.newLinkedList(); } if (clauses != null) { Iterables.addAll(orderClauses, clauses);