Repository: syncope
Updated Branches:
  refs/heads/2_0_X b6419fbce -> 29f9c5e39
  refs/heads/master e2ef768b1 -> 3aba0a577


Polishing few methods for paginated results


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3aba0a57
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3aba0a57
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3aba0a57

Branch: refs/heads/master
Commit: 3aba0a577b21fa6c064ba4a1d0fbd1fe546ead31
Parents: e2ef768
Author: Francesco Chicchiriccò <[email protected]>
Authored: Thu Sep 21 14:08:18 2017 +0200
Committer: Francesco Chicchiriccò <[email protected]>
Committed: Thu Sep 21 14:08:18 2017 +0200

----------------------------------------------------------------------
 .../core/logic/AbstractExecutableLogic.java     |  6 ++--
 .../syncope/core/logic/AccessTokenLogic.java    | 13 ++++---
 .../apache/syncope/core/logic/ReportLogic.java  | 15 ++++----
 .../apache/syncope/core/logic/TaskLogic.java    | 36 ++++++++------------
 .../cxf/service/AbstractExecutableService.java  | 12 +++----
 .../cxf/service/AccessTokenServiceImpl.java     | 10 +++---
 .../core/rest/cxf/service/TaskServiceImpl.java  | 28 ++++++---------
 7 files changed, 50 insertions(+), 70 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractExecutableLogic.java
----------------------------------------------------------------------
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractExecutableLogic.java
 
b/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractExecutableLogic.java
index 8a7d677..d1b7cb3 100644
--- 
a/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractExecutableLogic.java
+++ 
b/core/logic/src/main/java/org/apache/syncope/core/logic/AbstractExecutableLogic.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.logic;
 
 import java.util.Date;
 import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.lib.AbstractBaseBean;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ExecTO;
@@ -31,9 +32,8 @@ public abstract class AbstractExecutableLogic<T extends 
AbstractBaseBean> extend
 
     public abstract ExecTO execute(String key, Date startAt, boolean dryRun);
 
-    public abstract int countExecutions(String key);
-
-    public abstract List<ExecTO> listExecutions(String key, int page, int 
size, List<OrderByClause> orderByClauses);
+    public abstract Pair<Integer, List<ExecTO>> listExecutions(
+            String key, int page, int size, List<OrderByClause> 
orderByClauses);
 
     public abstract List<ExecTO> listRecentExecutions(int max);
 

http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
----------------------------------------------------------------------
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
index ee3877f..077b6df 100644
--- 
a/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
+++ 
b/core/logic/src/main/java/org/apache/syncope/core/logic/AccessTokenLogic.java
@@ -103,18 +103,17 @@ public class AccessTokenLogic extends 
AbstractTransactionalLogic<AccessTokenTO>
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.ACCESS_TOKEN_LIST + "')")
-    public int count() {
-        return accessTokenDAO.count();
-    }
-
-    @PreAuthorize("hasRole('" + StandardEntitlement.ACCESS_TOKEN_LIST + "')")
-    public List<AccessTokenTO> list(
+    public Pair<Integer, List<AccessTokenTO>> list(
             final int page,
             final int size,
             final List<OrderByClause> orderByClauses) {
 
-        return accessTokenDAO.findAll(page, size, orderByClauses).stream().
+        Integer count = accessTokenDAO.count();
+
+        List<AccessTokenTO> result = accessTokenDAO.findAll(page, size, 
orderByClauses).stream().
                 map(accessToken -> 
binder.getAccessTokenTO(accessToken)).collect(Collectors.toList());
+
+        return Pair.of(count, result);
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.ACCESS_TOKEN_DELETE + "')")

http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
----------------------------------------------------------------------
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
index 854870f..67b3747 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReportLogic.java
@@ -36,6 +36,7 @@ import org.apache.cocoon.sax.component.XMLGenerator;
 import org.apache.cocoon.sax.component.XMLSerializer;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.to.BulkActionResult;
@@ -292,13 +293,7 @@ public class ReportLogic extends 
AbstractExecutableLogic<ReportTO> {
 
     @PreAuthorize("hasRole('" + StandardEntitlement.REPORT_READ + "')")
     @Override
-    public int countExecutions(final String key) {
-        return reportExecDAO.count(key);
-    }
-
-    @PreAuthorize("hasRole('" + StandardEntitlement.REPORT_READ + "')")
-    @Override
-    public List<ExecTO> listExecutions(
+    public Pair<Integer, List<ExecTO>> listExecutions(
             final String key, final int page, final int size, final 
List<OrderByClause> orderByClauses) {
 
         Report report = reportDAO.find(key);
@@ -306,8 +301,12 @@ public class ReportLogic extends 
AbstractExecutableLogic<ReportTO> {
             throw new NotFoundException("Report " + key);
         }
 
-        return reportExecDAO.findAll(report, page, size, 
orderByClauses).stream().
+        Integer count = reportExecDAO.count(key);
+
+        List<ExecTO> result = reportExecDAO.findAll(report, page, size, 
orderByClauses).stream().
                 map(reportExec -> 
binder.getExecTO(reportExec)).collect(Collectors.toList());
+
+        return Pair.of(count, result);
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.REPORT_LIST + "')")

http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
----------------------------------------------------------------------
diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
index f7fbe1e..8bdb059 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/TaskLogic.java
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.lang3.tuple.Triple;
 import org.apache.syncope.common.lib.SyncopeClientException;
 import org.apache.syncope.common.lib.to.AbstractTaskTO;
@@ -144,20 +145,8 @@ public class TaskLogic extends 
AbstractExecutableLogic<AbstractTaskTO> {
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.TASK_LIST + "')")
-    public int count(
-            final TaskType type,
-            final String resource,
-            final String notification,
-            final AnyTypeKind anyTypeKind,
-            final String anyTypeKey) {
-
-        return taskDAO.count(
-                type, resourceDAO.find(resource), 
notificationDAO.find(notification), anyTypeKind, anyTypeKey);
-    }
-
-    @PreAuthorize("hasRole('" + StandardEntitlement.TASK_LIST + "')")
     @SuppressWarnings("unchecked")
-    public <T extends AbstractTaskTO> List<T> list(
+    public <T extends AbstractTaskTO> Pair<Integer, List<T>> list(
             final TaskType type,
             final String resource,
             final String notification,
@@ -168,11 +157,16 @@ public class TaskLogic extends 
AbstractExecutableLogic<AbstractTaskTO> {
             final List<OrderByClause> orderByClauses,
             final boolean details) {
 
-        return taskDAO.findAll(
+        int count = taskDAO.count(
+                type, resourceDAO.find(resource), 
notificationDAO.find(notification), anyTypeKind, entityKey);
+
+        List<T> result = taskDAO.findAll(
                 type, resourceDAO.find(resource), 
notificationDAO.find(notification), anyTypeKind, entityKey,
                 page, size, orderByClauses).stream().
                 <T>map(task -> binder.getTaskTO(task, 
taskUtilsFactory.getInstance(type), details)).
                 collect(Collectors.toList());
+
+        return Pair.of(count, result);
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.TASK_READ + "')")
@@ -277,13 +271,7 @@ public class TaskLogic extends 
AbstractExecutableLogic<AbstractTaskTO> {
 
     @PreAuthorize("hasRole('" + StandardEntitlement.TASK_READ + "')")
     @Override
-    public int countExecutions(final String key) {
-        return taskExecDAO.count(key);
-    }
-
-    @PreAuthorize("hasRole('" + StandardEntitlement.TASK_READ + "')")
-    @Override
-    public List<ExecTO> listExecutions(
+    public Pair<Integer, List<ExecTO>> listExecutions(
             final String key, final int page, final int size, final 
List<OrderByClause> orderByClauses) {
 
         Task task = taskDAO.find(key);
@@ -291,8 +279,12 @@ public class TaskLogic extends 
AbstractExecutableLogic<AbstractTaskTO> {
             throw new NotFoundException("Task " + key);
         }
 
-        return taskExecDAO.findAll(task, page, size, orderByClauses).stream().
+        Integer count = taskExecDAO.count(key);
+
+        List<ExecTO> result = taskExecDAO.findAll(task, page, size, 
orderByClauses).stream().
                 map(taskExec -> 
binder.getExecTO(taskExec)).collect(Collectors.toList());
+
+        return Pair.of(count, result);
     }
 
     @PreAuthorize("hasRole('" + StandardEntitlement.TASK_LIST + "')")

http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractExecutableService.java
----------------------------------------------------------------------
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractExecutableService.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractExecutableService.java
index c6a1917..aadbaf3 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractExecutableService.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractExecutableService.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.core.rest.cxf.service;
 
 import java.util.List;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.lib.to.BulkActionResult;
 import org.apache.syncope.common.lib.to.ExecTO;
 import org.apache.syncope.common.lib.to.JobTO;
@@ -36,15 +37,12 @@ public abstract class AbstractExecutableService extends 
AbstractServiceImpl impl
 
     @Override
     public PagedResult<ExecTO> listExecutions(final ExecQuery query) {
-        return buildPagedResult(
-                getExecutableLogic().listExecutions(
-                        query.getKey(),
-                        query.getPage(),
-                        query.getSize(),
-                        getOrderByClauses(query.getOrderBy())),
+        Pair<Integer, List<ExecTO>> result = 
getExecutableLogic().listExecutions(
+                query.getKey(),
                 query.getPage(),
                 query.getSize(),
-                getExecutableLogic().countExecutions(query.getKey()));
+                getOrderByClauses(query.getOrderBy()));
+        return buildPagedResult(result.getRight(), query.getPage(), 
query.getSize(), result.getLeft());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AccessTokenServiceImpl.java
----------------------------------------------------------------------
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AccessTokenServiceImpl.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AccessTokenServiceImpl.java
index 54db9cc..2b09324 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AccessTokenServiceImpl.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AccessTokenServiceImpl.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.core.rest.cxf.service;
 
 import java.util.Date;
+import java.util.List;
 import javax.ws.rs.core.Response;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -64,14 +65,11 @@ public class AccessTokenServiceImpl extends 
AbstractServiceImpl implements Acces
 
     @Override
     public PagedResult<AccessTokenTO> list(final AccessTokenQuery query) {
-        return buildPagedResult(
-                logic.list(
-                        query.getPage(),
-                        query.getSize(),
-                        getOrderByClauses(query.getOrderBy())),
+        Pair<Integer, List<AccessTokenTO>> result = logic.list(
                 query.getPage(),
                 query.getSize(),
-                logic.count());
+                getOrderByClauses(query.getOrderBy()));
+        return buildPagedResult(result.getRight(), query.getPage(), 
query.getSize(), result.getLeft());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/syncope/blob/3aba0a57/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
----------------------------------------------------------------------
diff --git 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
index f19aa87..1d1b612 100644
--- 
a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
+++ 
b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/TaskServiceImpl.java
@@ -19,8 +19,10 @@
 package org.apache.syncope.core.rest.cxf.service;
 
 import java.net.URI;
+import java.util.List;
 import javax.ws.rs.BadRequestException;
 import javax.ws.rs.core.Response;
+import org.apache.commons.lang3.tuple.Pair;
 import org.apache.syncope.common.lib.to.AbstractTaskTO;
 import org.apache.syncope.common.lib.to.BulkAction;
 import org.apache.syncope.common.lib.to.BulkActionResult;
@@ -68,25 +70,17 @@ public class TaskServiceImpl extends 
AbstractExecutableService implements TaskSe
     @SuppressWarnings("unchecked")
     @Override
     public <T extends AbstractTaskTO> PagedResult<T> list(final TaskQuery 
query) {
-        return (PagedResult<T>) buildPagedResult(
-                logic.list(
-                        query.getType(),
-                        query.getResource(),
-                        query.getNotification(),
-                        query.getAnyTypeKind(),
-                        query.getEntityKey(),
-                        query.getPage(),
-                        query.getSize(),
-                        getOrderByClauses(query.getOrderBy()),
-                        query.getDetails()),
+        Pair<Integer, List<T>> result = logic.list(
+                query.getType(),
+                query.getResource(),
+                query.getNotification(),
+                query.getAnyTypeKind(),
+                query.getEntityKey(),
                 query.getPage(),
                 query.getSize(),
-                logic.count(
-                        query.getType(),
-                        query.getResource(),
-                        query.getNotification(),
-                        query.getAnyTypeKind(),
-                        query.getEntityKey()));
+                getOrderByClauses(query.getOrderBy()),
+                query.getDetails());
+        return buildPagedResult(result.getRight(), query.getPage(), 
query.getSize(), result.getLeft());
     }
 
     @Override

Reply via email to