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/03/14 11:22:10 UTC
[3/6] syncope git commit: [SYNCOPE-1046] Delegate execution sort to
core
[SYNCOPE-1046] Delegate execution sort to core
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b799c036
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b799c036
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b799c036
Branch: refs/heads/2_0_X
Commit: b799c03657675123566c75a5b0e92ab344b32a1b
Parents: 00f0e7f
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Mar 14 12:21:41 2017 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Mar 14 12:21:41 2017 +0100
----------------------------------------------------------------------
.../client/console/rest/ExecutionRestClient.java | 7 ++++---
.../syncope/client/console/rest/ReportRestClient.java | 8 ++++++--
.../syncope/client/console/rest/TaskRestClient.java | 14 ++++++++------
.../console/tasks/ExecutionsDirectoryPanel.java | 2 +-
4 files changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b799c036/client/console/src/main/java/org/apache/syncope/client/console/rest/ExecutionRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/ExecutionRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/ExecutionRestClient.java
index aa0d59a..8cde692 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ExecutionRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ExecutionRestClient.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.rest;
import java.util.Date;
import java.util.List;
import org.apache.syncope.common.lib.to.ExecTO;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
public interface ExecutionRestClient extends RestClient {
@@ -28,9 +29,9 @@ public interface ExecutionRestClient extends RestClient {
void deleteExecution(String executionKey);
- List<ExecTO> listRecentExecutions(final int max);
+ List<ExecTO> listRecentExecutions(int max);
- List<ExecTO> listExecutions(final String taskKey, final int page, final int size);
+ List<ExecTO> listExecutions(String taskKey, int page, int size, SortParam<String> sort);
- int countExecutions(final String taskKey);
+ int countExecutions(String taskKey);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/b799c036/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java b/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
index 2eb3b00..b316807 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/rest/ReportRestClient.java
@@ -39,6 +39,7 @@ import org.apache.syncope.common.rest.api.beans.ExecQuery;
import org.apache.syncope.common.rest.api.beans.ExecuteQuery;
import org.apache.syncope.common.rest.api.service.ReportService;
import org.apache.syncope.common.rest.api.service.ReportTemplateService;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
public class ReportRestClient extends BaseRestClient
implements ExecutionRestClient, TemplateRestClient<ReportTemplateTO, ReportTemplateFormat> {
@@ -98,9 +99,12 @@ public class ReportRestClient extends BaseRestClient
}
@Override
- public List<ExecTO> listExecutions(final String taskKey, final int page, final int size) {
+ public List<ExecTO> listExecutions(
+ final String taskKey, final int page, final int size, final SortParam<String> sort) {
+
return getService(ReportService.class).
- listExecutions(new ExecQuery.Builder().key(taskKey).page(page).size(size).build()).getResult();
+ listExecutions(new ExecQuery.Builder().key(taskKey).page(page).size(size).
+ orderBy(toOrderBy(sort)).build()).getResult();
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/b799c036/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 3465c1d..8f2228e 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
@@ -62,14 +62,13 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
public int count(final String resource, final TaskType kind) {
return getService(TaskService.class).list(
- new TaskQuery.Builder(kind).resource(resource).page(1).size(1).
- build()).getTotalCount();
+ new TaskQuery.Builder(kind).resource(resource).page(1).size(1).build()).getTotalCount();
}
public int count(final AnyTypeKind anyTypeKind, final String entityKey, final TaskType kind) {
return getService(TaskService.class).list(
- new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).
- build()).getTotalCount();
+ new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
+ getTotalCount();
}
@Override
@@ -152,9 +151,12 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
}
@Override
- public List<ExecTO> listExecutions(final String taskKey, final int page, final int size) {
+ public List<ExecTO> listExecutions(
+ final String taskKey, final int page, final int size, final SortParam<String> sort) {
+
return getService(TaskService.class).
- listExecutions(new ExecQuery.Builder().key(taskKey).page(page).size(size).build()).getResult();
+ listExecutions(new ExecQuery.Builder().key(taskKey).page(page).size(size).
+ orderBy(toOrderBy(sort)).build()).getResult();
}
private TaskType getTaskType(final Class<?> reference) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/b799c036/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
index 485ee28..e30bcaa 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
@@ -212,7 +212,7 @@ public abstract class ExecutionsDirectoryPanel
@Override
public Iterator<ExecTO> iterator(final long first, final long count) {
final int page = ((int) first / paginatorRows);
- List<ExecTO> list = restClient.listExecutions(taskKey, (page < 0 ? 0 : page) + 1, paginatorRows);
+ List<ExecTO> list = restClient.listExecutions(taskKey, (page < 0 ? 0 : page) + 1, paginatorRows, getSort());
Collections.sort(list, comparator);
return list.iterator();
}