[midPoint-git] [Evolveum/midpoint] ca3f84: Prepare for assignment-held mapping chaining

mederly noreply at github.com
Sun Sep 22 07:02:05 UTC 2019 

  Branch: refs/heads/master
  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


  Commit: 83b4159c1785c9b4f24518ce699bb01fb6f5d727
      https://github.com/Evolveum/midpoint/commit/83b4159c1785c9b4f24518ce699bb01fb6f5d727
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-20 (Fri, 20 Sep 2019)

  Changed paths:
    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/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/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignedMappings.java
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.3.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.3.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.2.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.3.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.4.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr3.1.1.xml
    M model/model-impl/src/test/resources/lens/focusMappings/metarole-bearable.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.4.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr3.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr3.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr3.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr4.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr5.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr6.1.xml
    M model/model-impl/src/test/resources/lens/focusMappings/role-propagator.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r4.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r5.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r6.xml
    M model/model-impl/src/test/resources/lens/focusMappings/service-sting.xml
    M model/model-impl/src/test/resources/lens/focusMappings/user-adam.xml
    M model/model-impl/src/test/resources/lens/focusMappings/user-frodo.xml
    M model/model-impl/src/test/resources/schema/piracy.xsd
    M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java

  Log Message:
  -----------
  Add more assigned mappings tests

(See MID-5753, MID-4449, and MID-4430.)

Also improved logging and operation result provided reporting.


  Commit: ae5fa3849cd0eb8e124c845ae05659330ad893d1
      https://github.com/Evolveum/midpoint/commit/ae5fa3849cd0eb8e124c845ae05659330ad893d1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-20 (Fri, 20 Sep 2019)

  Changed paths:
    M model/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java

  Log Message:
  -----------
  Adapt report tests to mapping op.result changes

Mapping and scripts evaluation is now processed in separate operation
(sub)results. This has an effect on some of the tests that contain
failures during expression evaluation.


  Commit: ab141fe62224cb87d53a5b2c7437ad7fc90c1c93
      https://github.com/Evolveum/midpoint/commit/ab141fe62224cb87d53a5b2c7437ad7fc90c1c93
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-21 (Sat, 21 Sep 2019)

  Changed paths:
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.java
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    M repo/repo-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Adapt a wf test to op. result handling in mappings

Mapping and scripts evaluation is now processed in separate operation
(sub)results. This has an effect on some of the tests that contain
failures during expression evaluation.

This commit also adds auxiliary information to operation results
for RepositoryCache.getObject, searchObjects & searchObjectsIterative.


  Commit: 2d0514b2f892752f8cfe805243b097342aceca79
      https://github.com/Evolveum/midpoint/commit/2d0514b2f892752f8cfe805243b097342aceca79
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-21 (Sat, 21 Sep 2019)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/result/OperationResult.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/projector/focus/AssignmentProcessor.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignedMappings.java
    M model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.2.xml
    M model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.3.xml
    M model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.2.xml
    M model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.3.xml
    M model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.1.xml
    M model/model-impl/src/test/resources/lens/focusMappings/role-r2.xml
    M model/model-impl/src/test/resources/lens/focusMappings/role-r4.xml
    A model/model-impl/src/test/resources/lens/focusMappings/user-benjamin.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java

  Log Message:
  -----------
  Add tests for cond. change in assigned mappings

(See MID-5783.)


  Commit: 4b6d649c9be9c6dcc2482ee32bf8267cdcc64a06
      https://github.com/Evolveum/midpoint/commit/4b6d649c9be9c6dcc2482ee32bf8267cdcc64a06
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-21 (Sat, 21 Sep 2019)

  Changed paths:
    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/EvaluatedAssignmentImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/AssignedFocusMappingEvaluationRequest.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FocalMappingEvaluationRequest.java

  Log Message:
  -----------
  Postpone assigned mapping evaluation

Mapping evaluation is now postponed to the moment when all the
assignments are traversed and evaluated. No chaining (MID-5753) yet.


  Commit: 5caec04c56a5451339694f3687c4fab6db9d03d9
      https://github.com/Evolveum/midpoint/commit/5caec04c56a5451339694f3687c4fab6db9d03d9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-21 (Sat, 21 Sep 2019)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/ObjectDeltaObject.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/item/DummyContainerImpl.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/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/ObjectTemplateProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/AssignedFocusMappingEvaluationRequest.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/AutoassignRoleMappingEvaluationRequest.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.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/lens/projector/mappings/MappingSetEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TemplateMappingEvaluationRequest.java
    M 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
    M model/model-impl/src/test/resources/lens/focusMappings/role-propagator.xml
    M model/model-impl/testng-unit.xml
    M model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java

  Log Message:
  -----------
  Improve assigned mappings evaluation

1) Implemented assigned mapping chaining (MID-5753)
2) Fixed mappings evaluation from invalid assignments (MID-4430)
3) Fixed mappings evaluation from disabled roles (MID-4449)
4) Fixed mappings evaluation when condition changes (MID-5783)
5) Fixed mappings eval. when assignments are being deleted (MID-4452)

Also improved mapping chaining in general, providing better logging
and partial chaining in cases when total ordering is not possible.


  Commit: 81a118f65abcd543e456ebc89567ca88a7047e61
      https://github.com/Evolveum/midpoint/commit/81a118f65abcd543e456ebc89567ca88a7047e61
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2019-09-22 (Sun, 22 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
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/ObjectDeltaObject.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/EvaluatedAssignmentImpl.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/focus/ObjectTemplateProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/AssignedFocusMappingEvaluationRequest.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/AutoassignRoleMappingEvaluationRequest.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/FixedTargetSpecification.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/lens/projector/mappings/MappingSetEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/SelfTargetSpecification.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TargetObjectSpecification.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/TemplateMappingEvaluationRequest.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/metametarole-mmr1.1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.1.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.2.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.3.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr1.3.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.2.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.3.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr2.4.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metametarole-mmr3.1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-bearable.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr1.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr2.4.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr3.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr3.2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr3.3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr4.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr5.1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/metarole-mr6.1.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-r1.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r2.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r3.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r4.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r5.xml
    A model/model-impl/src/test/resources/lens/focusMappings/role-r6.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-benjamin.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-impl/src/test/resources/schema/piracy.xsd
    M model/model-impl/testng-unit.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/report-impl/src/test/java/com/evolveum/midpoint/report/TestReport.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/ApprovalSchemaExecutionInformationHelper.java
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/WorkflowManagerImpl.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 model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/assignments/TestAssignmentsAdvanced.java
    M model/workflow-impl/src/test/resources/logback-test.xml
    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-cache/src/main/java/com/evolveum/midpoint/repo/cache/RepositoryCache.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:
  -----------
  Merge branch 'feature/assignment-mapping-chaining'


Compare: https://github.com/Evolveum/midpoint/compare/3dfef6d1201b...81a118f65abc

More information about the midPoint-svn mailing list