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 2023/02/24 09:11:25 UTC
[syncope] branch master updated (57dcda6b4d -> e9be8d2f00)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
from 57dcda6b4d Upgrading Spring Boot, Spring Cloud Gateway and cargo-maven3-plugin
new 60d33e9c1b [SYNCOPE-1734] create ES event also for attribute mapped like uidOnCreate
new e9be8d2f00 Switching to CXF 4.0.1-SNAPSHOT to avoid dependency conflicts with Spring Boot 3.0.3
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../provisioning/java/ProvisioningContext.java | 4 +++-
.../AbstractPropagationTaskExecutor.java | 26 +++++++++++++++++-----
.../PriorityPropagationTaskExecutor.java | 5 ++++-
pom.xml | 2 +-
4 files changed, 28 insertions(+), 9 deletions(-)
[syncope] 01/02: [SYNCOPE-1734] create ES event also for attribute mapped like uidOnCreate
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 60d33e9c1b655d9d59da3f3bf4bdcfb4dba6d7cc
Author: Samuel Garofalo <72...@users.noreply.github.com>
AuthorDate: Fri Feb 24 07:57:40 2023 +0100
[SYNCOPE-1734] create ES event also for attribute mapped like uidOnCreate
---
.../provisioning/java/ProvisioningContext.java | 4 +++-
.../AbstractPropagationTaskExecutor.java | 26 +++++++++++++++++-----
.../PriorityPropagationTaskExecutor.java | 5 ++++-
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
index c898d306c3..e45a4df6fb 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ProvisioningContext.java
@@ -567,7 +567,8 @@ public class ProvisioningContext {
final AuditManager auditManager,
final TaskDataBinder taskDataBinder,
final OutboundMatcher outboundMatcher,
- final PlainAttrValidationManager validator) {
+ final PlainAttrValidationManager validator,
+ final ApplicationEventPublisher publisher) {
return new PriorityPropagationTaskExecutor(
connectorManager,
@@ -585,6 +586,7 @@ public class ProvisioningContext {
taskUtilsFactory,
outboundMatcher,
validator,
+ publisher,
propagationTaskExecutorAsyncExecutor);
}
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 02b992f1c5..4ced18a1b6 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
@@ -60,6 +60,7 @@ import org.apache.syncope.core.provisioning.api.Connector;
import org.apache.syncope.core.provisioning.api.ConnectorManager;
import org.apache.syncope.core.provisioning.api.TimeoutException;
import org.apache.syncope.core.provisioning.api.data.TaskDataBinder;
+import org.apache.syncope.core.provisioning.api.event.AnyLifecycleEvent;
import org.apache.syncope.core.provisioning.api.notification.NotificationManager;
import org.apache.syncope.core.provisioning.api.propagation.PropagationActions;
import org.apache.syncope.core.provisioning.api.propagation.PropagationManager;
@@ -81,9 +82,11 @@ import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.ConnectorObjectBuilder;
import org.identityconnectors.framework.common.objects.Name;
import org.identityconnectors.framework.common.objects.ObjectClass;
+import org.identityconnectors.framework.common.objects.SyncDeltaType;
import org.identityconnectors.framework.common.objects.Uid;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.retry.RetryException;
import org.springframework.retry.backoff.ExponentialBackOffPolicy;
import org.springframework.retry.backoff.ExponentialRandomBackOffPolicy;
@@ -129,6 +132,8 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
protected final PlainAttrValidationManager validator;
+ protected final ApplicationEventPublisher publisher;
+
protected final Map<String, PropagationActions> perContextActions = new ConcurrentHashMap<>();
public AbstractPropagationTaskExecutor(
@@ -146,7 +151,8 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
final AnyUtilsFactory anyUtilsFactory,
final TaskUtilsFactory taskUtilsFactory,
final OutboundMatcher outboundMatcher,
- final PlainAttrValidationManager validator) {
+ final PlainAttrValidationManager validator,
+ final ApplicationEventPublisher publisher) {
this.connectorManager = connectorManager;
this.connObjectUtils = connObjectUtils;
@@ -163,6 +169,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
this.taskUtilsFactory = taskUtilsFactory;
this.outboundMatcher = outboundMatcher;
this.validator = validator;
+ this.publisher = publisher;
}
@Override
@@ -199,11 +206,18 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
taskInfo.getResource().getProvisionByAnyType(taskInfo.getAnyType()).
filter(provision -> provision.getUidOnCreate() != null).
- ifPresent(provision -> anyUtilsFactory.getInstance(taskInfo.getAnyTypeKind()).addAttr(
- validator,
- taskInfo.getEntityKey(),
- plainSchemaDAO.find(provision.getUidOnCreate()),
- result.getUidValue()));
+ ifPresent(provision -> {
+ anyUtilsFactory.getInstance(taskInfo.getAnyTypeKind()).addAttr(
+ validator,
+ taskInfo.getEntityKey(),
+ plainSchemaDAO.find(provision.getUidOnCreate()),
+ result.getUidValue());
+ publisher.publishEvent(new AnyLifecycleEvent<>(
+ this,
+ SyncDeltaType.UPDATE,
+ userDAO.find(taskInfo.getEntityKey()),
+ AuthContextUtils.getDomain()));
+ });
return result;
}
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 049385689c..cd8c6aae38 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
@@ -52,6 +52,7 @@ import org.apache.syncope.core.provisioning.java.pushpull.OutboundMatcher;
import org.apache.syncope.core.provisioning.java.utils.ConnObjectUtils;
import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
/**
@@ -103,6 +104,7 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
final TaskUtilsFactory taskUtilsFactory,
final OutboundMatcher outboundMatcher,
final PlainAttrValidationManager validator,
+ final ApplicationEventPublisher publisher,
final ThreadPoolTaskExecutor taskExecutor) {
super(connectorManager,
@@ -119,7 +121,8 @@ public class PriorityPropagationTaskExecutor extends AbstractPropagationTaskExec
anyUtilsFactory,
taskUtilsFactory,
outboundMatcher,
- validator);
+ validator,
+ publisher);
this.taskExecutor = taskExecutor;
}
[syncope] 02/02: Switching to CXF 4.0.1-SNAPSHOT to avoid dependency conflicts with Spring Boot 3.0.3
Posted by il...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit e9be8d2f001aaab2d04fcde2e819a4b17c21cfaf
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Feb 24 10:07:48 2023 +0100
Switching to CXF 4.0.1-SNAPSHOT to avoid dependency conflicts with Spring Boot 3.0.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9b177b70ec..e0df949316 100644
--- a/pom.xml
+++ b/pom.xml
@@ -411,7 +411,7 @@ under the License.
<connid.okta.version>2.1.2</connid.okta.version>
<connid.cmd.version>0.5</connid.cmd.version>
- <cxf.version>4.0.0</cxf.version>
+ <cxf.version>4.0.1-SNAPSHOT</cxf.version>
<bouncycastle.version>1.72</bouncycastle.version>
<nimbus-jose-jwt.version>9.30.1</nimbus-jose-jwt.version>