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 8a56dc1  [SYNCOPE-957] Adding remediation support
8a56dc1 is described below

commit 8a56dc19997d318982b368853dc7c41deec70123
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Mon Oct 28 17:08:59 2019 +0100

    [SYNCOPE-957] Adding remediation support
---
 .../syncope/core/logic/RemediationLogic.java       |  1 -
 .../pushpull/DefaultUserPullResultHandler.java     | 46 +++++++++++++++++++++-
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git 
a/core/logic/src/main/java/org/apache/syncope/core/logic/RemediationLogic.java 
b/core/logic/src/main/java/org/apache/syncope/core/logic/RemediationLogic.java
index 19f6c8f..986da0d 100644
--- 
a/core/logic/src/main/java/org/apache/syncope/core/logic/RemediationLogic.java
+++ 
b/core/logic/src/main/java/org/apache/syncope/core/logic/RemediationLogic.java
@@ -217,5 +217,4 @@ public class RemediationLogic extends 
AbstractTransactionalLogic<RemediationTO>
 
         throw new UnresolvedReferenceException();
     }
-
 }
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
index 31b8afe..4f29d4e 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPullResultHandler.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.core.provisioning.java.pushpull;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -46,6 +47,7 @@ import org.apache.syncope.common.lib.types.UnmatchingRule;
 import org.apache.syncope.core.persistence.api.dao.PullMatch;
 import org.apache.syncope.core.persistence.api.entity.Any;
 import org.apache.syncope.core.persistence.api.entity.AnyUtils;
+import org.apache.syncope.core.persistence.api.entity.Remediation;
 import org.apache.syncope.core.persistence.api.entity.resource.Provision;
 import org.apache.syncope.core.persistence.api.entity.user.LinkedAccount;
 import org.apache.syncope.core.persistence.api.entity.user.User;
@@ -172,7 +174,7 @@ public class DefaultUserPullResultHandler extends 
AbstractPullResultHandler impl
                         // do nothing
                     }
                 } else if (SyncDeltaType.DELETE == delta.getDeltaType()) {
-                    delete(delta, 
account).ifPresent(profile.getResults()::add);
+                    delete(delta, account, 
provision).ifPresent(profile.getResults()::add);
                 }
             } else {
                 if (SyncDeltaType.CREATE_OR_UPDATE == delta.getDeltaType()) {
@@ -388,6 +390,19 @@ public class DefaultUserPullResultHandler extends 
AbstractPullResultHandler impl
                 LOG.error("Could not create linked account {} ", 
accountTO.getConnObjectKeyValue(), e);
                 output = e;
                 resultStatus = Result.FAILURE;
+
+                if (profile.getTask().isRemediation()) {
+                    Remediation entity = 
entityFactory.newEntity(Remediation.class);
+                    entity.setAnyType(provision.getAnyType());
+                    entity.setOperation(ResourceOperation.UPDATE);
+                    entity.setPayload(patch);
+                    entity.setError(report.getMessage());
+                    entity.setInstant(new Date());
+                    
entity.setRemoteName(delta.getObject().getName().getNameValue());
+                    entity.setPullTask(profile.getTask());
+
+                    remediationDAO.save(entity);
+                }
             }
 
             end(AnyTypeKind.USER, UnmatchingRule.toEventName(rule), 
resultStatus, null, output, delta);
@@ -499,6 +514,19 @@ public class DefaultUserPullResultHandler extends 
AbstractPullResultHandler impl
                 LOG.error("Could not update linked account {}", account, e);
                 output = e;
                 resultStatus = Result.FAILURE;
+
+                if (profile.getTask().isRemediation()) {
+                    Remediation entity = 
entityFactory.newEntity(Remediation.class);
+                    entity.setAnyType(provision.getAnyType());
+                    entity.setOperation(ResourceOperation.UPDATE);
+                    entity.setPayload(patch);
+                    entity.setError(report.getMessage());
+                    entity.setInstant(new Date());
+                    
entity.setRemoteName(delta.getObject().getName().getNameValue());
+                    entity.setPullTask(profile.getTask());
+
+                    remediationDAO.save(entity);
+                }
             }
 
             end(AnyTypeKind.USER, 
MatchingRule.toEventName(MatchingRule.UPDATE), resultStatus, before, output, 
delta);
@@ -509,7 +537,8 @@ public class DefaultUserPullResultHandler extends 
AbstractPullResultHandler impl
 
     protected Optional<ProvisioningReport> delete(
             final SyncDelta delta,
-            final LinkedAccount account)
+            final LinkedAccount account,
+            final Provision provision)
             throws JobExecutionException {
 
         if (!profile.getTask().isPerformDelete()) {
@@ -565,6 +594,19 @@ public class DefaultUserPullResultHandler extends 
AbstractPullResultHandler impl
                     report.setMessage(ExceptionUtils.getRootCauseMessage(e));
                     LOG.error("Could not delete linked account {}", account, 
e);
                     output = e;
+
+                    if (profile.getTask().isRemediation()) {
+                        Remediation entity = 
entityFactory.newEntity(Remediation.class);
+                        entity.setAnyType(provision.getAnyType());
+                        entity.setOperation(ResourceOperation.UPDATE);
+                        entity.setPayload(patch);
+                        entity.setError(report.getMessage());
+                        entity.setInstant(new Date());
+                        
entity.setRemoteName(delta.getObject().getName().getNameValue());
+                        entity.setPullTask(profile.getTask());
+
+                        remediationDAO.save(entity);
+                    }
                 }
 
                 end(AnyTypeKind.USER,

Reply via email to