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 2016/07/26 10:52:23 UTC
syncope git commit: Consolidating
getBeanFactory().getBean(PropagationReporter.class)
Repository: syncope
Updated Branches:
refs/heads/master 8efa3701e -> 945be8772
Consolidating getBeanFactory().getBean(PropagationReporter.class)
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/945be877
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/945be877
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/945be877
Branch: refs/heads/master
Commit: 945be8772fef234bd28c32896c2a2a5f47c4a4de
Parents: 8efa370
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Jul 26 12:52:13 2016 +0200
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Jul 26 12:52:13 2016 +0200
----------------------------------------------------------------------
.../apache/syncope/core/logic/RealmLogic.java | 13 ++------
.../propagation/PropagationTaskExecutor.java | 24 ++------------
.../DefaultAnyObjectProvisioningManager.java | 21 +++---------
.../java/DefaultGroupProvisioningManager.java | 25 ++++----------
.../java/DefaultUserProvisioningManager.java | 35 +++++---------------
.../AbstractPropagationTaskExecutor.java | 12 ++++---
.../PriorityPropagationTaskExecutor.java | 12 +++++--
.../PropagationTaskCallableImpl.java | 6 ++--
.../pushpull/RealmPullResultHandlerImpl.java | 13 ++------
.../pushpull/RealmPushResultHandlerImpl.java | 6 +---
.../processor/AnyObjectCreateProcessor.java | 5 +--
.../processor/AnyObjectDeleteProcessor.java | 5 +--
.../AnyObjectDeprovisionProcessor.java | 5 +--
.../processor/AnyObjectProvisionProcessor.java | 5 +--
.../processor/AnyObjectUpdateProcessor.java | 5 +--
.../processor/GroupCreateInPullProcessor.java | 5 +--
.../camel/processor/GroupCreateProcessor.java | 5 +--
.../camel/processor/GroupDeleteProcessor.java | 5 +--
.../processor/GroupDeprovisionProcessor.java | 5 +--
.../processor/GroupProvisionProcessor.java | 5 +--
.../camel/processor/GroupUpdateProcessor.java | 5 +--
.../processor/UserConfirmPwdResetProcessor.java | 10 ++----
.../camel/processor/UserCreateProcessor.java | 9 ++---
.../camel/processor/UserDeleteProcessor.java | 5 +--
.../processor/UserDeprovisionProcessor.java | 5 +--
.../camel/processor/UserProvisionProcessor.java | 5 +--
.../UserStatusPropagationProcessor.java | 8 ++---
.../processor/UserUpdateInPullProcessor.java | 9 ++---
.../camel/processor/UserUpdateProcessor.java | 9 ++---
29 files changed, 78 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java
index 985bd02..6cc22fd 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/RealmLogic.java
@@ -48,7 +48,6 @@ import org.apache.syncope.core.provisioning.api.data.RealmDataBinder;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -103,9 +102,7 @@ public class RealmLogic extends AbstractTransactionalLogic<RealmTO> {
propByRes.add(ResourceOperation.CREATE, resource);
}
List<PropagationTask> tasks = propagationManager.createTasks(realm, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, false);
ProvisioningResult<RealmTO> result = new ProvisioningResult<>();
result.setEntity(binder.getRealmTO(realm));
@@ -127,9 +124,7 @@ public class RealmLogic extends AbstractTransactionalLogic<RealmTO> {
realm = realmDAO.save(realm);
List<PropagationTask> tasks = propagationManager.createTasks(realm, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, false);
ProvisioningResult<RealmTO> result = new ProvisioningResult<>();
result.setEntity(binder.getRealmTO(realm));
@@ -172,9 +167,7 @@ public class RealmLogic extends AbstractTransactionalLogic<RealmTO> {
propByRes.add(ResourceOperation.DELETE, resource);
}
List<PropagationTask> tasks = propagationManager.createTasks(realm, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, false);
ProvisioningResult<RealmTO> result = new ProvisioningResult<>();
result.setEntity(binder.getRealmTO(realm));
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
index ace29a2..cd34ca0 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/propagation/PropagationTaskExecutor.java
@@ -42,17 +42,6 @@ public interface PropagationTaskExecutor {
String MANDATORY_NULL_OR_EMPTY_ATTR_NAME = "__MANDATORY_NULL_OR_EMPTY__";
/**
- * Creates new instances of {@link PropagationTaskCallable} for usage with
- * {@link java.util.concurrent.CompletionService}.
- *
- * @param task to be executed
- * @param reporter to report propagation execution status
- * @return new {@link PropagationTaskCallable} instance for usage with
- * {@link java.util.concurrent.CompletionService}
- */
- PropagationTaskCallable newPropagationTaskCallable(PropagationTask task, PropagationReporter reporter);
-
- /**
* Execute the given PropagationTask and returns the generated {@link TaskExec}.
*
* @param task to be executed
@@ -61,15 +50,6 @@ public interface PropagationTaskExecutor {
TaskExec execute(PropagationTask task);
/**
- * Execute the given PropagationTask, invoke the given handler and returns the generated TaskExec.
- *
- * @param task to be executed
- * @param reporter to report propagation execution status
- * @return the generated TaskExec
- */
- TaskExec execute(PropagationTask task, PropagationReporter reporter);
-
- /**
* Execute a collection of PropagationTask objects.
* The process is interrupted as soon as the result of the communication with a primary resource is in error.
*
@@ -83,8 +63,8 @@ public interface PropagationTaskExecutor {
* in error.
*
* @param tasks to be execute, in given order
- * @param reporter to report propagation execution status
* @param nullPriorityAsync asynchronously executes tasks related to resources with no priority
+ * @return reporter to report propagation execution status
*/
- void execute(Collection<PropagationTask> tasks, PropagationReporter reporter, boolean nullPriorityAsync);
+ PropagationReporter execute(Collection<PropagationTask> tasks, boolean nullPriorityAsync);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
index b403bc1..df550e8 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultAnyObjectProvisioningManager.java
@@ -38,7 +38,6 @@ import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.workflow.api.AnyObjectWorkflowAdapter;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,9 +78,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
created.getPropByRes(),
anyObjectTO.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(created.getResult(), propagationReporter.getStatuses());
}
@@ -107,9 +104,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
updated.getPropByRes(),
anyObjectPatch.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(updated.getResult(), propagationReporter.getStatuses());
}
@@ -128,9 +123,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
key,
null,
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
awfAdapter.delete(key);
@@ -162,9 +155,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
propByRes,
null,
null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return propagationReporter.getStatuses();
}
@@ -181,9 +172,7 @@ public class DefaultAnyObjectProvisioningManager implements AnyObjectProvisionin
key,
propByRes,
CollectionUtils.removeAll(anyObjectDAO.findAllResourceNames(key), resources));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return propagationReporter.getStatuses();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
index 7711238..f0f8a8c 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultGroupProvisioningManager.java
@@ -43,7 +43,6 @@ import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.provisioning.api.data.GroupDataBinder;
import org.apache.syncope.core.workflow.api.GroupWorkflowAdapter;
@@ -85,9 +84,7 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
created.getPropByRes(),
groupTO.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(created.getResult(), propagationReporter.getStatuses());
}
@@ -113,9 +110,7 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
created.getPropByRes(),
groupTO.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(created.getResult(), null);
}
@@ -139,9 +134,7 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
updated.getPropByRes(),
groupPatch.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(updated.getResult(), propagationReporter.getStatuses());
}
@@ -185,9 +178,7 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
null,
null));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
gwfAdapter.delete(key);
@@ -215,9 +206,7 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
propByRes,
null,
null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return propagationReporter.getStatuses();
}
@@ -234,9 +223,7 @@ public class DefaultGroupProvisioningManager implements GroupProvisioningManager
key,
propByRes,
CollectionUtils.removeAll(groupDAO.authFind(key).getResourceKeys(), resources));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return propagationReporter.getStatuses();
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
index 85d55cd..694610b 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/DefaultUserProvisioningManager.java
@@ -47,7 +47,6 @@ import org.apache.syncope.core.provisioning.api.propagation.PropagationException
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.provisioning.api.pushpull.ProvisioningReport;
import org.apache.syncope.core.workflow.api.UserWorkflowAdapter;
@@ -112,9 +111,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
created.getPropByRes(),
userTO.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(created.getResult().getKey(), propagationReporter.getStatuses());
}
@@ -124,9 +121,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
WorkflowResult<Pair<UserPatch, Boolean>> updated = uwfAdapter.update(userPatch);
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(updated);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(updated.getResult().getKey().getKey(), propagationReporter.getStatuses());
}
@@ -184,9 +179,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(
updated, updated.getResult().getKey().getPassword() != null, excludedResources);
- PropagationReporter propagationReporter = ApplicationContextProvider.getBeanFactory().
- getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return new ImmutablePair<>(updated.getResult().getKey().getKey(), propagationReporter.getStatuses());
}
@@ -213,9 +206,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
key,
propByRes,
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
try {
uwfAdapter.delete(key);
@@ -283,11 +274,9 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
propByRes,
null,
null);
- PropagationReporter propReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
- return propReporter.getStatuses();
+ return propagationReporter.getStatuses();
}
@Override
@@ -341,9 +330,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
ImmutablePair.of(userPatch, (Boolean) null), propByRes, "update");
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(wfResult, changePwd, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return propagationReporter.getStatuses();
}
@@ -360,9 +347,7 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
key,
propByRes,
CollectionUtils.removeAll(userDAO.findAllResourceNames(key), resources));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
return propagationReporter.getStatuses();
}
@@ -378,8 +363,6 @@ public class DefaultUserProvisioningManager implements UserProvisioningManager {
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(updated);
- PropagationReporter propReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propReporter, false);
+ taskExecutor.execute(tasks, false);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
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 856fcd0..54c53c2 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
@@ -349,8 +349,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
return result;
}
- @Override
- public TaskExec execute(final PropagationTask task, final PropagationReporter reporter) {
+ protected TaskExec execute(final PropagationTask task, final PropagationReporter reporter) {
List<PropagationActions> actions = getPropagationActions(task.getResource());
Date start = new Date();
@@ -520,24 +519,27 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
@Override
public void execute(final Collection<PropagationTask> tasks) {
- execute(tasks, null, false);
+ execute(tasks, false);
}
protected abstract void doExecute(
Collection<PropagationTask> tasks, PropagationReporter reporter, boolean nullPriorityAsync);
@Override
- public void execute(
+ public PropagationReporter execute(
final Collection<PropagationTask> tasks,
- final PropagationReporter reporter,
final boolean nullPriorityAsync) {
+ PropagationReporter reporter =
+ ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
try {
doExecute(tasks, reporter, nullPriorityAsync);
} catch (PropagationException e) {
LOG.error("Error propagation priority resource", e);
reporter.onPriorityResourceFailure(e.getResourceName(), tasks);
}
+
+ return reporter;
}
/**
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
index 15ddb30..5fc32e1 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PriorityPropagationTaskExecutor.java
@@ -57,8 +57,16 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
@Resource(name = "propagationTaskExecutorAsyncExecutor")
protected ThreadPoolTaskExecutor executor;
- @Override
- public PropagationTaskCallable newPropagationTaskCallable(
+ /**
+ * Creates new instances of {@link PropagationTaskCallable} for usage with
+ * {@link java.util.concurrent.CompletionService}.
+ *
+ * @param task to be executed
+ * @param reporter to report propagation execution status
+ * @return new {@link PropagationTaskCallable} instance for usage with
+ * {@link java.util.concurrent.CompletionService}
+ */
+ protected PropagationTaskCallable newPropagationTaskCallable(
final PropagationTask task, final PropagationReporter reporter) {
PropagationTaskCallable callable = (PropagationTaskCallable) ApplicationContextProvider.getBeanFactory().
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationTaskCallableImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationTaskCallableImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationTaskCallableImpl.java
index 1c0aa9b..33adeec 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationTaskCallableImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/PropagationTaskCallableImpl.java
@@ -46,7 +46,7 @@ public class PropagationTaskCallableImpl implements PropagationTaskCallable {
private final Collection<? extends GrantedAuthority> authorities;
- private PropagationTaskExecutor executor;
+ private AbstractPropagationTaskExecutor executor;
private PropagationTask task;
@@ -61,7 +61,9 @@ public class PropagationTaskCallableImpl implements PropagationTaskCallable {
@Override
public void setExecutor(final PropagationTaskExecutor executor) {
- this.executor = executor;
+ if (executor instanceof AbstractPropagationTaskExecutor) {
+ this.executor = (AbstractPropagationTaskExecutor) executor;
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java
index bb0ec6d..d2d9dc5 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPullResultHandlerImpl.java
@@ -54,7 +54,6 @@ import org.apache.syncope.core.provisioning.api.pushpull.PullActions;
import org.apache.syncope.core.provisioning.api.pushpull.SyncopePullExecutor;
import org.apache.syncope.core.provisioning.api.pushpull.SyncopePullResultHandler;
import org.apache.syncope.core.provisioning.java.jexl.JexlUtils;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.SyncDelta;
import org.identityconnectors.framework.common.objects.SyncDeltaType;
@@ -222,9 +221,7 @@ public class RealmPullResultHandlerImpl
propByRes.add(ResourceOperation.CREATE, resource);
}
List<PropagationTask> tasks = propagationManager.createTasks(realm, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, false);
RealmTO actual = binder.getRealmTO(realm);
@@ -286,9 +283,7 @@ public class RealmPullResultHandlerImpl
Realm updated = realmDAO.save(realm);
List<PropagationTask> tasks = propagationManager.createTasks(updated, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, false);
output = updated;
resultStatus = Result.SUCCESS;
@@ -521,9 +516,7 @@ public class RealmPullResultHandlerImpl
propByRes.add(ResourceOperation.DELETE, resource);
}
List<PropagationTask> tasks = propagationManager.createTasks(realm, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, false);
realmDAO.delete(realm);
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
index e823b45..2425ac4 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/RealmPushResultHandlerImpl.java
@@ -34,13 +34,11 @@ import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.persistence.api.entity.task.PushTask;
import org.apache.syncope.core.provisioning.api.Connector;
import org.apache.syncope.core.provisioning.api.TimeoutException;
-import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.pushpull.IgnoreProvisionException;
import org.apache.syncope.core.provisioning.api.pushpull.ProvisioningReport;
import org.apache.syncope.core.provisioning.api.pushpull.PushActions;
import org.apache.syncope.core.provisioning.api.pushpull.SyncopePushResultHandler;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.ResultsHandler;
@@ -83,9 +81,7 @@ public class RealmPushResultHandlerImpl
realm = realmDAO.save(realm);
List<PropagationTask> tasks = propagationManager.createTasks(realm, propByRes, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, false);
+ taskExecutor.execute(tasks, false);
return realm;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
index 423981f..426ab81 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectCreateProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -57,9 +56,7 @@ public class AnyObjectCreateProcessor implements Processor {
created.getPropByRes(),
any.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(created.getResult(), propagationReporter.getStatuses()));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
index 7d0b966..e87a6ab 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeleteProcessor.java
@@ -23,7 +23,6 @@ import java.util.Set;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -56,9 +55,7 @@ public class AnyObjectDeleteProcessor implements Processor {
key,
null,
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.setProperty("statuses", propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
index 4c83fe5..c16708d 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectDeprovisionProcessor.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -61,9 +60,7 @@ public class AnyObjectDeprovisionProcessor implements Processor {
key,
propByRes,
CollectionUtils.removeAll(anyObjectDAO.findAllResourceNames(key), resources));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
index 2c5bb45..c548a27 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectProvisionProcessor.java
@@ -24,7 +24,6 @@ import org.apache.camel.Processor;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -59,9 +58,7 @@ public class AnyObjectProvisionProcessor implements Processor {
propByRes,
null,
null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
index efd7635..b42e34e 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/AnyObjectUpdateProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.syncope.common.lib.patch.AnyObjectPatch;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -63,9 +62,7 @@ public class AnyObjectUpdateProcessor implements Processor {
updated.getPropByRes(),
anyObjectPatch.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(updated.getResult(), propagationReporter.getStatuses()));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInPullProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInPullProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInPullProcessor.java
index 2a97f6f..256bccd 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInPullProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateInPullProcessor.java
@@ -29,7 +29,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -67,9 +66,7 @@ public class GroupCreateInPullProcessor implements Processor {
created.getPropByRes(),
groupTO.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(created.getResult(), null));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
index 393ece0..c700743 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupCreateProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -57,9 +56,7 @@ public class GroupCreateProcessor implements Processor {
created.getPropByRes(),
any.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(created.getResult(), propagationReporter.getStatuses()));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
index 0ad4d77..32c9823 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeleteProcessor.java
@@ -25,7 +25,6 @@ import java.util.Set;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.core.provisioning.api.data.GroupDataBinder;
@@ -88,9 +87,7 @@ public class GroupDeleteProcessor implements Processor {
null,
null));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.setProperty("statuses", propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
index d8e94f0..fc886b7 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupDeprovisionProcessor.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.GroupDAO;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -61,9 +60,7 @@ public class GroupDeprovisionProcessor implements Processor {
key,
propByRes,
CollectionUtils.removeAll(groupDAO.authFind(key).getResourceKeys(), resources));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
index 61c5833..d2398dd 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupProvisionProcessor.java
@@ -24,7 +24,6 @@ import org.apache.camel.Processor;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
@@ -59,9 +58,7 @@ public class GroupProvisionProcessor implements Processor {
propByRes,
null,
null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
index af400e5..ebc84a5 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/GroupUpdateProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.syncope.common.lib.patch.GroupPatch;
import org.apache.syncope.common.lib.types.AnyTypeKind;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -63,9 +62,7 @@ public class GroupUpdateProcessor implements Processor {
updated.getPropByRes(),
groupPatch.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(updated.getResult(), propagationReporter.getStatuses()));
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserConfirmPwdResetProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserConfirmPwdResetProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserConfirmPwdResetProcessor.java
index c7078ba..b86ee5f 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserConfirmPwdResetProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserConfirmPwdResetProcessor.java
@@ -23,11 +23,9 @@ import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.patch.UserPatch;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
-import org.apache.syncope.core.provisioning.api.propagation.PropagationReporter;
import org.apache.syncope.core.provisioning.api.propagation.PropagationTaskExecutor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -44,13 +42,11 @@ public class UserConfirmPwdResetProcessor implements Processor {
@Override
public void process(final Exchange exchange) {
@SuppressWarnings("unchecked")
- WorkflowResult<Pair<UserPatch, Boolean>> updated =
- (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody();
+ WorkflowResult<Pair<UserPatch, Boolean>> updated =
+ (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody();
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(updated);
- PropagationReporter propReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propReporter, false);
+ taskExecutor.execute(tasks, false);
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
index f40d23f..972b06e 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserCreateProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.to.UserTO;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -47,8 +46,8 @@ public class UserCreateProcessor implements Processor {
@Override
public void process(final Exchange exchange) {
if ((exchange.getIn().getBody() instanceof WorkflowResult)) {
- WorkflowResult<Pair<String, Boolean>> created =
- (WorkflowResult<Pair<String, Boolean>>) exchange.getIn().getBody();
+ WorkflowResult<Pair<String, Boolean>> created =
+ (WorkflowResult<Pair<String, Boolean>>) exchange.getIn().getBody();
UserTO actual = exchange.getProperty("actual", UserTO.class);
Set<String> excludedResources = exchange.getProperty("excludedResources", Set.class);
Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class);
@@ -60,9 +59,7 @@ public class UserCreateProcessor implements Processor {
created.getPropByRes(),
actual.getVirAttrs(),
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(
new ImmutablePair<>(created.getResult().getKey(), propagationReporter.getStatuses()));
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
index 0fe993c..787c60f 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeleteProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -67,9 +66,7 @@ public class UserDeleteProcessor implements Processor {
propByRes,
excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.setProperty("statuses", propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
index 38e2a21..e23693f 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserDeprovisionProcessor.java
@@ -25,7 +25,6 @@ import org.apache.commons.collections4.CollectionUtils;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -61,9 +60,7 @@ public class UserDeprovisionProcessor implements Processor {
key,
propByRes,
CollectionUtils.removeAll(userDAO.findAllResourceNames(key), resources));
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserProvisionProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserProvisionProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserProvisionProcessor.java
index 632c188..1f4c4a1 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserProvisionProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserProvisionProcessor.java
@@ -31,7 +31,6 @@ import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.types.PatchOperation;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -86,9 +85,7 @@ public class UserProvisionProcessor implements Processor {
ImmutablePair.of(userPatch, (Boolean) null), propByRes, "update");
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(wfResult, changePwd, null);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(propagationReporter.getStatuses());
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
index 1a5c243..f2ad3d8 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserStatusPropagationProcessor.java
@@ -27,7 +27,6 @@ import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.provisioning.api.PropagationByResource;
import org.apache.syncope.common.lib.types.ResourceOperation;
import org.apache.syncope.common.lib.types.StatusPatchType;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.dao.UserDAO;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -66,11 +65,8 @@ public class UserStatusPropagationProcessor implements Processor {
propByRes,
null,
null);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
- PropagationReporter propReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propReporter, nullPriorityAsync);
-
- exchange.getOut().setBody(new ImmutablePair<>(updated.getResult(), propReporter.getStatuses()));
+ exchange.getOut().setBody(new ImmutablePair<>(updated.getResult(), propagationReporter.getStatuses()));
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateInPullProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateInPullProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateInPullProcessor.java
index 2aaaf80..1fb917d 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateInPullProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateInPullProcessor.java
@@ -25,7 +25,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.patch.UserPatch;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -46,16 +45,14 @@ public class UserUpdateInPullProcessor implements Processor {
@SuppressWarnings("unchecked")
@Override
public void process(final Exchange exchange) {
- WorkflowResult<Pair<UserPatch, Boolean>> updated =
- (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody();
+ WorkflowResult<Pair<UserPatch, Boolean>> updated =
+ (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody();
Set<String> excludedResources = exchange.getProperty("excludedResources", Set.class);
Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class);
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(
updated, updated.getResult().getKey().getPassword() != null, excludedResources);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(
updated.getResult().getKey().getKey(), propagationReporter.getStatuses()));
http://git-wip-us.apache.org/repos/asf/syncope/blob/945be877/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
index 4cf61e8..219f680 100644
--- a/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
+++ b/ext/camel/provisioning-camel/src/main/java/org/apache/syncope/core/provisioning/camel/processor/UserUpdateProcessor.java
@@ -24,7 +24,6 @@ import org.apache.camel.Processor;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.common.lib.patch.UserPatch;
-import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.apache.syncope.core.persistence.api.entity.task.PropagationTask;
import org.apache.syncope.core.provisioning.api.VirAttrHandler;
import org.apache.syncope.core.provisioning.api.WorkflowResult;
@@ -49,14 +48,12 @@ public class UserUpdateProcessor implements Processor {
@Override
@SuppressWarnings("unchecked")
public void process(final Exchange exchange) {
- WorkflowResult<Pair<UserPatch, Boolean>> updated =
- (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody();
+ WorkflowResult<Pair<UserPatch, Boolean>> updated =
+ (WorkflowResult<Pair<UserPatch, Boolean>>) exchange.getIn().getBody();
Boolean nullPriorityAsync = exchange.getProperty("nullPriorityAsync", Boolean.class);
List<PropagationTask> tasks = propagationManager.getUserUpdateTasks(updated);
- PropagationReporter propagationReporter =
- ApplicationContextProvider.getBeanFactory().getBean(PropagationReporter.class);
- taskExecutor.execute(tasks, propagationReporter, nullPriorityAsync);
+ PropagationReporter propagationReporter = taskExecutor.execute(tasks, nullPriorityAsync);
exchange.getOut().setBody(new ImmutablePair<>(
updated.getResult().getKey().getKey(), propagationReporter.getStatuses()));