[midPoint-git] [Evolveum/midpoint] 1a9d36: Fix live sync token management

mederly noreply at github.com
Thu Jul 1 12:50:32 CEST 2021


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 1a9d3649ca136e3b1d53cc52bb20b9f196e27398
      https://github.com/Evolveum/midpoint/commit/1a9d3649ca136e3b1d53cc52bb20b9f196e27398
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-07-01 (Thu, 01 Jul 2021)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityStateUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseTask.java
    M infra/schema/src/test/resources/common/task-1.xml
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/ActivityTokenStorageImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityHandler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/util/mock/MockFactory.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/DummyInterruptedSyncImpreciseResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/DummyInterruptedSyncResource.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestLiveSyncTask.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/LiveSyncOptions.java
    A provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/LiveSyncToken.java
    A provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/LiveSyncTokenStorage.java
    M provisioning/provisioning-api/src/main/java/com/evolveum/midpoint/provisioning/api/ProvisioningService.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/TokenUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/ResourceObjectLiveSyncChange.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/ShadowedLiveSyncChange.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/sync/LiveSynchronizer.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/sync/OldestTokenWatcher.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/sync/SynchronizationOperationResult.java
    A provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/DummyTokenStorageImpl.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/MockLiveSyncTaskHandler.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestOpenDjNegative.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/opendj/TestSynchronization.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorInstance.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfFetchChangesResult.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfLiveSyncChange.java
    A provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/UcfSyncToken.java
    M provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManualConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/provisioning/AsyncProvisioningConnectorInstance.java
    M provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/update/AsyncUpdateConnectorInstance.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/SyncDeltaConverter.java
    M provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TokenUtil.java
    M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfDummy.java
    M provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/ActivityState.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/TestOpenLdap.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapMultidomainTest.java
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/ad/AbstractAdLdapTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapSyncMassive.java

  Log Message:
  -----------
  Fix live sync token management

1) The live sync is no longer maintained in the task extension.
It is now part of the live sync activity work state.

2) Therefore we no longed need to keep it as PrismProperty<?>.
It is a plain Object, wrapped into LiveSyncToken / UcfSyncToken
objects.

3) Management of tokens by provisioning-impl is conducted using
LiveSyncTokenStorage interface (get/set token). Normally, it simply
reads from / writes to the activity work state space.




More information about the midPoint-svn mailing list