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 9f88bca  [SYNCOPE-1508] Ensuring PropagationActions#moreAttrsToGet is 
invoked during Push
9f88bca is described below

commit 9f88bcaf65f71d8c780189ae9e41c49ba4369cee
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Apr 17 17:58:17 2020 +0200

    [SYNCOPE-1508] Ensuring PropagationActions#moreAttrsToGet is invoked during 
Push
---
 .../implementations/MyPropagationActions.groovy      |  5 +++--
 .../api/propagation/PropagationActions.java          |  5 +++--
 .../propagation/AbstractPropagationTaskExecutor.java |  4 ++--
 .../java/pushpull/AbstractPushResultHandler.java     |  2 +-
 .../java/pushpull/DefaultUserPushResultHandler.java  |  4 ++--
 .../provisioning/java/pushpull/OutboundMatcher.java  | 20 +++++++++++++++++---
 6 files changed, 28 insertions(+), 12 deletions(-)

diff --git 
a/client/console/src/main/resources/org/apache/syncope/client/console/implementations/MyPropagationActions.groovy
 
b/client/console/src/main/resources/org/apache/syncope/client/console/implementations/MyPropagationActions.groovy
index 6f58ce0..ffabe4c 100644
--- 
a/client/console/src/main/resources/org/apache/syncope/client/console/implementations/MyPropagationActions.groovy
+++ 
b/client/console/src/main/resources/org/apache/syncope/client/console/implementations/MyPropagationActions.groovy
@@ -19,6 +19,7 @@
  */
 import groovy.transform.CompileStatic
 import java.util.Collections
+import java.util.Optional
 import java.util.Set
 import org.apache.syncope.core.persistence.api.entity.resource.OrgUnit
 import org.apache.syncope.core.persistence.api.entity.resource.Provision
@@ -31,12 +32,12 @@ import 
org.identityconnectors.framework.common.objects.ConnectorObject
 class MyPropagationActions implements PropagationActions {
   
   @Override
-  Set<String> moreAttrsToGet(PropagationTask task, OrgUnit orgUnit) {
+  Set<String> moreAttrsToGet(Optional<PropagationTask> task, OrgUnit orgUnit) {
     return Collections.emptySet();
   }
 
   @Override
-  Set<String> moreAttrsToGet(PropagationTask task, Provision provision) {
+  Set<String> moreAttrsToGet(Optional<PropagationTask> task, Provision 
provision) {
     return Collections.emptySet();
   }
 
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationActions.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationActions.java
index b08f507..203fb88 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationActions.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationActions.java
@@ -19,6 +19,7 @@
 package org.apache.syncope.core.provisioning.api.propagation;
 
 import java.util.Collections;
+import java.util.Optional;
 import java.util.Set;
 import org.apache.syncope.core.persistence.api.entity.resource.OrgUnit;
 import org.apache.syncope.core.persistence.api.entity.resource.Provision;
@@ -35,7 +36,7 @@ public interface PropagationActions {
      * @param orgUnit Realm provisioning information
      * @return additional attributes to include in the result from the 
underlying connector
      */
-    default Set<String> moreAttrsToGet(PropagationTask task, OrgUnit orgUnit) {
+    default Set<String> moreAttrsToGet(Optional<PropagationTask> task, OrgUnit 
orgUnit) {
         return Collections.emptySet();
     }
 
@@ -46,7 +47,7 @@ public interface PropagationActions {
      * @param provision Any provisioning information
      * @return additional attributes to include in the result from the 
underlying connector
      */
-    default Set<String> moreAttrsToGet(PropagationTask task, Provision 
provision) {
+    default Set<String> moreAttrsToGet(Optional<PropagationTask> task, 
Provision provision) {
         return Collections.emptySet();
     }
 
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index e76a7de..5eb6365 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -400,7 +400,7 @@ public abstract class AbstractPropagationTaskExecutor 
implements PropagationTask
             provision = task.getResource().getProvision(new 
ObjectClass(task.getObjectClassName())).orElse(null);
             orgUnit = task.getResource().getOrgUnit();
 
-            if (taskInfo.getBeforeObj() == null) {
+            if (taskInfo.getBeforeObj() == null || 
!taskInfo.getBeforeObj().isPresent()) {
                 // Try to read remote object BEFORE any actual operation
                 beforeObj = provision == null && orgUnit == null
                         ? null
@@ -691,7 +691,7 @@ public abstract class AbstractPropagationTaskExecutor 
implements PropagationTask
                 : task.getOldConnObjectKey();
 
         Set<String> moreAttrsToGet = new HashSet<>();
-        actions.forEach(action -> 
moreAttrsToGet.addAll(action.moreAttrsToGet(task, orgUnit)));
+        actions.forEach(action -> 
moreAttrsToGet.addAll(action.moreAttrsToGet(Optional.of(task), orgUnit)));
 
         ConnectorObject obj = null;
         Optional<? extends OrgUnitItem> connObjectKeyItem = 
orgUnit.getConnObjectKeyItem();
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 5e39b28..9110edb 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
@@ -165,7 +165,7 @@ public abstract class AbstractPushResultHandler extends 
AbstractSyncopeResultHan
                 before.getVirAttrs(),
                 noPropResources);
         if (!taskInfos.isEmpty()) {
-            taskInfos.get(0).setBeforeObj(Optional.ofNullable(null));
+            taskInfos.get(0).setBeforeObj(Optional.empty());
             PropagationReporter reporter = new DefaultPropagationReporter();
             taskExecutor.execute(taskInfos.get(0), reporter);
             reportPropagation(result, reporter);
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
index 78ad501..9479e46 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultUserPushResultHandler.java
@@ -370,7 +370,7 @@ public class DefaultUserPushResultHandler extends 
AbstractPushResultHandler impl
                 null,
                 null);
         if (!taskInfos.isEmpty()) {
-            taskInfos.get(0).setBeforeObj(Optional.ofNullable(null));
+            taskInfos.get(0).setBeforeObj(Optional.empty());
             PropagationReporter reporter = new DefaultPropagationReporter();
             taskExecutor.execute(taskInfos.get(0), reporter);
             reportPropagation(result, reporter);
@@ -397,7 +397,7 @@ public class DefaultUserPushResultHandler extends 
AbstractPushResultHandler impl
                         propByLinkedAccount,
                         ""));
         if (!taskInfos.isEmpty()) {
-            taskInfos.get(0).setBeforeObj(Optional.ofNullable(null));
+            taskInfos.get(0).setBeforeObj(Optional.empty());
             PropagationReporter reporter = new DefaultPropagationReporter();
             taskExecutor.execute(taskInfos.get(0), reporter);
             reportPropagation(result, reporter);
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/OutboundMatcher.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/OutboundMatcher.java
index efdca3a..c4c2e2e 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/OutboundMatcher.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/OutboundMatcher.java
@@ -111,7 +111,7 @@ public class OutboundMatcher {
         }
 
         Set<String> moreAttrsToGet = new HashSet<>();
-        actions.forEach(action -> 
moreAttrsToGet.addAll(action.moreAttrsToGet(task, provision)));
+        actions.forEach(action -> 
moreAttrsToGet.addAll(action.moreAttrsToGet(Optional.of(task), provision)));
 
         List<ConnectorObject> result = new ArrayList<>();
         try {
@@ -151,6 +151,20 @@ public class OutboundMatcher {
             final Optional<String[]> moreAttrsToGet,
             final LinkingMappingItem... linkingItems) {
 
+        Set<String> matgFromPropagationActions = new HashSet<>();
+        provision.getResource().getPropagationActions().forEach(impl -> {
+            try {
+                matgFromPropagationActions.addAll(
+                        ImplementationManager.<PropagationActions>build(impl).
+                                moreAttrsToGet(Optional.empty(), provision));
+            } catch (Exception e) {
+                LOG.error("While building {}", impl, e);
+            }
+        });
+        Optional<String[]> effectiveMATG = Optional.of(Stream.concat(
+                moreAttrsToGet.map(Stream::of).orElse(Stream.empty()),
+                matgFromPropagationActions.stream()).toArray(String[]::new));
+
         Optional<PushCorrelationRule> rule = rule(provision);
 
         List<ConnectorObject> result = new ArrayList<>();
@@ -160,7 +174,7 @@ public class OutboundMatcher {
                         connector,
                         rule.get().getFilter(any, provision),
                         provision,
-                        moreAttrsToGet,
+                        effectiveMATG,
                         ArrayUtils.isEmpty(linkingItems)
                         ? Optional.empty() : 
Optional.of(Arrays.asList(linkingItems))));
             } else {
@@ -173,7 +187,7 @@ public class OutboundMatcher {
                             connObjectKeyItem.get(),
                             connObjectKeyValue.get(),
                             provision,
-                            moreAttrsToGet,
+                            effectiveMATG,
                             ArrayUtils.isEmpty(linkingItems)
                             ? Optional.empty() : 
Optional.of(Arrays.asList(linkingItems))).
                             ifPresent(result::add);

Reply via email to