[syncope] branch 3_0_X updated: Adding missing executor info for SyncopeStreamPullExecutor

[ilgrosso]

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/3_0_X by this push:
     new 5662eae217 Adding missing executor info for SyncopeStreamPullExecutor
5662eae217 is described below

commit 5662eae2178001497afbd7cee5a4792862a80f3a
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Fri Jun 16 16:09:39 2023 +0200

    Adding missing executor info for SyncopeStreamPullExecutor
---
 .../main/java/org/apache/syncope/core/logic/ReconciliationLogic.java  | 3 ++-
 .../provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java   | 4 ++--
 .../core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java | 4 +++-
 .../provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java  | 3 ++-
 4 files changed, 9 insertions(+), 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
index ec8e974a8e..4ce8e1b552 100644
--- 
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 class ReconciliationLogic extends 
AbstractTransactionalLogic<EntityTO> {
                     spec.getConflictResolutionAction(),
                     spec.getPullCorrelationRule(),
                     connector,
-                    pullTask);
+                    pullTask,
+                    AuthContextUtils.getWho());
         } catch (NotFoundException e) {
             throw e;
         } catch (Exception e) {
diff --git 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java
 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java
index cbcb78f893..40440508a3 100644
--- 
a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java
+++ 
b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/stream/SyncopeStreamPullExecutor.java
@@ -36,6 +36,6 @@ public interface SyncopeStreamPullExecutor {
             ConflictResolutionAction conflictResolutionAction,
             String pullCorrelationRule,
             Connector connector,
-            PullTaskTO pullTaskTO)
-            throws JobExecutionException;
+            PullTaskTO pullTaskTO,
+            String executor) throws JobExecutionException;
 }
diff --git 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
index 51b378f9d4..c8f7ebbcc3 100644
--- 
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
+++ 
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegate.java
@@ -161,7 +161,8 @@ public class StreamPullJobDelegate extends PullJobDelegate 
implements SyncopeStr
             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 class StreamPullJobDelegate extends PullJobDelegate 
implements SyncopeStr
             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/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java
 
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java
index e0490fc251..4fd7afc46c 100644
--- 
a/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java
+++ 
b/core/provisioning-java/src/test/java/org/apache/syncope/core/provisioning/java/pushpull/stream/StreamPullJobDelegateTest.java
@@ -114,7 +114,8 @@ public class StreamPullJobDelegateTest extends AbstractTest 
{
                         ConflictResolutionAction.IGNORE,
                         null,
                         connector,
-                        pullTask);
+                        pullTask,
+                        "whoever");
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }