[midPoint-git] [Evolveum/midpoint] fa13ce: Add support for linked objects recomputation

mederly noreply at github.com
Thu May 21 09:12:33 CEST 2020 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: fa13ce0dd8b460fb98b049ac6b405cbe7e39957c
      https://github.com/Evolveum/midpoint/commit/fa13ce0dd8b460fb98b049ac6b405cbe7e39957c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-15 (Fri, 15 May 2020)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.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/policy/PolicyRuleScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLinkedObjects.java
    M model/model-intest/src/test/resources/linked/archetype-token.xml
    M model/model-intest/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Add support for linked objects recomputation

1) Added "object" specification to "script execution" policy action
(assignee, assigned, assignedOnPath, assignedMatchingPolicyConstraints).
2) Experimental "target objects" information on evaluated policy
constraints and policy rules.

Related to MID-6109.


  Commit: f10fc12be180e9a434fe029e6ae3fa27a321d153
      https://github.com/Evolveum/midpoint/commit/f10fc12be180e9a434fe029e6ae3fa27a321d153
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-16 (Sat, 16 May 2020)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLinkedObjects.java
    A model/model-intest/src/test/resources/linked/archetype-device.xml
    M model/model-intest/src/test/resources/linked/archetype-token.xml
    A model/model-intest/src/test/resources/linked/archetype-user.xml
    A model/model-intest/src/test/resources/linked/service-axe.xml
    A model/model-intest/src/test/resources/linked/service-sword.xml
    A model/model-intest/src/test/resources/linked/system-configuration.xml
    A model/model-intest/src/test/resources/linked/template-device.xml
    A model/model-intest/src/test/resources/linked/template-user.xml
    M model/model-intest/src/test/resources/linked/user-cavin.xml
    A model/model-intest/src/test/resources/linked/user-cubby.xml
    M model/model-intest/src/test/resources/linked/user-grammi.xml
    M model/model-intest/src/test/resources/linked/user-gruffy.xml
    M model/model-intest/src/test/resources/linked/user-zummi.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java

  Log Message:
  -----------
  Augment test with disabled link targets

Added "device" as a link target that can be also disabled.
Work in progress.

Related to MID-6109.

Also fixed MidpointFunctionsImpl.hasArchetype method (removed code
introduced as part of fixing MID-5358). To be reviewed.


  Commit: 80021de17e1e0f312eebf2dab69de17e166d69c1
      https://github.com/Evolveum/midpoint/commit/80021de17e1e0f312eebf2dab69de17e166d69c1
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-20 (Wed, 20 May 2020)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/VariablesMap.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/CollectionProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AbstractConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentCollector.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    R 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/AssignmentPathVariables.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentSpec.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentTargetEvaluationInformation.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/Construction.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/PersonaConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AbstractEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentPathImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentPathSegmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentSpec.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentTargetEvaluationInformation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/ConditionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentTargetCache.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentTargetImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluationContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluationOrderImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/MemberOfEngine.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/PathSegmentEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/PayloadEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetAssignmentEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetInducementEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetMembershipCollector.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetPayloadEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetsEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/UndefinedEvaluationOrderImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/Util.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/FocusActivationProcessor.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/policy/AssignmentPolicyRuleEvaluationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicySituationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.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/TestPolicyRules.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java
    M model/model-intest/src/test/resources/logback-test.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationHook.java
    M testing/story/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Clean up AssignmentEvaluator

AssignmentEvaluator grew up into quite a mess. This commit breaks it
up into a set of cooperating smaller classes with the goal of making
business logic (what is evaluated/collected under what conditions)
more visible.

This is related to MID-6109 "Linked objects".


  Commit: 1dd5bb550319a67dfe6c14846ce92a107902311b
      https://github.com/Evolveum/midpoint/commit/1dd5bb550319a67dfe6c14846ce92a107902311b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-21 (Thu, 21 May 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentPathImpl.java

  Log Message:
  -----------
  Fix AssignmentEvaluator cleanup

This is related to MID-6109 "Linked objects".


  Commit: 9bdced37a87ab71569194c79d5b78f2f0f667db6
      https://github.com/Evolveum/midpoint/commit/9bdced37a87ab71569194c79d5b78f2f0f667db6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-21 (Thu, 21 May 2020)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/AbstractSearchConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchConfigDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItemPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPopupPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/SamlAuthenticationEntryPoint.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/util/SecurityUtils.java
    M gui/admin-gui/src/main/resources/application.yml
    M gui/admin-gui/src/main/resources/static/less/midpoint/midpoint.less
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java
    A infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedDefinitionUtil.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinition.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java
    M infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/ResourceShadowDiscriminator.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/ModelRestService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AbstractConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentCollector.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Construction.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ConstructionPack.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.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/LensContext.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
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/AbstractConstruction.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/Construction.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionCollector.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedConstructible.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedConstructionImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedConstructionPack.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedOutboundConstructionImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/EvaluatedPersonaConstructionImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/OutboundConstruction.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/PersonaConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ComplexConstructionConsumer.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/ConstructionProcessor.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/EvaluatedConstructionMappingExtractor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingExtractor.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/focus/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/mappings/NextRecompute.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/lens/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.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/TestProjectorPersona.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestEntitlements.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/multi/TestMultiAccount.java
    M model/model-intest/src/test/resources/logback-test.xml
    A model/model-intest/src/test/resources/multi-account/resource-dummy-clever-hr.xml
    M model/model-intest/src/test/resources/multi-account/resource-dummy-multi-green.xml
    A model/model-intest/src/test/resources/multi-account/resource-dummy-multi-outbound.xml
    A model/model-intest/src/test/resources/schema/enterprise.xsd
    M model/rest-impl/pom.xml
    A model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/AbstractRestController.java
    A model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/ExtensionSchemaRestController.java
    M model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/MidpointAbstractHttpMessageConverter.java
    M model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/MidpointYamlHttpMessageConverter.java
    M model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/ModelRestController.java
    M model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/RestApiIndex.java
    A model/rest-impl/src/main/java/com/evolveum/midpoint/rest/impl/RestExceptionHandler.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyAuditService.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/LinkFinder.java
    M testing/conntest/pom.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.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/longtest/pom.xml
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestGenericSynchronization.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestLdap.java
    M testing/longtest/src/test/java/com/evolveum/midpoint/testing/longtest/TestOrgHierarchy.java
    M testing/rest/pom.xml
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/RestServiceInitializer.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestAbstractRestService.java
    M testing/rest/src/test/java/com/evolveum/midpoint/testing/rest/TestRestServiceProxyAuthentication.java
    M testing/story/pom.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestConsistencyMechanism.java
    M tools/ninja/pom.xml
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/SchemaRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/TransformRepositoryAction.java
    M tools/ninja/src/main/java/com/evolveum/midpoint/ninja/action/worker/ImportProducerWorker.java
    M tools/schema-dist-maven-plugin/pom.xml
    M tools/schema-dist-maven-plugin/src/main/java/com/evolveum/midpoint/tools/schemadist/SchemaDistMojo.java
    M tools/xjc-plugin/pom.xml
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/FieldBox.java
    M tools/xjc-plugin/src/main/java/com/evolveum/midpoint/schema/xjc/schema/SchemaProcessor.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/linked-objects

# Conflicts:
#	model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedConstructionImpl.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/PersonaProcessor.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentImpl.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/AbstractConstruction.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
#	model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java
#	model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
#	model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.java
#	model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java
#	model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java


  Commit: 9717c0c1304fe58474587137fc25d3908234d5b2
      https://github.com/Evolveum/midpoint/commit/9717c0c1304fe58474587137fc25d3908234d5b2
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-21 (Thu, 21 May 2020)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    R 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/assignments/AssignmentEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/PayloadEvaluation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionCollector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/AssignmentProcessor.java

  Log Message:
  -----------
  Fix the code after merging of master


  Commit: 6ff32b7a16de27744bc0fa8a6568b87c349d530b
      https://github.com/Evolveum/midpoint/commit/6ff32b7a16de27744bc0fa8a6568b87c349d530b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2020-05-21 (Thu, 21 May 2020)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/delta/builder/S_ValuesEntry.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/expression/VariablesMap.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
    M infra/util/src/main/java/com/evolveum/midpoint/util/MiscUtil.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignmentTarget.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedExclusionTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedHasAssignmentTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedModificationTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluationOrder.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java
    M model/model-impl/pom.xml
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/CollectionProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentCollector.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathImpl.java
    R 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/AssignmentPathVariables.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentSpec.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentTargetEvaluationInformation.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetCache.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrderImpl.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.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/PersonaProcessor.java
    R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/UndefinedEvaluationOrderImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AbstractEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentPathImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentPathSegmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentSpec.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/AssignmentTargetEvaluationInformation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/ConditionEvaluator.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentTargetCache.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluatedAssignmentTargetImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluationContext.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/EvaluationOrderImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/MemberOfEngine.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/PathSegmentEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/PayloadEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetAssignmentEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetInducementEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetMembershipCollector.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetPayloadEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/TargetsEvaluation.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/UndefinedEvaluationOrderImpl.java
    A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/assignments/Util.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/AbstractConstruction.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/construction/ConstructionCollector.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ConstructionProcessor.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/FocusActivationProcessor.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/policy/AssignmentPolicyRuleEvaluationContext.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyRuleScriptExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/PolicyStateRecorder.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/AssignmentModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ExclusionConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/HasAssignmentConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/ObjectModificationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/policy/evaluators/PolicySituationConstraintEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/PipelineData.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/scripting/ScriptingExpressionEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/AbstractLensTest.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAbstractAssignmentEvaluator.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor.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/TestPolicyRules.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestProjectorPersona.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestLinkedObjects.java
    A model/model-intest/src/test/resources/linked/archetype-device.xml
    M model/model-intest/src/test/resources/linked/archetype-token.xml
    A model/model-intest/src/test/resources/linked/archetype-user.xml
    A model/model-intest/src/test/resources/linked/service-axe.xml
    A model/model-intest/src/test/resources/linked/service-sword.xml
    A model/model-intest/src/test/resources/linked/system-configuration.xml
    A model/model-intest/src/test/resources/linked/template-device.xml
    A model/model-intest/src/test/resources/linked/template-user.xml
    M model/model-intest/src/test/resources/linked/user-cavin.xml
    A model/model-intest/src/test/resources/linked/user-cubby.xml
    M model/model-intest/src/test/resources/linked/user-grammi.xml
    M model/model-intest/src/test/resources/linked/user-gruffy.xml
    M model/model-intest/src/test/resources/linked/user-zummi.xml
    M model/model-intest/src/test/resources/logback-test.xml
    M model/notifications-impl/src/main/java/com/evolveum/midpoint/notifications/impl/NotificationHook.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/TestResource.java
    M testing/story/src/test/resources/logback-test.xml

  Log Message:
  -----------
  Merge branch 'feature/linked-objects'


Compare: https://github.com/Evolveum/midpoint/compare/1b06e839ac93...6ff32b7a16de

More information about the midPoint-svn mailing list