You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/11/20 07:55:02 UTC
[1/2] syncope git commit: [SYNCOPE-1236] getTotalCount(), not size()
Repository: syncope
Updated Branches:
refs/heads/2_0_X a6c1798b8 -> ff7e5af0f
refs/heads/master 516063769 -> 30d90566d
[SYNCOPE-1236] getTotalCount(), not size()
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ff7e5af0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ff7e5af0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ff7e5af0
Branch: refs/heads/2_0_X
Commit: ff7e5af0f52919cb20933ae9229baf7575b3cd03
Parents: a6c1798
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 20 08:54:40 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 20 08:54:40 2017 +0100
----------------------------------------------------------------------
.../apache/syncope/client/console/rest/TaskRestClient.java | 7 +++++++
.../client/console/tasks/NotificationTaskDirectoryPanel.java | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/ff7e5af0/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
index 8f2228e..be0929b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
@@ -71,6 +71,13 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
getTotalCount();
}
+ public int count(final AnyTypeKind anyTypeKind, final String entityKey, final String notification) {
+ return getService(TaskService.class).list(
+ new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification).
+ anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
+ getTotalCount();
+ }
+
@Override
public int countExecutions(final String taskKey) {
return getService(TaskService.class).
http://git-wip-us.apache.org/repos/asf/syncope/blob/ff7e5af0/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index 8246956..5a48614 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -218,7 +218,7 @@ public abstract class NotificationTaskDirectoryPanel
@Override
public long size() {
- return restClient.listNotificationTasks(notification, anyTypeKind, entityKey, 1, -1, getSort()).size();
+ return restClient.count(anyTypeKind, entityKey, notification);
}
@Override
[2/2] syncope git commit: [SYNCOPE-1236] getTotalCount(), not size()
Posted by il...@apache.org.
[SYNCOPE-1236] getTotalCount(), not size()
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/30d90566
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/30d90566
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/30d90566
Branch: refs/heads/master
Commit: 30d90566dfe89adbeae9266ad0368b643a806087
Parents: 5160637
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Mon Nov 20 08:54:40 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Mon Nov 20 08:54:52 2017 +0100
----------------------------------------------------------------------
.../apache/syncope/client/console/rest/TaskRestClient.java | 7 +++++++
.../client/console/tasks/NotificationTaskDirectoryPanel.java | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/30d90566/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
index 8f2228e..be0929b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/TaskRestClient.java
@@ -71,6 +71,13 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
getTotalCount();
}
+ public int count(final AnyTypeKind anyTypeKind, final String entityKey, final String notification) {
+ return getService(TaskService.class).list(
+ new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification).
+ anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
+ getTotalCount();
+ }
+
@Override
public int countExecutions(final String taskKey) {
return getService(TaskService.class).
http://git-wip-us.apache.org/repos/asf/syncope/blob/30d90566/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index 5ed2e05..5cd47c7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -218,7 +218,7 @@ public abstract class NotificationTaskDirectoryPanel
@Override
public long size() {
- return restClient.listNotificationTasks(notification, anyTypeKind, entityKey, 1, -1, getSort()).size();
+ return restClient.count(anyTypeKind, entityKey, notification);
}
@Override