[midPoint-git] [Evolveum/midpoint] 53ea7a: Fix midpoint.hasArchetype method

mederly noreply at github.com
Sat Mar 12 11:42:12 CET 2022


  Branch: refs/heads/support-4.4
  Home:   https://github.com/Evolveum/midpoint
  Commit: 53ea7a3dda8166e0b7835972432304c25b050886
      https://github.com/Evolveum/midpoint/commit/53ea7a3dda8166e0b7835972432304c25b050886
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-03-12 (Sat, 12 Mar 2022)

  Changed paths:
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/expr/MidpointFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
    A model/model-intest/src/test/resources/archetypes/archetype-student.xml
    A model/model-intest/src/test/resources/archetypes/resource-dummy-lab.xml
    A model/model-intest/src/test/resources/archetypes/resource-dummy-source.xml
    M model/model-intest/src/test/resources/archetypes/role-business-bosun.xml
    M model/model-intest/src/test/resources/archetypes/role-business-captain.xml
    M model/model-intest/src/test/resources/archetypes/role-employee-base.xml
    A model/model-intest/src/test/resources/archetypes/role-lab-access.xml
    M model/model-intest/src/test/resources/archetypes/user-template-archetypes-global.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fix midpoint.hasArchetype method

The MidpointFunctions#hasArchetype method looked only at effectively
present archetypes (archetypeRef). This was not consistent with other
archetype-related methods like getArchetypes or getArchetypeOids that
used assignments as well.

So - preliminarily! - the implementation of hasArchetype(focus, oid)
was replaced by "getArchetypeOids(focus).contains(oid)".

This should resolve MID-7694, at least to some extent.

To be discussed.

Unrelated change:
- Yet another problem with task tracing (writing result with
incomplete="true" along with a real value) was fixed.

(cherry picked from commit d48b58186876ff287ed46bcbe5846e405ec2134b)

Note: This is now the final, agreed-upon solution.


  Commit: e47af2db42bc745347c390b3f63491c34d63ab5f
      https://github.com/Evolveum/midpoint/commit/e47af2db42bc745347c390b3f63491c34d63ab5f
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-03-12 (Sat, 12 Mar 2022)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/archetypes/TestArchetypes.java
    M model/model-intest/src/test/resources/archetypes/resource-dummy-lab.xml
    M model/model-intest/src/test/resources/archetypes/resource-dummy-source.xml

  Log Message:
  -----------
  Adapt the code and configuration after cherry-picking

This commit adapts the code and configuration from 4.5-SNAPSHOT after being
back-ported to support-4.4 branch. (Plus a minor test fix.)

Related to MID-7694.


Compare: https://github.com/Evolveum/midpoint/compare/dc9bbd7aeb28...e47af2db42bc


More information about the midPoint-svn mailing list