Proper fix for notification task search - see 14649394a351d087c4c2627bb4fa45f5fc3406dd
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c10ea288 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c10ea288 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c10ea288 Branch: refs/heads/2_0_NO_JAXB Commit: c10ea28819e0de686b9719617c647db219214c50 Parents: d72296e Author: Francesco Chicchiriccò <[email protected]> Authored: Fri Jul 15 18:14:29 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Fri Jul 15 18:14:29 2016 +0200 ---------------------------------------------------------------------- .../notifications/NotificationTasks.java | 8 +++---- .../client/console/rest/TaskRestClient.java | 25 ++++++++++---------- .../tasks/AnyPropagationTaskDirectoryPanel.java | 10 ++++---- .../console/tasks/AnyPropagationTasks.java | 4 ++-- .../tasks/NotificationTaskDirectoryPanel.java | 16 ++++++------- .../common/lib/to/NotificationTaskTO.java | 10 ++++---- .../common/rest/api/beans/TaskQuery.java | 18 +++++++------- .../common/rest/api/service/JAXRSService.java | 2 +- .../apache/syncope/core/logic/TaskLogic.java | 4 ++-- .../api/entity/task/NotificationTask.java | 4 ++-- .../core/persistence/jpa/dao/JPATaskDAO.java | 3 +-- .../jpa/entity/task/JPANotificationTask.java | 10 ++++---- .../java/data/TaskDataBinderImpl.java | 3 ++- .../notification/NotificationManagerImpl.java | 2 +- .../core/rest/cxf/service/TaskServiceImpl.java | 4 ++-- .../syncope/fit/core/PropagationTaskITCase.java | 2 +- .../org/apache/syncope/fit/core/UserITCase.java | 2 +- 17 files changed, 64 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java index 7a5894c..588b07f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java @@ -38,10 +38,10 @@ public class NotificationTasks extends Panel implements ModalPanel { public NotificationTasks( final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final PageReference pageReference) { - this(null, anyTypeKind, anyTypeKey, pageReference); + this(null, anyTypeKind, entityKey, pageReference); } public NotificationTasks( @@ -53,7 +53,7 @@ public class NotificationTasks extends Panel implements ModalPanel { private NotificationTasks( final String notification, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final PageReference pageReference) { super(BaseModal.CONTENT_ID); @@ -61,7 +61,7 @@ public class NotificationTasks extends Panel implements ModalPanel { add(mlp); mlp.setFirstLevel( - new NotificationTaskDirectoryPanel(notification, anyTypeKind, anyTypeKey, mlp, pageReference) { + new NotificationTaskDirectoryPanel(notification, anyTypeKind, entityKey, mlp, pageReference) { private static final long serialVersionUID = -2195387360323687302L; http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/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 0c70c44..cfc4b82 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 @@ -29,6 +29,7 @@ import org.apache.syncope.common.lib.to.PushTaskTO; import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.to.PullTaskTO; import org.apache.syncope.common.lib.to.ExecTO; +import org.apache.syncope.common.lib.to.PagedResult; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.common.rest.api.beans.ExecuteQuery; @@ -55,9 +56,9 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien build()).getTotalCount(); } - public int count(final AnyTypeKind anyTypeKind, final String anyTypeKey, final TaskType kind) { + public int count(final AnyTypeKind anyTypeKind, final String entityKey, final TaskType kind) { return getService(TaskService.class).list( - new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).anyTypeKey(anyTypeKey).page(1).size(1). + new TaskQuery.Builder(kind).anyTypeKind(anyTypeKind).entityKey(entityKey).page(1).size(1). build()).getTotalCount(); } @@ -79,27 +80,26 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien } public List<PropagationTaskTO> listPropagationTasks( - final AnyTypeKind anyTypeKind, final String anyTypeKey, + final AnyTypeKind anyTypeKind, final String entityKey, final int page, final int size, final SortParam<String> sort) { return getService(TaskService.class). <PropagationTaskTO>list(new TaskQuery.Builder(TaskType.PROPAGATION). - anyTypeKind(anyTypeKind).anyTypeKey(anyTypeKey). + anyTypeKind(anyTypeKind).entityKey(entityKey). page(page).size(size). orderBy(toOrderBy(sort)).build()). getResult(); } - @SuppressWarnings("unchecked") - public <T extends AbstractTaskTO> List<T> listNotificationTasks( + public List<NotificationTaskTO> listNotificationTasks( final String notification, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final int page, final int size, final SortParam<String> sort) { - final TaskQuery.Builder builder = new TaskQuery.Builder(TaskType.NOTIFICATION); + TaskQuery.Builder builder = new TaskQuery.Builder(TaskType.NOTIFICATION); if (notification != null) { builder.notification(notification); } @@ -108,12 +108,13 @@ public class TaskRestClient extends BaseRestClient implements ExecutionRestClien builder.anyTypeKind(anyTypeKind); } - if (anyTypeKey != null) { - builder.anyTypeKey(anyTypeKey); + if (entityKey != null) { + builder.entityKey(entityKey); } - return (List<T>) getService(TaskService.class). - list(builder.page(page).size(size).orderBy(toOrderBy(sort)).build()).getResult(); + PagedResult<NotificationTaskTO> list = getService(TaskService.class). + list(builder.page(page).size(size).orderBy(toOrderBy(sort)).build()); + return list.getResult(); } @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTaskDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTaskDirectoryPanel.java index 811e3a2..dbd2047 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTaskDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTaskDirectoryPanel.java @@ -33,18 +33,18 @@ public abstract class AnyPropagationTaskDirectoryPanel extends PropagationTaskDi private final AnyTypeKind anyTypeKind; - private final String anyTypeKey; + private final String entityKey; protected AnyPropagationTaskDirectoryPanel( final BaseModal<?> baseModal, final MultilevelPanel multiLevelPanelRef, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final PageReference pageRef) { super(baseModal, multiLevelPanelRef, null, pageRef); this.anyTypeKind = anyTypeKind; - this.anyTypeKey = anyTypeKey; + this.entityKey = entityKey; } @Override @@ -62,7 +62,7 @@ public abstract class AnyPropagationTaskDirectoryPanel extends PropagationTaskDi @Override public long size() { - return restClient.count(anyTypeKind, anyTypeKey, taskType); + return restClient.count(anyTypeKind, entityKey, taskType); } @Override @@ -70,7 +70,7 @@ public abstract class AnyPropagationTaskDirectoryPanel extends PropagationTaskDi final int page = ((int) first / paginatorRows); final List<PropagationTaskTO> tasks = restClient.listPropagationTasks( - anyTypeKind, anyTypeKey, (page < 0 ? 0 : page) + 1, paginatorRows, getSort()); + anyTypeKind, entityKey, (page < 0 ? 0 : page) + 1, paginatorRows, getSort()); Collections.sort(tasks, getComparator()); return tasks.iterator(); http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTasks.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTasks.java index 5cfa7d5..f187a05 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTasks.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/AnyPropagationTasks.java @@ -35,13 +35,13 @@ public class AnyPropagationTasks extends AbstractPropagationTasks { public <T extends AnyTO> AnyPropagationTasks( final BaseModal<?> baseModal, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final PageReference pageReference) { super(BaseModal.CONTENT_ID); final MultilevelPanel mlp = new MultilevelPanel("tasks"); - mlp.setFirstLevel(new AnyPropagationTaskDirectoryPanel(baseModal, mlp, anyTypeKind, anyTypeKey, pageReference) { + mlp.setFirstLevel(new AnyPropagationTaskDirectoryPanel(baseModal, mlp, anyTypeKind, entityKey, pageReference) { private static final long serialVersionUID = -2195387360323687302L; http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/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 1bc48a2..615e512 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 @@ -59,19 +59,19 @@ public abstract class NotificationTaskDirectoryPanel private final AnyTypeKind anyTypeKind; - private final String anyTypeKey; + private final String entityKey; protected NotificationTaskDirectoryPanel( final String notification, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final MultilevelPanel multiLevelPanelRef, final PageReference pageRef) { super(null, multiLevelPanelRef, pageRef); this.notification = notification; this.anyTypeKind = anyTypeKind; - this.anyTypeKey = anyTypeKey; + this.entityKey = entityKey; initResultTable(); } @@ -189,7 +189,7 @@ public abstract class NotificationTaskDirectoryPanel @Override protected NotificationTasksProvider dataProvider() { - return new NotificationTasksProvider(notification, anyTypeKind, anyTypeKey, rows); + return new NotificationTasksProvider(notification, anyTypeKind, entityKey, rows); } @Override @@ -205,18 +205,18 @@ public abstract class NotificationTaskDirectoryPanel private final AnyTypeKind anyTypeKind; - private final String anyTypeKey; + private final String entityKey; public NotificationTasksProvider( final String notification, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final int paginatorRows) { super(paginatorRows, TaskType.PROPAGATION, restClient); this.notification = notification; this.anyTypeKind = anyTypeKind; - this.anyTypeKey = anyTypeKey; + this.entityKey = entityKey; } @Override @@ -224,7 +224,7 @@ public abstract class NotificationTaskDirectoryPanel final int page = ((int) first / paginatorRows); final List<NotificationTaskTO> tasks = restClient.listNotificationTasks( - notification, anyTypeKind, anyTypeKey, (page < 0 ? 0 : page) + 1, paginatorRows, getSort()); + notification, anyTypeKind, entityKey, (page < 0 ? 0 : page) + 1, paginatorRows, getSort()); Collections.sort(tasks, getComparator()); return tasks.iterator(); http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java index ce74be2..44155e4 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/NotificationTaskTO.java @@ -38,7 +38,7 @@ public class NotificationTaskTO extends AbstractTaskTO { private AnyTypeKind anyTypeKind; - private String anyKey; + private String entityKey; private final Set<String> recipients = new HashSet<>(); @@ -70,12 +70,12 @@ public class NotificationTaskTO extends AbstractTaskTO { this.anyTypeKind = anyTypeKind; } - public String getAnyKey() { - return anyKey; + public String getEntityKey() { + return entityKey; } - public void setAnyKey(final String anyKey) { - this.anyKey = anyKey; + public void setEntityKey(final String entityKey) { + this.entityKey = entityKey; } @XmlElementWrapper(name = "recipients") http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java ---------------------------------------------------------------------- diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java index c869a15..7674053 100644 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/beans/TaskQuery.java @@ -79,15 +79,15 @@ public class TaskQuery extends AbstractQuery { } } - public Builder anyTypeKey(final String anyTypeKey) { + public Builder entityKey(final String entityKey) { switch (getInstance().getType()) { case PROPAGATION: case NOTIFICATION: - getInstance().setAnyTypeKey(anyTypeKey); + getInstance().setEntityKey(entityKey); return this; default: - throw new IllegalArgumentException("anyTypeKey not allowed for " + getInstance().getType()); + throw new IllegalArgumentException("entityKey not allowed for " + getInstance().getType()); } } @@ -114,7 +114,7 @@ public class TaskQuery extends AbstractQuery { private AnyTypeKind anyTypeKind; - private String anyTypeKey; + private String entityKey; private Boolean details; @@ -155,14 +155,14 @@ public class TaskQuery extends AbstractQuery { this.anyTypeKind = anyTypeKind; } - public String getAnyTypeKey() { - return anyTypeKey; + public String getEntityKey() { + return entityKey; } @Min(1) - @QueryParam(JAXRSService.PARAM_ANYTYPE_KEY) - public void setAnyTypeKey(final String anyTypeKey) { - this.anyTypeKey = anyTypeKey; + @QueryParam(JAXRSService.PARAM_ENTITY_KEY) + public void setEntityKey(final String entityKey) { + this.entityKey = entityKey; } public Boolean getDetails() { http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/JAXRSService.java ---------------------------------------------------------------------- diff --git a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/JAXRSService.java b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/JAXRSService.java index 1753176..f613370 100644 --- a/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/JAXRSService.java +++ b/common/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/JAXRSService.java @@ -34,7 +34,7 @@ public interface JAXRSService { String PARAM_ANYTYPE_KIND = "anyTypeKind"; - String PARAM_ANYTYPE_KEY = "anyTypeKey"; + String PARAM_ENTITY_KEY = "entityKey"; String PARAM_DETAILS = "details"; http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/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 8136e46..9a83fe7 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 @@ -164,14 +164,14 @@ public class TaskLogic extends AbstractExecutableLogic<AbstractTaskTO> { final String resource, final String notification, final AnyTypeKind anyTypeKind, - final String anyTypeKey, + final String entityKey, final int page, final int size, final List<OrderByClause> orderByClauses, final boolean details) { return CollectionUtils.collect(taskDAO.findAll( - type, resourceDAO.find(resource), notificationDAO.find(notification), anyTypeKind, anyTypeKey, + type, resourceDAO.find(resource), notificationDAO.find(notification), anyTypeKind, entityKey, page, size, orderByClauses), new Transformer<Task, T>() { @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/NotificationTask.java ---------------------------------------------------------------------- diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/NotificationTask.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/NotificationTask.java index f7d83d1..d13f748 100644 --- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/NotificationTask.java +++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/NotificationTask.java @@ -29,9 +29,9 @@ public interface NotificationTask extends Task { void setNotification(Notification notification); - String getAnyKey(); + String getEntityKey(); - void setAnyKey(String anyKey); + void setEntityKey(String entityKey); AnyTypeKind getAnyTypeKind(); http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java index 8ca3297..1f5db3b 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java @@ -153,8 +153,7 @@ public class JPATaskDAO extends AbstractDAO<Task> implements TaskDAO { queryString.append("AND t.notification=:notification "); } if (anyTypeKind != null && entityKey != null) { - queryString.append("AND t.anyTypeKind=:anyTypeKind AND t."). - append(type == TaskType.NOTIFICATION ? "anyKey" : "entityKey").append("=:entityKey "); + queryString.append("AND t.anyTypeKind=:anyTypeKind AND t.entityKey=:entityKey "); } return queryString; http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPANotificationTask.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPANotificationTask.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPANotificationTask.java index 5db9ed7..aad2aa0 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPANotificationTask.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPANotificationTask.java @@ -54,7 +54,7 @@ public class JPANotificationTask extends AbstractTask implements NotificationTas @Enumerated(EnumType.STRING) private AnyTypeKind anyTypeKind; - private String anyKey; + private String entityKey; @ElementCollection(fetch = FetchType.EAGER) @Column(name = "address") @@ -108,13 +108,13 @@ public class JPANotificationTask extends AbstractTask implements NotificationTas } @Override - public String getAnyKey() { - return anyKey; + public String getEntityKey() { + return entityKey; } @Override - public void setAnyKey(final String anyKey) { - this.anyKey = anyKey; + public void setEntityKey(final String entityKey) { + this.entityKey = entityKey; } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java index fae1ef9..4045872 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/TaskDataBinderImpl.java @@ -320,6 +320,7 @@ public class TaskDataBinderImpl implements TaskDataBinder { switch (taskUtils.getType()) { case PROPAGATION: + ((PropagationTaskTO) taskTO).setAnyTypeKind(((PropagationTask) task).getAnyTypeKind()); ((PropagationTaskTO) taskTO).setEntityKey(((PropagationTask) task).getEntityKey()); ((PropagationTaskTO) taskTO).setResource(((PropagationTask) task).getResource().getKey()); ((PropagationTaskTO) taskTO).setAttributes(((PropagationTask) task).getSerializedAttributes()); @@ -359,7 +360,7 @@ public class TaskDataBinderImpl implements TaskDataBinder { case NOTIFICATION: ((NotificationTaskTO) taskTO).setNotification(((NotificationTask) task).getNotification().getKey()); ((NotificationTaskTO) taskTO).setAnyTypeKind(((NotificationTask) task).getAnyTypeKind()); - ((NotificationTaskTO) taskTO).setAnyKey(((NotificationTask) task).getAnyKey()); + ((NotificationTaskTO) taskTO).setEntityKey(((NotificationTask) task).getEntityKey()); if (((NotificationTask) task).isExecuted() && StringUtils.isBlank(taskTO.getLatestExecStatus())) { taskTO.setLatestExecStatus("[EXECUTED]"); } http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java index 2aabfd9..e5982c4 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/notification/NotificationManagerImpl.java @@ -227,7 +227,7 @@ public class NotificationManagerImpl implements NotificationManager { NotificationTask task = entityFactory.newEntity(NotificationTask.class); task.setNotification(notification); if (any != null) { - task.setAnyKey(any.getKey()); + task.setEntityKey(any.getKey()); task.setAnyTypeKind(any.getType().getKind()); } task.setTraceLevel(notification.getTraceLevel()); http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/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 16ba72a..2dd64dd 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 @@ -76,7 +76,7 @@ public class TaskServiceImpl extends AbstractExecutableService implements TaskSe query.getResource(), query.getNotification(), query.getAnyTypeKind(), - query.getAnyTypeKey(), + query.getEntityKey(), query.getPage(), query.getSize(), getOrderByClauses(query.getOrderBy()), @@ -88,7 +88,7 @@ public class TaskServiceImpl extends AbstractExecutableService implements TaskSe query.getResource(), query.getNotification(), query.getAnyTypeKind(), - query.getAnyTypeKey())); + query.getEntityKey())); } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/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 893ab5a..68a5bde 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 @@ -95,7 +95,7 @@ public class PropagationTaskITCase extends AbstractTaskITCase { List<PropagationTaskTO> tasks = new ArrayList<>( taskService.<PropagationTaskTO>list(new TaskQuery.Builder(TaskType.PROPAGATION). - anyTypeKind(AnyTypeKind.USER).anyTypeKey(userTO.getKey()).build()). + anyTypeKind(AnyTypeKind.USER).entityKey(userTO.getKey()).build()). getResult()); assertFalse(tasks.isEmpty()); http://git-wip-us.apache.org/repos/asf/syncope/blob/c10ea288/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 80d1e90..febe081 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 @@ -129,7 +129,7 @@ public class UserITCase extends AbstractITCase { // get the propagation task just created PagedResult<PropagationTaskTO> tasks = taskService.list(new TaskQuery.Builder(TaskType.PROPAGATION). - anyTypeKind(AnyTypeKind.USER).anyTypeKey(userTO.getKey()).page(1).size(1).build()); + anyTypeKind(AnyTypeKind.USER).entityKey(userTO.getKey()).page(1).size(1).build()); assertNotNull(tasks); assertFalse(tasks.getResult().isEmpty());
