[midPoint-git] [Evolveum/midpoint] ca3f84: Prepare for assignment-held mapping chaining
mederly
noreply at github.com
Fri Sep 20 10:23:23 UTC 2019
Branch: refs/heads/feature/assignment-mapping-chaining
Home: https://github.com/Evolveum/midpoint
Commit: ca3f84926406761e8fa66a725c416cb572eb697d
https://github.com/Evolveum/midpoint/commit/ca3f84926406761e8fa66a725c416cb572eb697d
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2019-09-20 (Fri, 20 Sep 2019)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/model/FlexibleLabelModel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionValidator.java
M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/ItemDeltaItem.java
A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PlusMinusZeroType.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyContainerImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyPropertyImpl.java
M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyReferenceImpl.java
M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.java
M infra/schema/src/main/resources/xml/ns/public/common/common-model-context-3.xsd
M infra/util/src/main/java/com/evolveum/midpoint/util/logging/LoggingEventSink.java
M infra/util/src/main/java/com/evolveum/midpoint/util/logging/TracingAppender.java
M model/certification-impl/src/main/java/com/evolveum/midpoint/certification/impl/AccCertExpressionHelper.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractSearchExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AbstractValueTransformationExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/AssociationFromLinkExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ConstExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/FunctionExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/GenerateExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/PathExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/evaluator/ProportionalExpressionEvaluator.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/CustomFunctions.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/ScriptExpression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingPreExpression.java
M model/model-common/src/main/java/com/evolveum/midpoint/model/common/util/PopulatorUtil.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpression.java
M model/model-common/src/test/java/com/evolveum/midpoint/model/common/expression/TestExpressionProfileSafe.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ClusterCacheListener.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ObjectMerger.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ExpressionHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/ModelExpressionThreadLocalHolder.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/SequentialValueExpressionEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ItemValueWithOrigin.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/IvwoConsolidator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensProjectionContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConsolidationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/Projector.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/SmartAssignmentElement.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentTripleEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/FocusLifecycleProcessor.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/AutoassignRoleMappingEvaluationRequest.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FocalMappingEvaluationRequest.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/VariablesUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationExpressionsEvaluator.java
A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignedMappings.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjector.java
A model/model-impl/src/test/resources/lens/focusMappings/metarole-bearable.xml
A model/model-impl/src/test/resources/lens/focusMappings/role-organizer.xml
A model/model-impl/src/test/resources/lens/focusMappings/role-propagator.xml
A model/model-impl/src/test/resources/lens/focusMappings/role-simple.xml
A model/model-impl/src/test/resources/lens/focusMappings/service-ring.xml
A model/model-impl/src/test/resources/lens/focusMappings/service-sting.xml
A model/model-impl/src/test/resources/lens/focusMappings/user-adam.xml
A model/model-impl/src/test/resources/lens/focusMappings/user-frodo.xml
A model/model-impl/src/test/resources/lens/focusMappings/user-jim.xml
M model/model-impl/src/test/resources/logback-test.xml
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestUserTemplateWithRanges.java
M model/model-intest/src/test/resources/common/user-template-carthesian.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/CustomTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/api/transports/SimpleSmsTransport.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/helpers/NotificationExpressionHelper.java
M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/notifiers/CustomNotifier.java
M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/ReportServiceImpl.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/ExpressionEvaluationHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/general/GcpExpressionHelper.java
M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processors/primary/aspect/PrimaryChangeAspectHelper.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/UcfExpressionEvaluatorImpl.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/commandline/CommandLineScriptExecutor.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/Expression.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionEvaluationContext.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionEvaluator.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ExpressionUtil.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/ValueSetDefinition.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/evaluator/AsIsExpressionEvaluator.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/expression/evaluator/LiteralExpressionEvaluator.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
A repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/UserAsserter.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestMappingMadness.java
M testing/story/src/test/resources/logback-test.xml
Log Message:
-----------
Prepare for assignment-held mapping chaining
Added test for mapping chaining.
Added simple tracing for assignment evaluation, script execution
and consolidation processes. This means moving operation result out of
AssignmentEvaluator.EvaluationContext and ExpressionEvaluationContext
classes.
Improved diagnostic logging a bit (consolidation, reconciliation).
Created TestResource as a wrapper for file+OID for test objects.
Other minor fixes:
- clarified name of AbstractValueTransformationExpressionEvaluator.evaluateScriptExpression
- fixed bug in AssignmentProcessor.collectFocusTripleFromMappings
- fixed bug in log collection in traces
More information about the midPoint-svn
mailing list