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 2017/11/16 08:03:18 UTC
[1/2] syncope git commit: [SYNCOPE-1234] Forgot to consider the
profile parameter
Repository: syncope
Updated Branches:
refs/heads/2_0_X bf3c034c2 -> 50b74686c
refs/heads/master 33daf27da -> 39d507d49
[SYNCOPE-1234] Forgot to consider the profile parameter
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/50b74686
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/50b74686
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/50b74686
Branch: refs/heads/2_0_X
Commit: 50b74686ce9b6e08adf6eca632a88cb211004460
Parents: bf3c034
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Nov 16 08:38:35 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Nov 16 08:38:35 2017 +0100
----------------------------------------------------------------------
.../syncope/core/provisioning/api/pushpull/PullActions.java | 3 ++-
.../provisioning/java/pushpull/AbstractPullResultHandler.java | 2 +-
.../core/provisioning/java/pushpull/DefaultPullActions.java | 2 +-
.../provisioning/java/pushpull/DefaultRealmPullResultHandler.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/50b74686/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
index f5ee92f..5f9858e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
@@ -33,10 +33,11 @@ public interface PullActions extends ProvisioningActions {
/**
* Pre-process the pull information received by the underlying connector, before any internal activity occurs.
*
+ * @param profile profile of the pull being executed.
* @param delta retrieved pull information
* @return pull information, possibly altered.
*/
- SyncDelta preprocess(SyncDelta delta);
+ SyncDelta preprocess(ProvisioningProfile<?, ?> profile, SyncDelta delta);
/**
* Action to be executed before to create a pulled entity locally.
http://git-wip-us.apache.org/repos/asf/syncope/blob/50b74686/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index 9836394..d1853c2 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -727,7 +727,7 @@ public abstract class AbstractPullResultHandler extends AbstractSyncopeResultHan
SyncDelta processed = delta;
for (PullActions action : profile.getActions()) {
- processed = action.preprocess(processed);
+ processed = action.preprocess(profile, processed);
}
LOG.debug("Transformed {} for {} as {}",
http://git-wip-us.apache.org/repos/asf/syncope/blob/50b74686/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultPullActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultPullActions.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultPullActions.java
index 31a671c..5ef833e 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultPullActions.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultPullActions.java
@@ -33,7 +33,7 @@ import org.apache.syncope.core.provisioning.api.pushpull.PullActions;
public abstract class DefaultPullActions implements PullActions {
@Override
- public SyncDelta preprocess(final SyncDelta delta) {
+ public SyncDelta preprocess(final ProvisioningProfile<?, ?> profile, final SyncDelta delta) {
return delta;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/50b74686/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
index b3b12ea..dae9b89 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
@@ -671,7 +671,7 @@ public class DefaultRealmPullResultHandler
SyncDelta processed = delta;
for (PullActions action : profile.getActions()) {
- processed = action.preprocess(processed);
+ processed = action.preprocess(profile, processed);
}
LOG.debug("Transformed {} for {} as {}",
[2/2] syncope git commit: [SYNCOPE-1234] Forgot to consider the
profile parameter
Posted by il...@apache.org.
[SYNCOPE-1234] Forgot to consider the profile parameter
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/39d507d4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/39d507d4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/39d507d4
Branch: refs/heads/master
Commit: 39d507d4945489546cba69cb160996d4798c72a2
Parents: 33daf27
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Nov 16 08:38:35 2017 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Nov 16 09:03:06 2017 +0100
----------------------------------------------------------------------
.../syncope/core/provisioning/api/pushpull/PullActions.java | 3 ++-
.../provisioning/java/pushpull/AbstractPullResultHandler.java | 2 +-
.../provisioning/java/pushpull/DefaultRealmPullResultHandler.java | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/39d507d4/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
index bcf20c3..d367a7e 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/pushpull/PullActions.java
@@ -33,10 +33,11 @@ public interface PullActions extends ProvisioningActions {
/**
* Pre-process the pull information received by the underlying connector, before any internal activity occurs.
*
+ * @param profile profile of the pull being executed.
* @param delta retrieved pull information
* @return pull information, possibly altered.
*/
- default SyncDelta preprocess(final SyncDelta delta) {
+ default SyncDelta preprocess(ProvisioningProfile<?, ?> profile, SyncDelta delta) {
return delta;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/39d507d4/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
index dd7e4ef..0a74cb3 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractPullResultHandler.java
@@ -727,7 +727,7 @@ public abstract class AbstractPullResultHandler extends AbstractSyncopeResultHan
SyncDelta processed = delta;
for (PullActions action : profile.getActions()) {
- processed = action.preprocess(processed);
+ processed = action.preprocess(profile, processed);
}
LOG.debug("Transformed {} for {} as {}",
http://git-wip-us.apache.org/repos/asf/syncope/blob/39d507d4/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
index b3b12ea..dae9b89 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/DefaultRealmPullResultHandler.java
@@ -671,7 +671,7 @@ public class DefaultRealmPullResultHandler
SyncDelta processed = delta;
for (PullActions action : profile.getActions()) {
- processed = action.preprocess(processed);
+ processed = action.preprocess(profile, processed);
}
LOG.debug("Transformed {} for {} as {}",