Adding missing executor info for SyncopeStreamPullExecutor

apache · Jun 16, 2023 · 5662eae · 5662eae
1 parent 30a254a
commit 5662eae
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java b/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
@@ -727,7 +727,8 @@ public List<ProvisioningReport> pull(final CSVPullSpec spec, final InputStream c
                     spec.getConflictResolutionAction(),
                     spec.getPullCorrelationRule(),
                     connector,
-                    pullTask);
+                    pullTask,
+                    AuthContextUtils.getWho());
         } catch (NotFoundException e) {
             throw e;
         } catch (Exception e) {

diff --git a/...a/org/apache/syncope/core/provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java b/...a/org/apache/syncope/core/provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java
@@ -36,6 +36,6 @@ List<ProvisioningReport> pull(
             ConflictResolutionAction conflictResolutionAction,
             String pullCorrelationRule,
             Connector connector,
-            PullTaskTO pullTaskTO)
-            throws JobExecutionException;
+            PullTaskTO pullTaskTO,
+            String executor) throws JobExecutionException;
 }
diff --git a/...java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java b/...java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
@@ -161,7 +161,8 @@ public List<ProvisioningReport> pull(
             final ConflictResolutionAction conflictResolutionAction,
             final String pullCorrelationRule,
             final Connector connector,
-            final PullTaskTO pullTaskTO) throws JobExecutionException {
+            final PullTaskTO pullTaskTO,
+            final String executor) throws JobExecutionException {
 
         LOG.debug("Executing stream pull");
 
@@ -188,6 +189,7 @@ public List<ProvisioningReport> pull(
             profile.setConflictResolutionAction(conflictResolutionAction);
             profile.getActions().addAll(getPullActions(pullTaskTO.getActions().stream().
                     map(implementationDAO::find).filter(Objects::nonNull).collect(Collectors.toList())));
+            profile.setExecutor(executor);
 
             for (PullActions action : profile.getActions()) {
                 action.beforeAll(profile);

diff --git a/.../org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java b/.../org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java
@@ -114,7 +114,8 @@ public void pull() throws JobExecutionException, IOException {
                         ConflictResolutionAction.IGNORE,
                         null,
                         connector,
-                        pullTask);
+                        pullTask,
+                        "whoever");
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }