[SYNCOPE-855] SyncToken management now more in line with ConnId's semantics
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/73362b1a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/73362b1a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/73362b1a Branch: refs/heads/1_2_X Commit: 73362b1ab062bd16849709b696516d9d5a7738a8 Parents: 626f1b4 Author: Francesco Chicchiriccò <[email protected]> Authored: Tue May 24 15:22:16 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue May 24 15:22:16 2016 +0200 ---------------------------------------------------------------------- build-tools/src/main/resources/testdb.sql | 7 +- .../syncope/core/sync/AbstractSyncActions.java | 4 +- .../syncope/core/sync/DefaultPushActions.java | 5 +- .../syncope/core/sync/DefaultSyncActions.java | 15 +- .../apache/syncope/core/sync/SyncActions.java | 15 ++ .../apache/syncope/core/sync/SyncProfile.java | 10 +- .../impl/AbstractSubjectPushResultHandler.java | 6 +- .../impl/AbstractSubjectSyncResultHandler.java | 158 ++++++++++++------- .../apache/syncope/core/sync/impl/PushJob.java | 9 +- .../apache/syncope/core/sync/impl/SyncJob.java | 49 +++--- .../syncope/core/rest/TaskTestITCase.java | 102 ++++++++++-- core/src/test/resources/content.xml | 4 +- 12 files changed, 259 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/build-tools/src/main/resources/testdb.sql ---------------------------------------------------------------------- diff --git a/build-tools/src/main/resources/testdb.sql b/build-tools/src/main/resources/testdb.sql index ff4dd47..0656bda 100644 --- a/build-tools/src/main/resources/testdb.sql +++ b/build-tools/src/main/resources/testdb.sql @@ -24,7 +24,6 @@ status VARCHAR(5)); INSERT INTO test VALUES ('testuser1', 'password', 'false'); --- this table must be created in order to provide a specific test for issueSYNCOPE68 DROP TABLE test2 IF EXISTS; CREATE TABLE test2 ( id VARCHAR(50) PRIMARY KEY, @@ -35,12 +34,12 @@ INSERT INTO test2 VALUES ('testuser2', 'password321', 'false'); INSERT INTO test2 VALUES ('rossini', 'password321', 'true'); INSERT INTO test2 VALUES ('verdi', 'password321', 'true'); --- this table is for issueSYNCOPE230 DROP TABLE testsync IF EXISTS; CREATE TABLE TESTSYNC ( id NUMBER(10) PRIMARY KEY, username VARCHAR(80), surname VARCHAR(80), -email VARCHAR(80)); +email VARCHAR(80), +lastModification TIMESTAMP); -INSERT INTO testsync VALUES (965, 'issuesyncope230', 'Surname', '[email protected]'); +INSERT INTO testsync VALUES (965, 'issuesyncope230', 'Surname', '[email protected]', NULL); http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/AbstractSyncActions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/AbstractSyncActions.java b/core/src/main/java/org/apache/syncope/core/sync/AbstractSyncActions.java index 387b107..ffe2825 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/AbstractSyncActions.java +++ b/core/src/main/java/org/apache/syncope/core/sync/AbstractSyncActions.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.core.sync; -import java.util.List; import org.apache.syncope.core.sync.impl.AbstractSyncopeResultHandler; import org.quartz.JobExecutionException; @@ -36,8 +35,7 @@ public interface AbstractSyncActions<T extends AbstractSyncopeResultHandler<?, ? * Action to be executed after the synchronization task completion. * * @param profile sync profile - * @param results synchronization result * @throws JobExecutionException in case of generic failure */ - void afterAll(final SyncProfile<?, ?> profile, final List<SyncResult> results) throws JobExecutionException; + void afterAll(final SyncProfile<?, ?> profile) throws JobExecutionException; } http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/DefaultPushActions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/DefaultPushActions.java b/core/src/main/java/org/apache/syncope/core/sync/DefaultPushActions.java index c2564eb..4a35876 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/DefaultPushActions.java +++ b/core/src/main/java/org/apache/syncope/core/sync/DefaultPushActions.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.core.sync; -import java.util.List; - import org.apache.syncope.core.persistence.beans.AbstractAttributable; import org.quartz.JobExecutionException; @@ -97,8 +95,7 @@ public abstract class DefaultPushActions implements PushActions { @Override public void afterAll( - final SyncProfile<?, ?> profile, - final List<SyncResult> results) + final SyncProfile<?, ?> profile) throws JobExecutionException { } } http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java b/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java index 5151ec6..1fe138c 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java +++ b/core/src/main/java/org/apache/syncope/core/sync/DefaultSyncActions.java @@ -18,8 +18,6 @@ */ package org.apache.syncope.core.sync; -import java.util.List; - import org.apache.syncope.common.mod.AbstractAttributableMod; import org.apache.syncope.common.to.AbstractAttributableTO; import org.identityconnectors.framework.common.objects.SyncDelta; @@ -118,8 +116,17 @@ public abstract class DefaultSyncActions implements SyncActions { @Override public void afterAll( - final SyncProfile<?, ?> profile, - final List<SyncResult> results) + final SyncProfile<?, ?> profile) throws JobExecutionException { } + + @Override + public IgnoreProvisionException onError( + final SyncProfile<?, ?> profile, + final SyncDelta delta, + final Exception e) throws JobExecutionException { + + return null; + } + } http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java b/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java index c169f8c..eb77e40 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java +++ b/core/src/main/java/org/apache/syncope/core/sync/SyncActions.java @@ -176,4 +176,19 @@ public interface SyncActions extends AbstractSyncActions<AbstractSyncopeResultHa SyncDelta delta, T subject, SyncResult result) throws JobExecutionException; + + /** + * Action to be executed in case an exception is thrown during local user / role synchronization. + * + * @param profile profile of the synchronization being executed. + * @param delta retrieved synchronization information (may be modified by + * 'beforeProvision/beforeUpdate/beforeDelete') + * @param e the exception thrown + * @return an instance of the given exception type is that is to be thrown; {@code NULL} otherwise + * @throws JobExecutionException in case of generic failure + */ + IgnoreProvisionException onError( + SyncProfile<?, ?> profile, + SyncDelta delta, + Exception e) throws JobExecutionException; } http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/SyncProfile.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/SyncProfile.java b/core/src/main/java/org/apache/syncope/core/sync/SyncProfile.java index 4ec0223..635f13e 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/SyncProfile.java +++ b/core/src/main/java/org/apache/syncope/core/sync/SyncProfile.java @@ -18,7 +18,7 @@ */ package org.apache.syncope.core.sync; -import java.util.Collection; +import java.util.ArrayList; import java.util.List; import org.apache.syncope.common.types.ConflictResolutionAction; import org.apache.syncope.core.persistence.beans.AbstractSyncTask; @@ -33,7 +33,7 @@ public class SyncProfile<T extends AbstractSyncTask, A extends AbstractSyncActio private final T syncTask; - private Collection<SyncResult> results; + private final List<SyncResult> results = new ArrayList<SyncResult>(); private boolean dryRun; @@ -54,14 +54,10 @@ public class SyncProfile<T extends AbstractSyncTask, A extends AbstractSyncActio return syncTask; } - public Collection<SyncResult> getResults() { + public List<SyncResult> getResults() { return results; } - public void setResults(final Collection<SyncResult> results) { - this.results = results; - } - public boolean isDryRun() { return dryRun; } http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java index ff7c2bb..0e5afb9 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java +++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectPushResultHandler.java @@ -94,10 +94,6 @@ public abstract class AbstractSubjectPushResultHandler extends AbstractSyncopeRe protected final void doHandle(final long subjectId) throws JobExecutionException { - if (profile.getResults() == null) { - profile.setResults(new ArrayList<SyncResult>()); - } - final AbstractSubject subject = getSubject(subjectId); final AttributableUtil attrUtil = AttributableUtil.getInstance(subject); @@ -118,7 +114,7 @@ public abstract class AbstractSubjectPushResultHandler extends AbstractSyncopeRe Object output = null; Result resultStatus = null; - ConnectorObject beforeObj = null; + ConnectorObject beforeObj; String operation = null; // Try to read remote object (user / group) BEFORE any actual operation http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectSyncResultHandler.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectSyncResultHandler.java index cceee7c..f20dc36 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectSyncResultHandler.java +++ b/core/src/main/java/org/apache/syncope/core/sync/impl/AbstractSubjectSyncResultHandler.java @@ -21,7 +21,6 @@ package org.apache.syncope.core.sync.impl; import org.apache.syncope.core.sync.SyncUtilities; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; import org.apache.commons.lang3.exception.ExceptionUtils; @@ -42,6 +41,7 @@ import org.apache.syncope.core.sync.IgnoreProvisionException; import org.apache.syncope.core.sync.SyncActions; import org.apache.syncope.core.sync.SyncResult; import org.apache.syncope.core.util.AttributableUtil; +import org.identityconnectors.framework.common.objects.ObjectClass; import org.identityconnectors.framework.common.objects.SyncDelta; import org.identityconnectors.framework.common.objects.SyncDeltaType; import org.identityconnectors.framework.common.objects.SyncResultsHandler; @@ -60,6 +60,10 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe @Autowired protected UserDAO userDAO; + protected SyncJob syncJob; + + protected Result latestResult = null; + protected abstract String getName(AbstractSubjectTO subjectTO); protected abstract AbstractSubjectMod getSubjectMod(AbstractSubjectTO subjectTO, SyncDelta delta); @@ -77,28 +81,55 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe protected abstract void doDelete(Long id); + public void setSyncJob(final SyncJob syncJob) { + this.syncJob = syncJob; + } + + protected void setLatestSyncToken(final SyncDelta delta) { + if (ObjectClass.ACCOUNT.equals(delta.getObjectClass())) { + syncJob.setLatestUSyncToken(delta.getToken()); + } else if (ObjectClass.GROUP.equals(delta.getObjectClass())) { + syncJob.setLatestRSyncToken(delta.getToken()); + } + } + @Override public boolean handle(final SyncDelta delta) { try { - if (profile.getResults() == null) { - profile.setResults(new ArrayList<SyncResult>()); + doHandle(delta); + + LOG.debug("Successfully handled {}", delta); + + if (profile.getSyncTask().isFullReconciliation()) { + return true; } - doHandle(delta, profile.getResults()); - return true; + boolean shouldContinue; + synchronized (this) { + shouldContinue = latestResult == Result.SUCCESS; + this.latestResult = null; + } + if (shouldContinue) { + setLatestSyncToken(delta); + } + return shouldContinue; } catch (IgnoreProvisionException e) { - SyncResult result = new SyncResult(); - result.setOperation(ResourceOperation.NONE); - result.setSubjectType(getAttributableUtil().getType()); - result.setStatus(SyncResult.Status.IGNORE); - result.setId(0L); - result.setName(delta.getObject().getName().getNameValue()); - profile.getResults().add(result); + SyncResult ignoreResult = new SyncResult(); + ignoreResult.setOperation(ResourceOperation.NONE); + ignoreResult.setSubjectType(getAttributableUtil().getType()); + ignoreResult.setStatus(SyncResult.Status.IGNORE); + ignoreResult.setId(0L); + ignoreResult.setName(delta.getObject().getName().getNameValue()); + profile.getResults().add(ignoreResult); LOG.warn("Ignoring during synchronization", e); + + setLatestSyncToken(delta); + return true; } catch (JobExecutionException e) { LOG.error("Synchronization failed", e); + return false; } } @@ -132,7 +163,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe } else { SyncDelta _delta = delta; for (SyncActions action : profile.getActions()) { - _delta = action.beforeAssign(this.getProfile(), _delta, transformed); + _delta = action.beforeAssign(profile, _delta, transformed); } create(transformed, _delta, attrUtil, UnmatchingRule.toEventName(UnmatchingRule.ASSIGN), result); @@ -168,7 +199,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe } else { SyncDelta _delta = delta; for (SyncActions action : profile.getActions()) { - _delta = action.beforeProvision(this.getProfile(), _delta, transformed); + _delta = action.beforeProvision(profile, _delta, transformed); } create(transformed, _delta, attrUtil, UnmatchingRule.toEventName(UnmatchingRule.PROVISION), result); @@ -177,7 +208,25 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe return Collections.<SyncResult>singletonList(result); } - private void create( + protected void throwIgnoreProvisionException(final SyncDelta delta, final Exception exception) + throws JobExecutionException { + + if (exception instanceof IgnoreProvisionException) { + throw IgnoreProvisionException.class.cast(exception); + } + + IgnoreProvisionException ipe = null; + for (SyncActions action : profile.getActions()) { + if (ipe == null) { + ipe = action.onError(profile, delta, exception); + } + } + if (ipe != null) { + throw ipe; + } + } + + protected void create( final AbstractSubjectTO subjectTO, final SyncDelta delta, final AttributableUtil attrUtil, @@ -195,7 +244,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe resultStatus = Result.SUCCESS; for (SyncActions action : profile.getActions()) { - action.after(this.getProfile(), delta, actual, result); + action.after(profile, delta, actual, result); } } catch (PropagationException e) { // A propagation failure doesn't imply a synchronization failure. @@ -203,9 +252,9 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe LOG.error("Could not propagate {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); output = e; resultStatus = Result.FAILURE; - } catch (IgnoreProvisionException e) { - throw e; } catch (Exception e) { + throwIgnoreProvisionException(delta, e); + result.setStatus(SyncResult.Status.FAILURE); result.setMessage(ExceptionUtils.getRootCauseMessage(e)); LOG.error("Could not create {} {} ", attrUtil.getType(), delta.getUid().getUidValue(), e); @@ -213,7 +262,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe resultStatus = Result.FAILURE; } - audit(operation, resultStatus, null, output, delta); + finalize(operation, resultStatus, null, output, delta); } protected List<SyncResult> update(SyncDelta delta, final List<Long> subjects, final AttributableUtil attrUtil) @@ -232,7 +281,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe LOG.debug("About to update {}", id); Object output; - AbstractSubjectTO before = null; + AbstractSubjectTO before; Result resultStatus; final SyncResult result = new SyncResult(); @@ -263,13 +312,13 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe LOG.debug("Transformed: {}", actual); for (SyncActions action : profile.getActions()) { - delta = action.beforeUpdate(this.getProfile(), delta, before, attributableMod); + delta = action.beforeUpdate(profile, delta, before, attributableMod); } final AbstractSubjectTO updated = doUpdate(before, attributableMod, delta, result); for (SyncActions action : profile.getActions()) { - action.after(this.getProfile(), delta, updated, result); + action.after(profile, delta, updated, result); } output = updated; @@ -282,9 +331,9 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe LOG.error("Could not propagate {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); output = e; resultStatus = Result.FAILURE; - } catch (IgnoreProvisionException e) { - throw e; } catch (Exception e) { + throwIgnoreProvisionException(delta, e); + result.setStatus(SyncResult.Status.FAILURE); result.setMessage(ExceptionUtils.getRootCauseMessage(e)); LOG.error("Could not update {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); @@ -292,7 +341,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe resultStatus = Result.FAILURE; } } - audit(MatchingRule.toEventName(MatchingRule.UPDATE), resultStatus, before, output, delta); + finalize(MatchingRule.toEventName(MatchingRule.UPDATE), resultStatus, before, output, delta); } updResults.add(result); } @@ -344,11 +393,11 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe try { if (unlink) { for (SyncActions action : profile.getActions()) { - action.beforeUnassign(this.getProfile(), delta, before); + action.beforeUnassign(profile, delta, before); } } else { for (SyncActions action : profile.getActions()) { - action.beforeDeprovision(this.getProfile(), delta, before); + action.beforeDeprovision(profile, delta, before); } } @@ -356,7 +405,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe output = getSubjectTO(id); for (SyncActions action : profile.getActions()) { - action.after(this.getProfile(), delta, AbstractSubjectTO.class.cast(output), result); + action.after(profile, delta, AbstractSubjectTO.class.cast(output), result); } resultStatus = Result.SUCCESS; @@ -367,9 +416,9 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe LOG.error("Could not propagate {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); output = e; resultStatus = Result.FAILURE; - } catch (IgnoreProvisionException e) { - throw e; } catch (Exception e) { + throwIgnoreProvisionException(delta, e); + result.setStatus(SyncResult.Status.FAILURE); result.setMessage(ExceptionUtils.getRootCauseMessage(e)); LOG.error("Could not update {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); @@ -377,7 +426,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe resultStatus = Result.FAILURE; } } - audit(unlink + finalize(unlink ? MatchingRule.toEventName(MatchingRule.UNASSIGN) : MatchingRule.toEventName(MatchingRule.DEPROVISION), resultStatus, before, output, delta); } @@ -388,7 +437,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe } protected List<SyncResult> link( - SyncDelta delta, + final SyncDelta delta, final List<Long> subjects, final AttributableUtil attrUtil, final boolean unlink) @@ -432,18 +481,18 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe try { if (unlink) { for (SyncActions action : profile.getActions()) { - action.beforeUnlink(this.getProfile(), delta, before); + action.beforeUnlink(profile, delta, before); } } else { for (SyncActions action : profile.getActions()) { - action.beforeLink(this.getProfile(), delta, before); + action.beforeLink(profile, delta, before); } } output = doLink(before, result, unlink); for (SyncActions action : profile.getActions()) { - action.after(this.getProfile(), delta, AbstractSubjectTO.class.cast(output), result); + action.after(profile, delta, AbstractSubjectTO.class.cast(output), result); } resultStatus = Result.SUCCESS; @@ -454,9 +503,9 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe LOG.error("Could not propagate {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); output = e; resultStatus = Result.FAILURE; - } catch (IgnoreProvisionException e) { - throw e; } catch (Exception e) { + throwIgnoreProvisionException(delta, e); + result.setStatus(SyncResult.Status.FAILURE); result.setMessage(ExceptionUtils.getRootCauseMessage(e)); LOG.error("Could not update {} {}", attrUtil.getType(), delta.getUid().getUidValue(), e); @@ -464,7 +513,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe resultStatus = Result.FAILURE; } } - audit(unlink ? MatchingRule.toEventName(MatchingRule.UNLINK) + finalize(unlink ? MatchingRule.toEventName(MatchingRule.UNLINK) : MatchingRule.toEventName(MatchingRule.LINK), resultStatus, before, output, delta); } updResults.add(result); @@ -489,7 +538,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe Object output; Result resultStatus = Result.FAILURE; - AbstractSubjectTO before = null; + AbstractSubjectTO before; final SyncResult result = new SyncResult(); try { @@ -503,16 +552,16 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe if (!profile.isDryRun()) { for (SyncActions action : profile.getActions()) { - delta = action.beforeDelete(this.getProfile(), delta, before); + delta = action.beforeDelete(profile, delta, before); } try { doDelete(id); output = null; resultStatus = Result.SUCCESS; - } catch (IgnoreProvisionException e) { - throw e; } catch (Exception e) { + throwIgnoreProvisionException(delta, e); + result.setStatus(SyncResult.Status.FAILURE); result.setMessage(ExceptionUtils.getRootCauseMessage(e)); LOG.error("Could not delete {} {}", attrUtil.getType(), id, e); @@ -520,10 +569,10 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe } for (SyncActions action : profile.getActions()) { - action.after(this.getProfile(), delta, before, result); + action.after(profile, delta, before, result); } - audit(ResourceOperation.DELETE.name().toLowerCase(), resultStatus, before, output, delta); + finalize(ResourceOperation.DELETE.name().toLowerCase(), resultStatus, before, output, delta); } delResults.add(result); @@ -540,7 +589,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe return delResults; } - private List<SyncResult> ignore(SyncDelta delta, final AttributableUtil attrUtil, final boolean matching) + protected List<SyncResult> ignore(SyncDelta delta, final AttributableUtil attrUtil, final boolean matching) throws JobExecutionException { LOG.debug("Subject to ignore {}", delta.getObject().getUid().getUidValue()); @@ -556,7 +605,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe ignoreResults.add(result); if (!profile.isDryRun()) { - audit(matching + finalize(matching ? MatchingRule.toEventName(MatchingRule.IGNORE) : UnmatchingRule.toEventName(UnmatchingRule.IGNORE), Result.SUCCESS, null, null, delta); } @@ -570,9 +619,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe * @param delta returned by the underlying profile.getConnector() * @throws JobExecutionException in case of synchronization failure. */ - protected void doHandle(final SyncDelta delta, final Collection<SyncResult> syncResults) - throws JobExecutionException { - + protected void doHandle(final SyncDelta delta) throws JobExecutionException { final AttributableUtil attrUtil = getAttributableUtil(); LOG.debug("Process {} for {} as {}", @@ -599,6 +646,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe subjectIds = subjectIds.subList(subjectIds.size() - 1, subjectIds.size()); break; + case ALL: default: // keep subjectIds as is } @@ -657,12 +705,16 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe } } - private void audit( + protected void finalize( final String event, final Result result, final Object before, final Object output, - final Object... input) { + final SyncDelta delta) { + + synchronized (this) { + this.latestResult = result; + } notificationManager.createTasks( AuditElements.EventCategoryType.SYNCHRONIZATION, @@ -672,7 +724,7 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe result, before, output, - input); + delta); auditManager.audit( AuditElements.EventCategoryType.SYNCHRONIZATION, @@ -682,6 +734,6 @@ public abstract class AbstractSubjectSyncResultHandler extends AbstractSyncopeRe result, before, output, - input); + delta); } } http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/impl/PushJob.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/PushJob.java b/core/src/main/java/org/apache/syncope/core/sync/impl/PushJob.java index 73e1d48..b25ca31 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/impl/PushJob.java +++ b/core/src/main/java/org/apache/syncope/core/sync/impl/PushJob.java @@ -19,7 +19,6 @@ package org.apache.syncope.core.sync.impl; import org.apache.syncope.core.sync.SyncProfile; -import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; @@ -37,7 +36,6 @@ import org.apache.syncope.core.persistence.dao.search.OrderByClause; import org.apache.syncope.core.propagation.Connector; import org.apache.syncope.core.rest.data.SearchCondConverter; import org.apache.syncope.core.sync.PushActions; -import org.apache.syncope.core.sync.SyncResult; import org.apache.syncope.core.util.ApplicationContextProvider; import org.apache.syncope.core.util.EntitlementUtil; import org.quartz.JobExecutionException; @@ -81,8 +79,6 @@ public class PushJob extends AbstractSyncJob<PushTask, PushActions> { final boolean dryRun) throws JobExecutionException { LOG.debug("Execute synchronization (push) with resource {}", pushTask.getResource()); - final List<SyncResult> results = new ArrayList<SyncResult>(); - final Set<Long> authorizations = EntitlementUtil.getRoleIds(entitlementDAO.findAll()); final SyncProfile<PushTask, PushActions> profile = @@ -90,7 +86,6 @@ public class PushJob extends AbstractSyncJob<PushTask, PushActions> { profile.setActions(actions); profile.setDryRun(dryRun); profile.setResAct(null); - profile.setResults(results); final UserPushResultHandler uhandler = (UserPushResultHandler) ApplicationContextProvider.getApplicationContext().getBeanFactory().createBean( @@ -141,11 +136,11 @@ public class PushJob extends AbstractSyncJob<PushTask, PushActions> { if (!profile.isDryRun()) { for (PushActions action : actions) { - action.afterAll(profile, results); + action.afterAll(profile); } } - final String result = createReport(results, pushTask.getResource().getSyncTraceLevel(), dryRun); + final String result = createReport(profile.getResults(), pushTask.getResource().getSyncTraceLevel(), dryRun); LOG.debug("Sync result: {}", result); http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java b/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java index b2e6a16..ad0ec98 100644 --- a/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java +++ b/core/src/main/java/org/apache/syncope/core/sync/impl/SyncJob.java @@ -20,8 +20,6 @@ package org.apache.syncope.core.sync.impl; import org.apache.syncope.core.sync.SyncProfile; import org.apache.syncope.core.sync.SyncUtilities; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.common.mod.ReferenceMod; @@ -37,7 +35,6 @@ import org.apache.syncope.core.persistence.dao.NotFoundException; import org.apache.syncope.core.propagation.Connector; import org.apache.syncope.core.rest.controller.UnauthorizedRoleException; import org.apache.syncope.core.sync.SyncActions; -import org.apache.syncope.core.sync.SyncResult; import org.apache.syncope.core.util.ApplicationContextProvider; import org.apache.syncope.core.workflow.role.RoleWorkflowAdapter; import org.identityconnectors.framework.common.objects.ObjectClass; @@ -61,7 +58,19 @@ public class SyncJob extends AbstractSyncJob<SyncTask, SyncActions> { private RoleWorkflowAdapter rwfAdapter; @Autowired - protected SyncUtilities syncUtilities; + private SyncUtilities syncUtilities; + + private SyncToken latestUSyncToken; + + private SyncToken latestRSyncToken; + + public void setLatestUSyncToken(final SyncToken latestUSyncToken) { + this.latestUSyncToken = latestUSyncToken; + } + + public void setLatestRSyncToken(final SyncToken latestRSyncToken) { + this.latestRSyncToken = latestRSyncToken; + } protected void setRoleOwners(final RoleSyncResultHandler rhandler) throws UnauthorizedRoleException, NotFoundException { @@ -109,26 +118,27 @@ public class SyncJob extends AbstractSyncJob<SyncTask, SyncActions> { LOG.debug("Execute synchronization with token {}", syncTask.getResource().getUsyncToken()); - final List<SyncResult> results = new ArrayList<SyncResult>(); - final SyncProfile<SyncTask, SyncActions> profile = new SyncProfile<SyncTask, SyncActions>(connector, syncTask); profile.setActions(actions); profile.setDryRun(dryRun); profile.setResAct(getSyncPolicySpec(syncTask).getConflictResolutionAction()); - profile.setResults(results); // Prepare handler for SyncDelta objects (users) - final UserSyncResultHandler uhandler = - (UserSyncResultHandler) ApplicationContextProvider.getApplicationContext().getBeanFactory().createBean( - UserSyncResultHandler.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); + UserSyncResultHandler uhandler = + (UserSyncResultHandler) ApplicationContextProvider.getApplicationContext().getBeanFactory(). + createBean(UserSyncResultHandler.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); uhandler.setProfile(profile); + uhandler.setSyncJob(this); + latestUSyncToken = null; // Prepare handler for SyncDelta objects (roles/groups) - final RoleSyncResultHandler rhandler = - (RoleSyncResultHandler) ApplicationContextProvider.getApplicationContext().getBeanFactory().createBean( - RoleSyncResultHandler.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); + RoleSyncResultHandler rhandler = + (RoleSyncResultHandler) ApplicationContextProvider.getApplicationContext().getBeanFactory(). + createBean(RoleSyncResultHandler.class, AbstractBeanDefinition.AUTOWIRE_BY_NAME, false); rhandler.setProfile(profile); + rhandler.setSyncJob(this); + latestRSyncToken = null; if (!profile.isDryRun()) { for (SyncActions action : actions) { @@ -137,15 +147,6 @@ public class SyncJob extends AbstractSyncJob<SyncTask, SyncActions> { } try { - SyncToken latestUSyncToken = null; - if (uMapping != null && !syncTask.isFullReconciliation()) { - latestUSyncToken = connector.getLatestSyncToken(ObjectClass.ACCOUNT); - } - SyncToken latestRSyncToken = null; - if (rMapping != null && !syncTask.isFullReconciliation()) { - latestRSyncToken = connector.getLatestSyncToken(ObjectClass.GROUP); - } - if (syncTask.isFullReconciliation()) { if (uMapping != null) { connector.getAllObjects(ObjectClass.ACCOUNT, uhandler, @@ -192,11 +193,11 @@ public class SyncJob extends AbstractSyncJob<SyncTask, SyncActions> { if (!profile.isDryRun()) { for (SyncActions action : actions) { - action.afterAll(profile, results); + action.afterAll(profile); } } - final String result = createReport(results, syncTask.getResource().getSyncTraceLevel(), dryRun); + String result = createReport(profile.getResults(), syncTask.getResource().getSyncTraceLevel(), dryRun); LOG.debug("Sync result: {}", result); http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java b/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java index 18329a4..a1481d8 100644 --- a/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java +++ b/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java @@ -37,6 +37,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import javax.ws.rs.core.Response; +import org.apache.commons.lang3.SerializationUtils; import org.apache.syncope.client.SyncopeClient; import org.apache.syncope.common.SyncopeClientException; import org.apache.syncope.common.mod.StatusMod; @@ -61,6 +62,7 @@ import org.apache.syncope.common.to.SyncTaskTO; import org.apache.syncope.common.to.TaskExecTO; import org.apache.syncope.common.to.AbstractTaskTO; import org.apache.syncope.common.reqres.PagedResult; +import org.apache.syncope.common.services.ConnectorService; import org.apache.syncope.common.services.ResourceService; import org.apache.syncope.common.to.MappingItemTO; import org.apache.syncope.common.to.MappingTO; @@ -71,6 +73,7 @@ import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.common.types.AttributeSchemaType; import org.apache.syncope.common.types.CipherAlgorithm; import org.apache.syncope.common.types.ConnConfProperty; +import org.apache.syncope.common.types.ConnectorCapability; import org.apache.syncope.common.types.IntMappingType; import org.apache.syncope.common.types.JobAction; import org.apache.syncope.common.types.JobStatusType; @@ -694,9 +697,7 @@ public class TaskTestITCase extends AbstractTest { assertFalse(actual.getUserTemplate().getMemberships().isEmpty()); TaskExecTO execution = execSyncTask(actual.getId(), 50, false); - final String status = execution.getStatus(); - assertNotNull(status); - assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful()); + assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful()); userTO = readUser("testuser2"); assertNotNull(userTO); @@ -1110,6 +1111,89 @@ public class TaskTestITCase extends AbstractTest { // ------------------------------------------ } + @Test + public void syncTokenWithErrors() { + ResourceTO origResource = resourceService.read(RESOURCE_NAME_DBSYNC); + ConnInstanceTO origConnector = connectorService.read(origResource.getConnectorId()); + + ResourceTO resForTest = SerializationUtils.clone(origResource); + resForTest.setName("syncTokenWithErrors"); + resForTest.setConnectorId(null); + ConnInstanceTO connForTest = SerializationUtils.clone(origConnector); + connForTest.setId(0); + connForTest.setDisplayName("For syncTokenWithErrors"); + + JdbcTemplate jdbcTemplate = new JdbcTemplate(testDataSource); + try { + connForTest.getCapabilities().add(ConnectorCapability.SYNC); + + ConnConfProperty changeLogColumn = connForTest.getConfigurationMap().get("changeLogColumn"); + assertNotNull(changeLogColumn); + assertTrue(changeLogColumn.getValues().isEmpty()); + changeLogColumn.getValues().add("lastModification"); + + Response response = connectorService.create(connForTest); + if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) { + throw (RuntimeException) clientFactory.getExceptionMapper().fromResponse(response); + } + connForTest = getObject(response.getLocation(), ConnectorService.class, ConnInstanceTO.class); + assertNotNull(connForTest); + + resForTest.setConnectorId(connForTest.getId()); + resForTest = createResource(resForTest); + assertNotNull(resForTest); + + SyncTaskTO syncTask = new SyncTaskTO(); + syncTask.setName("For syncTokenWithErrors"); + syncTask.setResource(resForTest.getName()); + syncTask.setFullReconciliation(false); + syncTask.setPerformCreate(true); + syncTask.setPerformUpdate(true); + syncTask.setPerformDelete(true); + + response = taskService.create(syncTask); + if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) { + throw (RuntimeException) clientFactory.getExceptionMapper().fromResponse(response); + } + syncTask = getObject(response.getLocation(), TaskService.class, SyncTaskTO.class); + assertNotNull(syncTask); + + jdbcTemplate.execute("DELETE FROM testsync"); + jdbcTemplate.execute("INSERT INTO testsync VALUES " + + "(1040, 'syncTokenWithErrors1', 'Surname1', " + + "'[email protected]', '2014-05-23 13:53:24.293')"); + jdbcTemplate.execute("INSERT INTO testsync VALUES " + + "(1041, 'syncTokenWithErrors2', 'Surname2', " + + "'[email protected]', '2015-05-23 13:53:24.293')"); + + TaskExecTO exec = execSyncTask(syncTask.getId(), 50, false); + assertTrue(PropagationTaskExecStatus.valueOf(exec.getStatus()).isSuccessful()); + + resForTest = resourceService.read(resForTest.getName()); + assertTrue(resForTest.getUsyncToken().contains("2014-05-23")); + + jdbcTemplate.execute("UPDATE testsync " + + "SET email='[email protected]', lastModification='2016-05-23 13:53:24.293' " + + "WHERE ID=1041"); + + exec = execSyncTask(syncTask.getId(), 50, false); + assertTrue(PropagationTaskExecStatus.valueOf(exec.getStatus()).isSuccessful()); + + resForTest = resourceService.read(resForTest.getName()); + assertTrue(resForTest.getUsyncToken().contains("2016-05-23")); + } finally { + if (resForTest.getConnectorId() != null) { + resourceService.delete(resForTest.getName()); + connectorService.delete(connForTest.getId()); + } + + userService.delete(readUser("issuesyncope230").getId()); + + jdbcTemplate.execute("DELETE FROM testsync WHERE ID=1040"); + jdbcTemplate.execute("DELETE FROM testsync WHERE ID=1041"); + } + } + private static class ThreadExec implements Callable<TaskExecTO> { private final TaskTestITCase test; @@ -1173,9 +1257,7 @@ public class TaskTestITCase extends AbstractTest { assertEquals(actual.getJobClassName(), syncTask.getJobClassName()); TaskExecTO execution = execSyncTask(syncTask.getId(), 50, false); - final String status = execution.getStatus(); - assertNotNull(status); - assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful()); + assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful()); // 5. Test the sync'd user UserTO updatedUser = userService.read(user.getId()); @@ -1248,9 +1330,7 @@ public class TaskTestITCase extends AbstractTest { assertEquals(actual.getJobClassName(), syncTask.getJobClassName()); TaskExecTO execution = execSyncTask(syncTask.getId(), 50, false); - final String status = execution.getStatus(); - assertNotNull(status); - assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful()); + assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful()); // 7. Test the sync'd user String syncedPassword = Encryptor.getInstance().encode("security", CipherAlgorithm.SHA1); @@ -1502,9 +1582,7 @@ public class TaskTestITCase extends AbstractTest { TaskExecTO execution = execSyncTask(task.getId(), 50, false); // verify execution status - final String status = execution.getStatus(); - assertNotNull(status); - assertTrue(PropagationTaskExecStatus.valueOf(status).isSuccessful()); + assertTrue(PropagationTaskExecStatus.valueOf(execution.getStatus()).isSuccessful()); UserTO userTO = readUser("syncFromLDAP"); assertNotNull(userTO); http://git-wip-us.apache.org/repos/asf/syncope/blob/73362b1a/core/src/test/resources/content.xml ---------------------------------------------------------------------- diff --git a/core/src/test/resources/content.xml b/core/src/test/resources/content.xml index 7512c63..ec47740 100644 --- a/core/src/test/resources/content.xml +++ b/core/src/test/resources/content.xml @@ -997,10 +997,10 @@ under the License. userTemplate='{"creator":null,"creationDate":null,"lastModifier":null,"lastChangeDate":null,"id":0,"password":null,"status":null,"token":null,"tokenExpireTime":null,"username":null,"lastLoginDate":null,"changePwdDate":null,"failedLogins":null,"attributes":[{"schema":"firstname","readonly":false,"values":[""]},{"schema":"userId","readonly":false,"values":["'test'"]},{"schema":"fullname","readonly":false,"values":["'test'"]},{"schema":"surname","readonly":false,"values":["'test'"]}],"derivedAttributes":[],"virtualAttributes":[],"resources":["resource-testdb"],"propagationStatuses":[],"memberships":[]}' roleTemplate='{"creator":null,"creationDate":null,"lastModifier":null,"lastChangeDate":null,"id":0,"name":null,"parent":0,"userOwner":null,"roleOwner":null,"inheritOwner":false,"inheritTemplates":false,"inheritAttrs":false,"inheritDerAttrs":false,"inheritVirAttrs":false,"inheritPasswordPolicy":false,"inheritAccountPolicy":false,"passwordPolicy":null,"accountPolicy":null,"attributes":[],"derivedAttributes":[],"virtualAttributes":[],"resources":[],"propagationStatuses":[],"entitlements":[],"rAttrTemplates":[],"rDerAttrTemplates":[],"rVirAttrTemplates":[],"mAttrTemplates":[],"mDerAttrTemplates":[],"mVirAttrTemplates":[]}'/> <Task DTYPE="SyncTask" id="25" name="CSV (unlink matching; ignore unmatching)" resource_name="resource-csv" - performCreate="1" performUpdate="1" performDelete="1" syncStatus="1" fullReconciliation="0" + performCreate="1" performUpdate="1" performDelete="1" syncStatus="1" fullReconciliation="1" jobClassName="org.apache.syncope.core.sync.impl.SyncJob" unmatchingRule="IGNORE" matchingRule="UNLINK"/> <Task DTYPE="SyncTask" id="26" name="CSV (ignore matching; assign unmatching)" resource_name="resource-csv" - performCreate="1" performUpdate="1" performDelete="1" syncStatus="1" fullReconciliation="0" + performCreate="1" performUpdate="1" performDelete="1" syncStatus="1" fullReconciliation="1" jobClassName="org.apache.syncope.core.sync.impl.SyncJob" unmatchingRule="ASSIGN" matchingRule="IGNORE"/> <Notification id="1" active="1" recipientAttrName="email" recipientAttrType="UserSchema" selfAsRecipient="1"
