[SYNCOPE-697] No more PHASES
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/44cbf349 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/44cbf349 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/44cbf349 Branch: refs/heads/master Commit: 44cbf349ad92ecc7059186ceaf47e01a666b055c Parents: c14a20d Author: Francesco Chicchiriccò <[email protected]> Authored: Thu Sep 24 14:49:23 2015 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Thu Sep 24 14:49:23 2015 +0200 ---------------------------------------------------------------------- .../console/panels/ResourceDetailsPanel.java | 7 -- .../console/panels/ResourceDetailsPanel.html | 9 -- .../common/lib/to/PropagationTaskTO.java | 11 -- .../syncope/common/lib/to/ResourceTO.java | 33 +----- .../common/lib/types/ConnectorCapability.java | 9 +- .../common/lib/types/PropagationMode.java | 29 ----- .../lib/types/PropagationTaskExecStatus.java | 14 --- .../common/rest/api/service/TaskService.java | 12 -- .../apache/syncope/core/logic/TaskLogic.java | 44 -------- .../api/entity/resource/ExternalResource.java | 5 - .../api/entity/task/PropagationTask.java | 5 - .../entity/resource/JPAExternalResource.java | 16 --- .../jpa/entity/task/JPAPropagationTask.java | 19 ---- .../entity/PropagationTaskValidator.java | 3 +- .../core/persistence/jpa/inner/TaskTest.java | 2 - .../core/persistence/jpa/outer/TaskTest.java | 2 - .../test/resources/domains/MasterContent.xml | 109 ++++++++----------- .../src/test/resources/domains/TwoContent.xml | 6 +- .../core/provisioning/api/Connector.java | 19 ++-- .../provisioning/java/ConnectorFacadeProxy.java | 55 +++++----- .../java/data/ResourceDataBinderImpl.java | 4 - .../AbstractPropagationTaskExecutor.java | 19 +--- .../PriorityPropagationTaskExecutor.java | 2 +- .../propagation/PropagationManagerImpl.java | 1 - .../java/ResourceDataBinderTest.java | 2 - .../core/rest/cxf/service/TaskServiceImpl.java | 9 -- .../fit/core/reference/ConnectorITCase.java | 10 +- .../fit/core/reference/MultitenancyITCase.java | 3 +- .../core/reference/PropagationTaskITCase.java | 32 ------ .../fit/core/reference/PushTaskITCase.java | 2 +- .../fit/core/reference/SyncTaskITCase.java | 24 ++-- .../syncope/fit/core/reference/UserITCase.java | 37 +++---- .../fit/core/reference/VirAttrITCase.java | 12 +- 33 files changed, 137 insertions(+), 429 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java index d556346..59ab76f 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ResourceDetailsPanel.java @@ -30,7 +30,6 @@ import org.apache.syncope.client.console.wicket.markup.html.form.AjaxTextFieldPa import org.apache.syncope.client.console.wicket.markup.html.form.SpinnerFieldPanel; import org.apache.syncope.common.lib.to.ConnInstanceTO; import org.apache.syncope.common.lib.to.ResourceTO; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.TraceLevel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -94,12 +93,6 @@ public class ResourceDetailsPanel extends Panel { new PropertyModel<Integer>(resourceTO, "propagationPriority"), null, null); add(propagationPriority); - final AjaxDropDownChoicePanel<PropagationMode> propagationMode = new AjaxDropDownChoicePanel<>( - "propagationMode", new ResourceModel("propagationMode", "propagationMode").getObject(), - new PropertyModel<PropagationMode>(resourceTO, "propagationMode")); - propagationMode.setChoices(Arrays.asList(PropagationMode.values())); - add(propagationMode); - final AjaxCheckBoxPanel randomPwdIfNotProvided = new AjaxCheckBoxPanel("randomPwdIfNotProvided", new ResourceModel("randomPwdIfNotProvided", "randomPwdIfNotProvided").getObject(), new PropertyModel<Boolean>(resourceTO, "randomPwdIfNotProvided")); http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html index 0b7ca7f..7d518ce 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/ResourceDetailsPanel.html @@ -64,15 +64,6 @@ under the License. </div> </div> - <div class="tablerow"> - <div class="tablecolumn_label medium_fixedsize"> - <label for="propagationMode"><wicket:message key="propagationMode"/></label> - </div> - <div class="tablecolumn_field medium_dynamicsize"> - <span wicket:id="propagationMode">[propagationMode]</span> - </div> - </div> - <div class="tablerow alt"> <div class="tablecolumn_label medium_fixedsize"> <label for="randomPwdIfNotProvided"><wicket:message key="randomPwdIfNotProvided"/></label> http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java index bf30e24..1b1d556 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/PropagationTaskTO.java @@ -21,7 +21,6 @@ package org.apache.syncope.common.lib.to; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import org.apache.syncope.common.lib.types.AnyTypeKind; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.ResourceOperation; @XmlRootElement(name = "propagationTask") @@ -30,8 +29,6 @@ public class PropagationTaskTO extends AbstractTaskTO { private static final long serialVersionUID = 386450127003321197L; - private PropagationMode mode; - private ResourceOperation operation; private String connObjectKey; @@ -64,14 +61,6 @@ public class PropagationTaskTO extends AbstractTaskTO { this.oldConnObjectKey = oldConnObjectKey; } - public PropagationMode getMode() { - return mode; - } - - public void setPropagationMode(final PropagationMode mode) { - this.mode = mode; - } - public String getResource() { return resource; } http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java index 79d33a1..419b852 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/to/ResourceTO.java @@ -32,7 +32,6 @@ import javax.xml.bind.annotation.XmlType; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.syncope.common.lib.types.ConnConfProperty; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.TraceLevel; @XmlRootElement(name = "resource") @@ -57,21 +56,19 @@ public class ResourceTO extends AbstractAnnotatedBean { private boolean propagationPrimary; - private int propagationPriority; + private int propagationPriority = 0; private boolean randomPwdIfNotProvided; - private PropagationMode propagationMode; - private boolean enforceMandatoryCondition; - private TraceLevel createTraceLevel; + private TraceLevel createTraceLevel = TraceLevel.ALL; - private TraceLevel updateTraceLevel; + private TraceLevel updateTraceLevel = TraceLevel.ALL; - private TraceLevel deleteTraceLevel; + private TraceLevel deleteTraceLevel = TraceLevel.ALL; - private TraceLevel syncTraceLevel; + private TraceLevel syncTraceLevel = TraceLevel.ALL; private Long passwordPolicy; @@ -83,18 +80,6 @@ public class ResourceTO extends AbstractAnnotatedBean { private final List<String> propagationActionsClassNames = new ArrayList<>(); - public ResourceTO() { - super(); - - propagationMode = PropagationMode.TWO_PHASES; - propagationPriority = 0; - - createTraceLevel = TraceLevel.ALL; - updateTraceLevel = TraceLevel.ALL; - deleteTraceLevel = TraceLevel.ALL; - syncTraceLevel = TraceLevel.ALL; - } - public String getKey() { return key; } @@ -152,14 +137,6 @@ public class ResourceTO extends AbstractAnnotatedBean { this.randomPwdIfNotProvided = randomPwdIfNotProvided; } - public PropagationMode getPropagationMode() { - return propagationMode; - } - - public void setPropagationMode(final PropagationMode propagationMode) { - this.propagationMode = propagationMode; - } - public TraceLevel getCreateTraceLevel() { return createTraceLevel; } http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java index a0e5781..41b1e4a 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/ConnectorCapability.java @@ -27,12 +27,9 @@ import javax.xml.bind.annotation.XmlEnum; public enum ConnectorCapability { AUTHENTICATE, - ONE_PHASE_CREATE, - TWO_PHASES_CREATE, - ONE_PHASE_UPDATE, - TWO_PHASES_UPDATE, - ONE_PHASE_DELETE, - TWO_PHASES_DELETE, + CREATE, + UPDATE, + DELETE, SEARCH, SYNC; http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java deleted file mode 100644 index 8b10bc8..0000000 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationMode.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.syncope.common.lib.types; - -import javax.xml.bind.annotation.XmlEnum; - -@XmlEnum -public enum PropagationMode { - - ONE_PHASE, - TWO_PHASES - -} http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java ---------------------------------------------------------------------- diff --git a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java index 448b3a9..c676c3b 100644 --- a/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java +++ b/common/lib/src/main/java/org/apache/syncope/common/lib/types/PropagationTaskExecStatus.java @@ -22,26 +22,12 @@ import javax.xml.bind.annotation.XmlEnum; /** * Status of a propagation task execution. - * - * CREATED -> SUBMITTED or UBSUBMITTED (depending on the external resource to - * return success or failure). - * SUBMITTED -> SUCCESS or FAILURE (depending on the external resource to - * report success or failure). */ @XmlEnum public enum PropagationTaskExecStatus { CREATED, - SUBMITTED, - UNSUBMITTED, SUCCESS, FAILURE; - public boolean isSuccessful() { - return this == SUCCESS || this == SUBMITTED; - } - - public static PropagationTaskExecStatus fromString(final String value) { - return PropagationTaskExecStatus.valueOf(value.toUpperCase()); - } } http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/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 2d70b2b..d8814d3 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 @@ -38,7 +38,6 @@ import org.apache.syncope.common.lib.to.AbstractTaskTO; import org.apache.syncope.common.lib.to.BulkAction; import org.apache.syncope.common.lib.to.BulkActionResult; import org.apache.syncope.common.lib.to.PagedResult; -import org.apache.syncope.common.lib.to.ReportExecTO; import org.apache.syncope.common.lib.to.SchedTaskTO; import org.apache.syncope.common.lib.to.TaskExecTO; import org.apache.syncope.common.lib.types.JobAction; @@ -142,17 +141,6 @@ public interface TaskService extends JAXRSService { @QueryParam("dryRun") @DefaultValue("false") boolean dryRun); /** - * Reports task execution result. - * - * @param executionKey key of task execution being reported - * @param reportExec execution being reported - */ - @POST - @Path("executions/{executionKey}/report") - @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) - void report(@NotNull @PathParam("executionKey") Long executionKey, @NotNull ReportExecTO reportExec); - - /** * Executes the provided bulk action. * * @param bulkAction list of task ids against which the bulk action will be performed. http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/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 09d855e..3c9647e 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 @@ -37,8 +37,6 @@ import org.apache.syncope.common.lib.types.ClientExceptionType; import org.apache.syncope.common.lib.types.Entitlement; import org.apache.syncope.common.lib.types.JobAction; import org.apache.syncope.common.lib.types.JobStatusType; -import org.apache.syncope.common.lib.types.PropagationMode; -import org.apache.syncope.common.lib.types.PropagationTaskExecStatus; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.core.persistence.api.dao.NotFoundException; import org.apache.syncope.core.persistence.api.dao.TaskDAO; @@ -247,48 +245,6 @@ public class TaskLogic extends AbstractJobLogic<AbstractTaskTO> { return result; } - @PreAuthorize("hasRole('" + Entitlement.TASK_READ + "')") - public TaskExecTO report(final Long execKey, final PropagationTaskExecStatus status, final String message) { - TaskExec exec = taskExecDAO.find(execKey); - if (exec == null) { - throw new NotFoundException("Task execution " + execKey); - } - - SyncopeClientException sce = SyncopeClientException.build(ClientExceptionType.InvalidPropagationTaskExecReport); - - TaskUtils taskUtils = taskUtilsFactory.getInstance(exec.getTask()); - if (TaskType.PROPAGATION == taskUtils.getType()) { - PropagationTask task = (PropagationTask) exec.getTask(); - if (task.getMode() != PropagationMode.TWO_PHASES) { - sce.getElements().add("Propagation mode: " + task.getMode()); - } - } else { - sce.getElements().add("Task type: " + taskUtils); - } - - switch (status) { - case SUCCESS: - case FAILURE: - break; - - case CREATED: - case SUBMITTED: - case UNSUBMITTED: - sce.getElements().add("Execution status to be set: " + status); - break; - - default: - } - - if (!sce.isEmpty()) { - throw sce; - } - - exec.setStatus(status.toString()); - exec.setMessage(message); - return binder.getTaskExecTO(taskExecDAO.save(exec)); - } - @PreAuthorize("hasRole('" + Entitlement.TASK_DELETE + "')") public <T extends AbstractTaskTO> T delete(final Long taskKey) { Task task = taskDAO.find(taskKey); http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java ---------------------------------------------------------------------- diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java index a8f32c0..26aa9a1 100644 --- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java +++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/resource/ExternalResource.java @@ -21,7 +21,6 @@ package org.apache.syncope.core.persistence.api.entity.resource; import java.util.List; import java.util.Set; import org.apache.syncope.common.lib.types.ConnConfProperty; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.TraceLevel; import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy; import org.apache.syncope.core.persistence.api.entity.AnnotatedEntity; @@ -73,10 +72,6 @@ public interface ExternalResource extends AnnotatedEntity<String> { List<String> getPropagationActionsClassNames(); - PropagationMode getPropagationMode(); - - void setPropagationMode(PropagationMode propagationMode); - Integer getPropagationPriority(); void setPropagationPriority(Integer priority); http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java ---------------------------------------------------------------------- diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java index 9c5ef29..db9e5a3 100644 --- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java +++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/task/PropagationTask.java @@ -20,7 +20,6 @@ package org.apache.syncope.core.persistence.api.entity.task; import java.util.Set; import org.apache.syncope.common.lib.types.AnyTypeKind; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource; import org.identityconnectors.framework.common.objects.Attribute; @@ -43,10 +42,6 @@ public interface PropagationTask extends Task { void setObjectClassName(String objectClassName); - PropagationMode getMode(); - - void setMode(PropagationMode mode); - ResourceOperation getOperation(); void setOperation(ResourceOperation operation); http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java index 650ef6a..e9e59fd 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/resource/JPAExternalResource.java @@ -44,7 +44,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.Predicate; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.common.lib.types.ConnConfProperty; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.TraceLevel; import org.apache.syncope.core.persistence.api.entity.policy.AccountPolicy; import org.apache.syncope.core.persistence.api.entity.ConnInstance; @@ -125,10 +124,6 @@ public class JPAExternalResource extends AbstractAnnotatedEntity<String> impleme @Enumerated(EnumType.STRING) @Column(nullable = false) - private PropagationMode propagationMode; - - @Enumerated(EnumType.STRING) - @Column(nullable = false) private TraceLevel createTraceLevel; @Enumerated(EnumType.STRING) @@ -178,7 +173,6 @@ public class JPAExternalResource extends AbstractAnnotatedEntity<String> impleme propagationPrimary = 0; propagationPriority = 0; randomPwdIfNotProvided = 0; - propagationMode = PropagationMode.TWO_PHASES; createTraceLevel = TraceLevel.FAILURES; updateTraceLevel = TraceLevel.FAILURES; @@ -279,16 +273,6 @@ public class JPAExternalResource extends AbstractAnnotatedEntity<String> impleme } @Override - public PropagationMode getPropagationMode() { - return propagationMode; - } - - @Override - public void setPropagationMode(final PropagationMode propagationMode) { - this.propagationMode = propagationMode; - } - - @Override public String getKey() { return name; } http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java index 19fc9f6..2bdd0f3 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/task/JPAPropagationTask.java @@ -29,7 +29,6 @@ import javax.persistence.ManyToOne; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.common.lib.types.AnyTypeKind; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.core.persistence.api.entity.resource.ExternalResource; @@ -50,12 +49,6 @@ public class JPAPropagationTask extends AbstractTask implements PropagationTask private static final long serialVersionUID = 7086054884614511210L; /** - * @see PropagationMode - */ - @Enumerated(EnumType.STRING) - private PropagationMode mode; - - /** * @see ResourceOperation */ @Enumerated(EnumType.STRING) @@ -132,18 +125,6 @@ public class JPAPropagationTask extends AbstractTask implements PropagationTask @Override - public PropagationMode getMode() { - return mode; - } - - @Override - - public void setMode(final PropagationMode mode) { - this.mode = mode; - } - - @Override - public ResourceOperation getOperation() { return operation; } http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java index 48d0cc3..6c8a949 100644 --- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java +++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/validation/entity/PropagationTaskValidator.java @@ -35,8 +35,7 @@ public class PropagationTaskValidator extends AbstractValidator<PropagationTaskC if (task == null) { isValid = true; } else { - isValid = task.getMode() != null - && task.getOperation() != null + isValid = task.getOperation() != null && !task.getAttributes().isEmpty() && task.getResource() != null; http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java index 9055fbc..7377475 100644 --- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java +++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/TaskTest.java @@ -29,7 +29,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.syncope.common.lib.types.AnyTypeKind; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO; @@ -114,7 +113,6 @@ public class TaskTest extends AbstractTest { PropagationTask task = entityFactory.newEntity(PropagationTask.class); task.setResource(resource); task.setAnyTypeKind(AnyTypeKind.USER); - task.setMode(PropagationMode.TWO_PHASES); task.setOperation(ResourceOperation.CREATE); task.setConnObjectKey("[email protected]"); http://git-wip-us.apache.org/repos/asf/syncope/blob/44cbf349/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java ---------------------------------------------------------------------- diff --git a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java index 7ef25aa..2b3d6c7 100644 --- a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java +++ b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/outer/TaskTest.java @@ -31,7 +31,6 @@ import java.util.Set; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.MatchingRule; -import org.apache.syncope.common.lib.types.PropagationMode; import org.apache.syncope.common.lib.types.PropagationTaskExecStatus; import org.apache.syncope.common.lib.types.ResourceOperation; import org.apache.syncope.common.lib.types.TaskType; @@ -93,7 +92,6 @@ public class TaskTest extends AbstractTest { PropagationTask task = entityFactory.newEntity(PropagationTask.class); task.setResource(resource); task.setAnyTypeKind(AnyTypeKind.USER); - task.setMode(PropagationMode.TWO_PHASES); task.setOperation(ResourceOperation.CREATE); task.setConnObjectKey("[email protected]");
