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 2018/03/29 15:05:46 UTC
[2/2] syncope git commit: Cleanup
Cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1135e3b7
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1135e3b7
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1135e3b7
Branch: refs/heads/master
Commit: 1135e3b7791d75494ca1f42340435cccb21602fd
Parents: ec63a29
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 29 17:05:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 29 17:05:06 2018 +0200
----------------------------------------------------------------------
.../commands/task/TaskSyncopeOperations.java | 4 ++--
.../client/console/rest/TaskRestClient.java | 24 +++++++++-----------
.../common/rest/api/service/TaskService.java | 2 +-
.../apache/syncope/core/logic/SchemaLogic.java | 13 -----------
.../apache/syncope/core/logic/TaskLogic.java | 2 +-
.../rest/cxf/service/SchemaServiceImpl.java | 3 ++-
.../core/rest/cxf/service/TaskServiceImpl.java | 4 ++--
.../syncope/fit/core/AbstractTaskITCase.java | 2 +-
.../syncope/fit/core/ExceptionMapperITCase.java | 6 ++---
.../fit/core/NotificationTaskITCase.java | 8 ++++---
.../syncope/fit/core/PropagationTaskITCase.java | 14 ++++++------
.../apache/syncope/fit/core/PullTaskITCase.java | 8 +++----
.../apache/syncope/fit/core/PushTaskITCase.java | 2 +-
.../syncope/fit/core/SchedTaskITCase.java | 2 +-
.../org/apache/syncope/fit/core/UserITCase.java | 18 +++++++--------
15 files changed, 50 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
----------------------------------------------------------------------
diff --git a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
index 48fd7c6..d577968 100644
--- a/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
+++ b/client/cli/src/main/java/org/apache/syncope/client/cli/commands/task/TaskSyncopeOperations.java
@@ -45,11 +45,11 @@ public class TaskSyncopeOperations {
}
public List<TaskTO> list(final String type) {
- return taskService.list(new TaskQuery.Builder(TaskType.valueOf(type)).build()).getResult();
+ return taskService.search(new TaskQuery.Builder(TaskType.valueOf(type)).build()).getResult();
}
public List<TaskTO> listPropagationTask() {
- return taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).build()).getResult();
+ return taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).build()).getResult();
}
public void deleteExecution(final String executionKey) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/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 723ae2e..516ef7c 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
@@ -60,23 +60,23 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
}
public int count(final TaskType kind) {
- return getService(TaskService.class).list(
+ return getService(TaskService.class).search(
new TaskQuery.Builder(kind).page(1).size(1).build()).getTotalCount();
}
public int count(final String resource, final TaskType kind) {
- return getService(TaskService.class).list(
+ return getService(TaskService.class).search(
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(
+ return getService(TaskService.class).search(
new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
getTotalCount();
}
public int count(final AnyTypeKind anyTypeKind, final String entityKey, final String notification) {
- return getService(TaskService.class).list(
+ return getService(TaskService.class).search(
new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification).
anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1).build()).
getTotalCount();
@@ -92,7 +92,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
final String resource, final int page, final int size, final SortParam<String> sort) {
return getService(TaskService.class).
- <PropagationTaskTO>list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ <PropagationTaskTO>search(new TaskQuery.Builder(TaskType.PROPAGATION).
resource(resource).
page(page).size(size).
orderBy(toOrderBy(sort)).build()).
@@ -104,7 +104,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
final int page, final int size, final SortParam<String> sort) {
return getService(TaskService.class).
- <PropagationTaskTO>list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ <PropagationTaskTO>search(new TaskQuery.Builder(TaskType.PROPAGATION).
anyTypeKind(anyTypeKind).entityKey(entityKey).
page(page).size(size).
orderBy(toOrderBy(sort)).build()).
@@ -133,7 +133,7 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
}
PagedResult<NotificationTaskTO> list = getService(TaskService.class).
- list(builder.page(page).size(size).orderBy(toOrderBy(sort)).build());
+ search(builder.page(page).size(size).orderBy(toOrderBy(sort)).build());
return list.getResult();
}
@@ -142,9 +142,8 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
final Class<T> reference, final int page, final int size, final SortParam<String> sort) {
return (List<T>) getService(TaskService.class).
- list(new TaskQuery.Builder(getTaskType(reference)).page(page).size(size).
- orderBy(toOrderBy(sort)).build()).
- getResult();
+ search(new TaskQuery.Builder(getTaskType(reference)).page(page).size(size).
+ orderBy(toOrderBy(sort)).build()).getResult();
}
@SuppressWarnings("unchecked")
@@ -156,9 +155,8 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien
final SortParam<String> sort) {
return (List<T>) getService(TaskService.class).
- list(new TaskQuery.Builder(getTaskType(reference)).page(page).size(size).resource(resource).
- orderBy(toOrderBy(sort)).build()).
- getResult();
+ search(new TaskQuery.Builder(getTaskType(reference)).page(page).size(size).resource(resource).
+ orderBy(toOrderBy(sort)).build()).getResult();
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
----------------------------------------------------------------------
diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
index 7d76d55..5e6bf34 100644
--- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
+++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/TaskService.java
@@ -86,7 +86,7 @@ public interface TaskService extends ExecutableService {
@GET
@Path("{type}")
@Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML })
- <T extends TaskTO> PagedResult<T> list(@BeanParam TaskQuery query);
+ <T extends TaskTO> PagedResult<T> search(@BeanParam TaskQuery query);
/**
* Creates a new task.
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
index 892850e..b87d3d6 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/SchemaLogic.java
@@ -147,22 +147,9 @@ public class SchemaLogic extends AbstractTransactionalLogic<SchemaTO> {
@PreAuthorize("isAuthenticated()")
@Transactional(readOnly = true)
- public <T extends SchemaTO> List<T> list(final SchemaType schemaType, final List<String> anyTypeClasses) {
- return doSearch(schemaType, anyTypeClasses, null);
- }
-
- @PreAuthorize("isAuthenticated()")
- @Transactional(readOnly = true)
public <T extends SchemaTO> List<T> search(
final SchemaType schemaType, final List<String> anyTypeClasses, final String keyword) {
- return doSearch(schemaType, anyTypeClasses, keyword == null ? null : keyword.replace('*', '%'));
- }
-
- @SuppressWarnings({ "unchecked", "Convert2Lambda" })
- private <T extends SchemaTO> List<T> doSearch(
- final SchemaType schemaType, final List<String> anyTypeClasses, final String keyword) {
-
List<AnyTypeClass> classes = new ArrayList<>(anyTypeClasses == null ? 0 : anyTypeClasses.size());
if (anyTypeClasses != null) {
anyTypeClasses.remove(AnyTypeKind.USER.name());
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/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 bcbe645..bdd2fe2 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
@@ -159,7 +159,7 @@ public class TaskLogic extends AbstractExecutableLogic<TaskTO> {
@PreAuthorize("hasRole('" + StandardEntitlement.TASK_LIST + "')")
@Transactional(readOnly = true)
@SuppressWarnings("unchecked")
- public <T extends TaskTO> Pair<Integer, List<T>> list(
+ public <T extends TaskTO> Pair<Integer, List<T>> search(
final TaskType type,
final String resource,
final String notification,
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
----------------------------------------------------------------------
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
index ac5f5c6..dca79bf 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/SchemaServiceImpl.java
@@ -53,7 +53,8 @@ public class SchemaServiceImpl extends AbstractServiceImpl implements SchemaServ
@Override
public <T extends SchemaTO> List<T> search(final SchemaQuery query) {
- return logic.search(query.getType(), query.getAnyTypeClasses(), query.getKeyword());
+ String keyword = query.getKeyword() == null ? null : query.getKeyword().replace('*', '%');
+ return logic.search(query.getType(), query.getAnyTypeClasses(), keyword);
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/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 6c3a10b..cbeb886 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
@@ -70,8 +70,8 @@ public class TaskServiceImpl extends AbstractExecutableService implements TaskSe
@SuppressWarnings("unchecked")
@Override
- public <T extends TaskTO> PagedResult<T> list(final TaskQuery query) {
- Pair<Integer, List<T>> result = logic.list(
+ public <T extends TaskTO> PagedResult<T> search(final TaskQuery query) {
+ Pair<Integer, List<T>> result = logic.search(
query.getType(),
query.getResource(),
query.getNotification(),
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
index 55c1a85..fc85d9d 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/AbstractTaskITCase.java
@@ -201,7 +201,7 @@ public abstract class AbstractTaskITCase extends AbstractITCase {
}
PagedResult<NotificationTaskTO> tasks =
- taskService.list(new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification).build());
+ taskService.search(new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification).build());
if (!tasks.getResult().isEmpty()) {
notificationTask = tasks.getResult().get(0);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
index 83e0171..9566e8f 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/ExceptionMapperITCase.java
@@ -156,19 +156,19 @@ public class ExceptionMapperITCase extends AbstractITCase {
@Test
public void invalidRequests() {
try {
- taskService.list(new TaskQuery.Builder(TaskType.NOTIFICATION).resource(RESOURCE_NAME_LDAP).build());
+ taskService.search(new TaskQuery.Builder(TaskType.NOTIFICATION).resource(RESOURCE_NAME_LDAP).build());
fail("This should not happen");
} catch (SyncopeClientException e) {
assertEquals(ClientExceptionType.InvalidRequest, e.getType());
}
try {
- taskService.list(new TaskQuery.Builder(TaskType.PULL).anyTypeKind(AnyTypeKind.ANY_OBJECT).build());
+ taskService.search(new TaskQuery.Builder(TaskType.PULL).anyTypeKind(AnyTypeKind.ANY_OBJECT).build());
fail("This should not happen");
} catch (SyncopeClientException e) {
assertEquals(ClientExceptionType.InvalidRequest, e.getType());
}
try {
- taskService.list(new TaskQuery.Builder(TaskType.PULL).
+ taskService.search(new TaskQuery.Builder(TaskType.PULL).
notification("e00945b5-1184-4d43-8e45-4318a8dcdfd4").build());
fail("This should not happen");
} catch (SyncopeClientException e) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/NotificationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/NotificationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/NotificationTaskITCase.java
index ea2714f..62dc977 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/NotificationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/NotificationTaskITCase.java
@@ -169,7 +169,9 @@ public class NotificationTaskITCase extends AbstractNotificationTaskITCase {
assertEquals(1, taskTO.getExecutions().size());
} finally {
// Remove execution to make test re-runnable
- taskService.deleteExecution(taskTO.getExecutions().get(0).getKey());
+ if (!taskTO.getExecutions().isEmpty()) {
+ taskService.deleteExecution(taskTO.getExecutions().get(0).getKey());
+ }
}
}
@@ -276,7 +278,7 @@ public class NotificationTaskITCase extends AbstractNotificationTaskITCase {
assertTrue(taskTO.getRecipients().containsAll(
new TestNotificationRecipientsProvider().provideRecipients(null)));
- NotificationTaskTO foundViaList = taskService.<NotificationTaskTO>list(
+ NotificationTaskTO foundViaList = taskService.<NotificationTaskTO>search(
new TaskQuery.Builder(TaskType.NOTIFICATION).notification(notification.getKey()).build()).
getResult().get(0);
assertEquals(taskTO, foundViaList);
@@ -295,7 +297,7 @@ public class NotificationTaskITCase extends AbstractNotificationTaskITCase {
// verify that no task was created for disabled notification
PagedResult<NotificationTaskTO> tasks =
- taskService.list(new TaskQuery.Builder(TaskType.NOTIFICATION).notification(created.getLeft()).build());
+ taskService.search(new TaskQuery.Builder(TaskType.NOTIFICATION).notification(created.getLeft()).build());
assertEquals(0, tasks.getSize());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
index 834eb10..551dac4 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PropagationTaskITCase.java
@@ -52,7 +52,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
@Test
public void paginatedList() {
- PagedResult<PropagationTaskTO> tasks = taskService.list(
+ PagedResult<PropagationTaskTO> tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(2).build());
assertNotNull(tasks);
assertEquals(2, tasks.getResult().size());
@@ -61,7 +61,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
assertNotNull(task);
}
- tasks = taskService.list(
+ tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(2).size(2).build());
assertNotNull(tasks);
assertEquals(2, tasks.getPage());
@@ -71,7 +71,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
assertNotNull(task);
}
- tasks = taskService.list(
+ tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1000).size(2).build());
assertNotNull(tasks);
assertTrue(tasks.getResult().isEmpty());
@@ -93,7 +93,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
userTO = createUser(userTO).getEntity();
List<PropagationTaskTO> tasks = new ArrayList<>(
- taskService.<PropagationTaskTO>list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ taskService.<PropagationTaskTO>search(new TaskQuery.Builder(TaskType.PROPAGATION).
anyTypeKind(AnyTypeKind.USER).entityKey(userTO.getKey()).build()).
getResult());
assertFalse(tasks.isEmpty());
@@ -104,7 +104,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
taskService.bulk(bulkAction);
- assertFalse(taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(100).build()).
+ assertFalse(taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(100).build()).
getResult().containsAll(tasks));
}
@@ -196,13 +196,13 @@ public class PropagationTaskITCase extends AbstractTaskITCase {
}
// check list
- PagedResult<TaskTO> tasks = taskService.list(
+ PagedResult<TaskTO> tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(2).details(false).build());
for (TaskTO item : tasks.getResult()) {
assertTrue(item.getExecutions().isEmpty());
}
- tasks = taskService.list(
+ tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(2).details(true).build());
for (TaskTO item : tasks.getResult()) {
assertFalse(item.getExecutions().isEmpty());
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
index 6522fcb..68f9d89 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java
@@ -140,7 +140,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
@Test
public void list() {
- PagedResult<PullTaskTO> tasks = taskService.list(new TaskQuery.Builder(TaskType.PULL).build());
+ PagedResult<PullTaskTO> tasks = taskService.search(new TaskQuery.Builder(TaskType.PULL).build());
assertFalse(tasks.getResult().isEmpty());
tasks.getResult().stream().
filter(task -> (!(task instanceof PullTaskTO))).
@@ -677,7 +677,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
ldap = createResource(ldap);
// 2. create PullTask with remediation enabled, for the new resource
- PullTaskTO pullTask = (PullTaskTO) taskService.list(new TaskQuery.Builder(TaskType.PULL).
+ PullTaskTO pullTask = (PullTaskTO) taskService.search(new TaskQuery.Builder(TaskType.PULL).
resource(RESOURCE_NAME_LDAP).build()).getResult().get(0);
assertNotNull(pullTask);
pullTask.setResource(ldap.getKey());
@@ -1206,7 +1206,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
getLdapRemoteObject(RESOURCE_LDAP_ADMIN_DN, RESOURCE_LDAP_ADMIN_PWD, userDn.getValues().get(0)));
// ...and propagated
- PagedResult<TaskTO> propagationTasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ PagedResult<TaskTO> propagationTasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).
resource(RESOURCE_NAME_DBPULL).
anyTypeKind(AnyTypeKind.USER).entityKey(user.getKey()).build());
assertEquals(1, propagationTasks.getSize());
@@ -1229,7 +1229,7 @@ public class PullTaskITCase extends AbstractTaskITCase {
assertEquals("pullFromLDAP2@syncope.apache.org", user.getPlainAttr("email").get().getValues().get(0));
// ...and propagated
- propagationTasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ propagationTasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).
resource(RESOURCE_NAME_DBPULL).
anyTypeKind(AnyTypeKind.USER).entityKey(user.getKey()).build());
assertEquals(2, propagationTasks.getSize());
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
index 7255ac5..798008e 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PushTaskITCase.java
@@ -86,7 +86,7 @@ public class PushTaskITCase extends AbstractTaskITCase {
@Test
public void list() {
- PagedResult<PushTaskTO> tasks = taskService.list(new TaskQuery.Builder(TaskType.PUSH).build());
+ PagedResult<PushTaskTO> tasks = taskService.search(new TaskQuery.Builder(TaskType.PUSH).build());
assertFalse(tasks.getResult().isEmpty());
tasks.getResult().stream().
filter((task) -> (!(task instanceof PushTaskTO))).
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
index 48cbe70..24eacad 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SchedTaskITCase.java
@@ -61,7 +61,7 @@ public class SchedTaskITCase extends AbstractTaskITCase {
@Test
public void list() {
PagedResult<SchedTaskTO> tasks =
- taskService.list(new TaskQuery.Builder(TaskType.SCHEDULED).build());
+ taskService.search(new TaskQuery.Builder(TaskType.SCHEDULED).build());
assertFalse(tasks.getResult().isEmpty());
tasks.getResult().stream().filter(
task -> !(task instanceof SchedTaskTO) || task instanceof PullTaskTO || task instanceof PushTaskTO).
http://git-wip-us.apache.org/repos/asf/syncope/blob/1135e3b7/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
index 490859b..1303027 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java
@@ -138,7 +138,7 @@ public class UserITCase extends AbstractITCase {
userTO = createUser(userTO).getEntity();
// get the propagation task just created
- PagedResult<PropagationTaskTO> tasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).
+ PagedResult<PropagationTaskTO> tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).
anyTypeKind(AnyTypeKind.USER).entityKey(userTO.getKey()).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -278,7 +278,7 @@ public class UserITCase extends AbstractITCase {
@Test
public void create() {
// get task list
- PagedResult<PropagationTaskTO> tasks = taskService.list(
+ PagedResult<PropagationTaskTO> tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -320,7 +320,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(newUserTO.getCreationDate());
// get the new task list
- tasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -608,7 +608,7 @@ public class UserITCase extends AbstractITCase {
@Test
public void updatePasswordOnly() {
- int beforeTasks = taskService.list(
+ int beforeTasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build()).getTotalCount();
assertFalse(beforeTasks <= 0);
@@ -626,7 +626,7 @@ public class UserITCase extends AbstractITCase {
// check for changePwdDate
assertNotNull(userTO.getChangePwdDate());
- int afterTasks = taskService.list(
+ int afterTasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build()).getTotalCount();
assertFalse(afterTasks <= 0);
@@ -637,7 +637,7 @@ public class UserITCase extends AbstractITCase {
@Test
public void verifyTaskRegistration() {
// get task list
- PagedResult<PropagationTaskTO> tasks = taskService.list(
+ PagedResult<PropagationTaskTO> tasks = taskService.search(
new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -658,7 +658,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
// get the new task list
- tasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
assertNotNull(tasks);
assertFalse(tasks.getResult().isEmpty());
@@ -682,7 +682,7 @@ public class UserITCase extends AbstractITCase {
assertNotNull(userTO);
// get the new task list
- tasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
// default configuration for ws-target-resource2 during update:
// all update executions have to be registered
@@ -699,7 +699,7 @@ public class UserITCase extends AbstractITCase {
userService.delete(userTO.getKey());
// get the new task list
- tasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
+ tasks = taskService.search(new TaskQuery.Builder(TaskType.PROPAGATION).page(1).size(1).build());
maxKey = newMaxKey;
newMaxKey = tasks.getResult().iterator().next().getKey();