[midPoint-git] [Evolveum/midpoint] eb3e8d: Improve composite and ID Match correlators
mederly
noreply at github.com
Thu Aug 11 11:10:44 CEST 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: eb3e8dbbfce4b6ad8dad96c8b7e382ca23ebcfb7
https://github.com/Evolveum/midpoint/commit/eb3e8dbbfce4b6ad8dad96c8b7e382ca23ebcfb7
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-08-11 (Thu, 11 Aug 2022)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationPolicyFactory.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/CorrelationItemDefinitionUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectSet.java
M infra/schema/src/main/resources/xml/ns/public/common/common-correlation-3.xsd
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CandidateOwner.java
R model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CandidateOwnerMap.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CandidateOwnersMap.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CompleteCorrelationResult.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationErrorDetails.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationResult.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelationService.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/Correlator.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelatorConfiguration.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/correlator/CorrelatorContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelBeans.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelationServiceImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlation/CorrelatorContextCreator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/BaseCorrelator.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/BuiltInResultCreator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/CorrelatorFactoryRegistryImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/composite/CompositeCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/expression/ExpressionCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/filter/FilterCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/idmatch/IdMatchCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/items/ItemsCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/correlator/noop/NoOpCorrelator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/SimplePreInboundsContextImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/CorrelationProcessing.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/CorrelatorTestUtil.java
R model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/CandidateOwner.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/CorrelationTestingAccount.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestCandidateOwner.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestCorrelators.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/correlator/correlation/TestExpressionCorrelator.java
R model/model-impl/src/test/resources/correlator/correlation/_readme_accounts_csv.txt
M model/model-impl/src/test/resources/correlator/correlation/accounts-by-name-default.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-by-name-fuzzy.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-by-name-original.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-complex.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-emp-fn-opt.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-emp-fn.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-emp.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-id-match.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-owner-ref.csv
M model/model-impl/src/test/resources/correlator/correlation/accounts-owner.csv
M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-default.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-by-name-original.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-complex.xml
M model/model-impl/src/test/resources/correlator/correlation/correlator-id-match.xml
M model/model-impl/src/test/resources/correlator/correlation/resource-dummy-correlation.xml
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-ad2022.xml
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/correlation/AbstractSimpleIdMatchCorrelationTest.java
M testing/story/src/test/resources/correlation/idmatch/medium/system-configuration.xml
M testing/story/src/test/resources/correlation/idmatch/multi-accounts/resource-sis.xml
M testing/story/src/test/resources/correlation/idmatch/simple/resource-sis.xml
R testing/story/src/test/resources/correlation/idmatch/simple/task-import-sis.xml
M testing/story/src/test/resources/correlation/internal/medium/object-template-user.xml
M testing/story/src/test/resources/correlation/internal/multi-accounts/020-object-template-user.xml
M testing/story/src/test/resources/correlation/internal/simple/resource-target-simplified.xml
M testing/story/src/test/resources/correlation/internal/simple/resource-target.xml
Log Message:
-----------
Improve composite and ID Match correlators
1. Implemented the confidence computation in the composite correlator.
This includes schema changes so that the specification of weights,
scales, limits, tiers, and correlator dependencies is now more concise.
2. Reworked the interface between composite-component correlators:
they now pass only the list of (confidence-evaluated) candidates.
The decision among existing owner, no owner, uncertain is now done
by CorrelationService and present only in CompleteCorrelationResult.
(In a similar way for checkCandidateOwner.)
3. ID Match correlator "followOn" property was deprecated and
superseded by "referenceIdProperty". This means that, in now-preferred
configuration style, there is no correlator composition (chaining)
needed.
Commit: 94659af58d3791d3553ddf132b8de28301fb7a8f
https://github.com/Evolveum/midpoint/commit/94659af58d3791d3553ddf132b8de28301fb7a8f
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-08-11 (Thu, 11 Aug 2022)
Changed paths:
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/15031854bdce...94659af58d37
More information about the midPoint-svn
mailing list