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 2019/10/22 09:43:11 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1500] Test fix
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 798b423 [SYNCOPE-1500] Test fix
798b423 is described below
commit 798b423714f8de68361d2302081d77fd06b29d86
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Oct 22 11:42:59 2019 +0200
[SYNCOPE-1500] Test fix
---
.../provisioning/java/pushpull/AbstractPushResultHandler.java | 8 ++++----
.../core/rest/cxf/service/ReconciliationServiceImpl.java | 4 ----
.../test/java/org/apache/syncope/fit/core/PushTaskITCase.java | 11 +++--------
3 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
index a01d754..8e3635f 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPushResultHandler.java
@@ -102,7 +102,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
final ProvisioningReport result) {
boolean changepwd = any instanceof User;
- List<String> ownedResources = anyUtilsFactory.getInstance(any).getAllResources(any).stream().
+ List<String> ownedResources = getAnyUtils().getAllResources(any).stream().
map(Entity::getKey).collect(Collectors.toList());
List<String> noPropResources = new ArrayList<>(ownedResources);
@@ -178,7 +178,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void link(final Any<?> any, final boolean unlink, final ProvisioningReport result) {
- AnyPatch patch = anyUtilsFactory.getInstance(any).newAnyPatch(any.getKey());
+ AnyPatch patch = getAnyUtils().newAnyPatch(any.getKey());
patch.getResources().add(new StringPatchItem.Builder().
operation(unlink ? PatchOperation.DELETE : PatchOperation.ADD_REPLACE).
value(profile.getTask().getResource().getKey()).build());
@@ -189,7 +189,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void unassign(final Any<?> any, final ConnectorObject beforeObj, final ProvisioningReport result) {
- AnyPatch patch = anyUtilsFactory.getInstance(any).newAnyPatch(any.getKey());
+ AnyPatch patch = getAnyUtils().newAnyPatch(any.getKey());
patch.getResources().add(new StringPatchItem.Builder().
operation(PatchOperation.DELETE).
value(profile.getTask().getResource().getKey()).build());
@@ -200,7 +200,7 @@ public abstract class AbstractPushResultHandler extends AbstractSyncopeResultHan
}
protected void assign(final Any<?> any, final Boolean enabled, final ProvisioningReport result) {
- AnyPatch patch = anyUtilsFactory.getInstance(any).newAnyPatch(any.getKey());
+ AnyPatch patch = getAnyUtils().newAnyPatch(any.getKey());
patch.getResources().add(new StringPatchItem.Builder().
operation(PatchOperation.ADD_REPLACE).
value(profile.getTask().getResource().getKey()).build());
diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java
index 6ef791d..7b77c2f 100644
--- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java
+++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ReconciliationServiceImpl.java
@@ -25,7 +25,6 @@ import org.apache.syncope.common.lib.to.ReconStatus;
import org.apache.syncope.common.rest.api.beans.ReconQuery;
import org.apache.syncope.common.rest.api.service.ReconciliationService;
import org.apache.syncope.core.logic.ReconciliationLogic;
-import org.apache.syncope.core.persistence.api.entity.AnyUtilsFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -35,9 +34,6 @@ public class ReconciliationServiceImpl extends AbstractServiceImpl implements Re
@Autowired
private ReconciliationLogic logic;
- @Autowired
- private AnyUtilsFactory anyUtilsFactory;
-
private void validate(final ReconQuery reconQuery) {
if ((reconQuery.getAnyKey() == null && reconQuery.getConnObjectKeyValue() == null)
|| (reconQuery.getAnyKey() != null && reconQuery.getConnObjectKeyValue() != null)) {
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 41615b1..6c3fed5 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
@@ -320,14 +320,9 @@ public class PushTaskITCase extends AbstractTaskITCase {
// as task executor is not able any more to identify the entry to UPDATE
execProvisioningTask(taskService, TaskType.PUSH, sendVivaldi.getKey(), 50, false);
- PagedResult<PropagationTaskTO> propagationTasks = taskService.search(
- new TaskQuery.Builder(TaskType.PROPAGATION).
- resource(RESOURCE_NAME_LDAP).entityKey("vivaldi").details(true).build());
- PropagationTaskTO lastPropagation = propagationTasks.getResult().stream().
- sorted((t1, t2) -> t2.getExecutions().get(0).getStart().
- compareTo(t1.getExecutions().get(0).getStart())).findFirst().get();
- assertEquals(ExecStatus.FAILURE, ExecStatus.valueOf(lastPropagation.getLatestExecStatus()));
- assertTrue(lastPropagation.getExecutions().get(0).getMessage().contains("ENTRY_ALREADY_EXISTS"));
+ status = reconciliationService.status(
+ new ReconQuery.Builder(AnyTypeKind.USER.name(), RESOURCE_NAME_LDAP).anyKey("vivaldi").build());
+ assertNull(status.getOnResource());
} finally {
ldap.setPushPolicy(null);
resourceService.update(ldap);