From f11fe9cdeff7a1abb84d6f434230b0f128001b94 Mon Sep 17 00:00:00 2001 From: apremalal Date: Thu, 9 May 2013 14:19:20 +0530 Subject: [PATCH] enabled retrieve all items from paginated end points --- .../service/JournalEntryReadPlatformServiceImpl.java | 12 +++++++----- .../service/ClientReadPlatformServiceImpl.java | 7 +++---- .../group/service/CenterReadPlatformServiceImpl.java | 9 ++++----- .../group/service/GroupReadPlatformServiceImpl.java | 7 +++---- .../portfolio/group/service/SearchParameters.java | 11 ++++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java index 0e4c61add..02f50f824 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/accounting/journalentry/service/JournalEntryReadPlatformServiceImpl.java @@ -169,11 +169,13 @@ public class JournalEntryReadPlatformServiceImpl implements JournalEntryReadPlat maxLimitAllowed = limit; } sqlBuilder.append(" limit ").append(maxLimitAllowed); - } - - if (offset != null) { - sqlBuilder.append(" offset ").append(offset); - } + if (offset != null) { + sqlBuilder.append(" offset ").append(offset); + } + } else if (limit != null && limit == -1) { + ; + } else + sqlBuilder.append(" limit ").append(200); final Object[] finalObjectArray = Arrays.copyOf(objectArray, arrayPos); final String sqlCountRows = "SELECT FOUND_ROWS()"; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java index 12af6a2b7..42efd7cf4 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/service/ClientReadPlatformServiceImpl.java @@ -103,10 +103,9 @@ public class ClientReadPlatformServiceImpl implements ClientReadPlatformService if (searchParameters.isLimited()) { sqlBuilder.append(" limit ").append(searchParameters.getLimit()); - } - - if (searchParameters.isOffset()) { - sqlBuilder.append(" offset ").append(searchParameters.getOffset()); + if (searchParameters.isOffset()) { + sqlBuilder.append(" offset ").append(searchParameters.getOffset()); + } } final String sqlCountRows = "SELECT FOUND_ROWS()"; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java index 352494b17..bfa5e3cd6 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/CenterReadPlatformServiceImpl.java @@ -208,11 +208,10 @@ public class CenterReadPlatformServiceImpl implements CenterReadPlatformService if (searchParameters.isLimited()) { sqlBuilder.append(" limit ").append(searchParameters.getLimit()); - } - - if (searchParameters.isOffset()) { - sqlBuilder.append(" offset ").append(searchParameters.getOffset()); - } + if (searchParameters.isOffset()) { + sqlBuilder.append(" offset ").append(searchParameters.getOffset()); + } + } final String sqlCountRows = "SELECT FOUND_ROWS()"; return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlCountRows, sqlBuilder.toString(), diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java index ca96d8a6c..bf7baad6a 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java @@ -126,10 +126,9 @@ public class GroupReadPlatformServiceImpl implements GroupReadPlatformService { if (searchParameters.isLimited()) { sqlBuilder.append(" limit ").append(searchParameters.getLimit()); - } - - if (searchParameters.isOffset()) { - sqlBuilder.append(" offset ").append(searchParameters.getOffset()); + if (searchParameters.isOffset()) { + sqlBuilder.append(" offset ").append(searchParameters.getOffset()); + } } final String sqlCountRows = "SELECT FOUND_ROWS()"; diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java index 1efdc3362..5ecfef19e 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/SearchParameters.java @@ -70,12 +70,13 @@ public final class SearchParameters { return StringUtils.isNotBlank(this.sortOrder); } - public static Integer getCheckedLimit(Integer maxLimitAllowed, Integer limit) - { + public static Integer getCheckedLimit(Integer maxLimitAllowed, Integer limit) { if (limit != null && limit < maxLimitAllowed && limit > 0) { - maxLimitAllowed = limit; - } - return maxLimitAllowed; + return limit; + } else if (limit != null && limit == -1) { + return null; + } else + return maxLimitAllowed; } public String getSqlSearch() {