[midPoint-git] [Evolveum/midpoint] 6f22b4: Fix NPE in stalled tasks watcher

Fri Sep 17 08:16:52 CEST 2021

  Branch: refs/heads/feature/schema-cleanup-4.4
  Home:   https://github.com/Evolveum/midpoint
  Commit: 6f22b4e5e05d0df637ee2acebb0de75531d5910c
      https://github.com/Evolveum/midpoint/commit/6f22b4e5e05d0df637ee2acebb0de75531d5910c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-09-16 (Thu, 16 Sep 2021)

  Changed paths:
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Fix NPE in stalled tasks watcher

The problem was for generic tasks (with no handler URI).

  Commit: 1ceb91254f03d73f4286db20e25686ecb82cb789
      https://github.com/Evolveum/midpoint/commit/1ceb91254f03d73f4286db20e25686ecb82cb789
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-09-16 (Thu, 16 Sep 2021)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationalDataManager.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    A model/model-intest/src/test/resources/password/task-change-jack-account-password.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/MetadataAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java

  Log Message:
  -----------
  Fix create/modifyTaskRef in MetadataType

When storing task references in MetadataType we now always store
a reference to the root task there. All subtasks are (in most cases)
transient, and storing their OIDs for future reference makes almost
no sense.

This resolves MID-7179.

  Commit: e1c3d86413a24661bb95fa697a553714766e07e6
      https://github.com/Evolveum/midpoint/commit/e1c3d86413a24661bb95fa697a553714766e07e6
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-09-16 (Thu, 16 Sep 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/GenericAbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GenericAbstractRoleAssignmentPanel.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/page/admin/roles/component/RoleSummaryPanel.java
    M gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
    M gui/admin-gui/src/test/resources/common/org-monkey-island.xml
    M gui/admin-gui/src/test/resources/common/user-jack-repo.xml
    M gui/admin-gui/src/test/resources/common/user-jack.xml
    M gui/admin-gui/src/test/resources/delta/user-elaine.xml
    M gui/admin-gui/src/test/resources/wrapper/role-prop-read-all-modify-some-user.xml
    M gui/admin-gui/src/test/resources/wrapper/role-prop-read-some-modify-some-user.xml
    M infra/common/src/test/resources/crypto/user-jack.xml
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestEmptyItems.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestJaxbParsing.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestParseGenericObject.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/validator/TestObjectValidator.java
    M infra/schema/src/test/resources/common/generic-sample-configuration.xml
    M infra/schema/src/test/resources/deltaconverter/task-new.xml
    M infra/schema/src/test/resources/deltaconverter/task-old.xml
    M infra/schema/src/test/resources/diff/task-after.xml
    M infra/schema/src/test/resources/diff/task-before.xml
    M infra/schema/src/test/resources/queryconverter/test210EqualMultiple.xml
    M infra/schema/src/test/resources/queryconverter/test350Substring.xml
    M infra/schema/src/test/resources/validator/role-one-legacy.xml
    M infra/schema/src/test/resources/validator/role-one.xml
    M model/certification-impl/src/test/resources/common/user-jack.xml
    M model/certification-impl/src/test/resources/complex/user-jack.xml
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingComplex.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDomain.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSimple.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingDynamicSysVar.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingStatic.java
    M model/model-common/src/test/java/com/evolveum/midpoint/model/common/mapping/TestMappingTime.java
    M model/model-common/src/test/resources/expression/expression/user-jack.xml
    M model/model-common/src/test/resources/expression/functions/user-jack.xml
    M model/model-common/src/test/resources/mapping/mapping-asis.xml
    M model/model-common/src/test/resources/mapping/mapping-complex-captain.xml
    M model/model-common/src/test/resources/mapping/mapping-condition-nonempty.xml
    M model/model-common/src/test/resources/mapping/mapping-domain.xml
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-empty-function.xml
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-empty.xml
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-groovy.xml
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-condition-sourcecontext-groovy.xml
    M model/model-common/src/test/resources/mapping/mapping-script-system-variables-employee-type.xml
    M model/model-common/src/test/resources/mapping/mapping-script-transform.xml
    M model/model-common/src/test/resources/mapping/mapping-time-from-to.xml
    M model/model-common/src/test/resources/mapping/user-jack-metadata.xml
    M model/model-common/src/test/resources/mapping/user-jack.xml
    M model/model-common/src/test/resources/objects/c0c010c0-d34d-b33f-f00d-111111111111.xml
    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/TestPolicyRules.java
    M model/model-impl/src/test/resources/common/resource-dummy-deprecated.xml
    M model/model-impl/src/test/resources/common/resource-dummy-id.xml
    M model/model-impl/src/test/resources/common/resource-dummy.xml
    M model/model-impl/src/test/resources/common/system-configuration.xml
    M model/model-impl/src/test/resources/common/user-jack.xml
    M model/model-impl/src/test/resources/common/user-largo.xml
    M model/model-impl/src/test/resources/expr/expression-employeeType-empty-filter.xml
    M model/model-impl/src/test/resources/expr/expression-employeeType-error.xml
    M model/model-impl/src/test/resources/expr/expression-employeeType-filter-defaults.xml
    M model/model-impl/src/test/resources/expr/expression-employeeType-none-filter.xml
    M model/model-impl/src/test/resources/expr/expression-employeeType-undefined-filter.xml
    M model/model-impl/src/test/resources/expr/orgstruct.xml
    M model/model-impl/src/test/resources/lens/policy/role-immutable-inducements.xml
    M model/model-impl/src/test/resources/lens/policy/role-no-inducements-add-delete-via-expression.xml
    M model/model-impl/src/test/resources/lens/policy/role-no-inducements-add-delete.xml
    M model/model-impl/src/test/resources/lens/role-corp-contractor.xml
    M model/model-impl/src/test/resources/lens/role-corp-employee.xml
    M model/model-impl/src/test/resources/lens/role-corp-engineer.xml
    M model/model-impl/src/test/resources/lens/role-corp-job-metarole-dynamic.xml
    M model/model-impl/src/test/resources/lens/role-corp-job-metarole.xml
    M model/model-impl/src/test/resources/lens/role-corp-manager.xml
    M model/model-impl/src/test/resources/user-password-change.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
    M model/model-intest/src/test/resources/common/generic-object-my-config.xml
    M model/model-intest/src/test/resources/common/role-autocratic.xml
    M model/model-intest/src/test/resources/common/role-autodidactic.xml
    M model/model-intest/src/test/resources/common/role-autographic.xml
    M model/model-intest/src/test/resources/common/role-automatic.xml
    M model/model-intest/src/test/resources/common/role-autotesters.xml
    M model/model-intest/src/test/resources/common/service-ship-sea-monkey.xml
    M model/model-intest/src/test/resources/common/user-template-complex.xml
    M model/model-intest/src/test/resources/gensync/object-template-role.xml
    M model/model-intest/src/test/resources/importer/role-one-legacy.json
    M model/model-intest/src/test/resources/importer/role-one-legacy.xml
    M model/model-intest/src/test/resources/importer/role-one-legacy.yaml
    M model/model-intest/src/test/resources/lifecycle/role-caretaker.xml
    M model/model-intest/src/test/resources/lifecycle/role-croupier.xml
    M model/model-intest/src/test/resources/lifecycle/role-gambler.xml
    M model/model-intest/src/test/resources/lifecycle/role-headmaster.xml
    M model/model-intest/src/test/resources/lifecycle/role-pit-boss.xml
    M model/model-intest/src/test/resources/mapping/resource-dummy-autogreen.xml
    M model/model-intest/src/test/resources/rbac/role-all-loot.xml
    M model/model-intest/src/test/resources/rbac/role-all-treasure.xml
    M model/model-intest/src/test/resources/rbac/role-all-you-can-get.xml
    M model/model-intest/src/test/resources/rbac/role-loot-diamonds.xml
    M model/model-intest/src/test/resources/rbac/role-treasure-bronze.xml
    M model/model-intest/src/test/resources/rbac/role-treasure-gold.xml
    M model/model-intest/src/test/resources/rbac/role-treasure-silver.xml
    M model/model-intest/src/test/resources/rbac/sod/global-policy-rules-exclusion.xml
    M model/model-intest/src/test/resources/rbac/sod/role-citizen-sk.xml
    M model/model-intest/src/test/resources/rbac/sod/role-citizen-us.xml
    M model/model-intest/src/test/resources/scripthooks/generic-blackpearl.xml
    M model/model-intest/src/test/resources/security/role-approver.xml
    M model/notifications-impl/src/test/resources/objects/user-jack.xml
    M model/report-impl/src/test/resources/common/user-jack.xml
    M model/workflow-impl/src/test/resources/approval-task-owner/role-approver.xml
    M model/workflow-impl/src/test/resources/common/041-role-approver.xml
    M model/workflow-impl/src/test/resources/common/user-jack.xml
    M repo/repo-sqale/sql/pgnew-repo.sql
    R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/MGenericObject.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QFocus.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QGenericObject.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QGenericObjectMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/MRole.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/MService.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/QRole.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/QRoleMapping.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/AddOverwriteTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/ObjectDeltaUpdaterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/PerformanceTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/QueryInterpreterTest.java
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/SearchTest.java
    M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/resource-opendj.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/task.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/tasks.xml
    M repo/repo-sql-impl-test/src/test/resources/basic/user-big.xml
    M repo/repo-sql-impl-test/src/test/resources/modify/resource-opendj.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/org-monkey-island-incorrect.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/org-monkey-island.xml
    M repo/repo-sql-impl-test/src/test/resources/orgstruct/org-simple-test.xml
    M repo/repo-sql-impl-test/src/test/resources/photo/t101-add-org-type.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RGenericObject.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/ROrg.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RRole.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RService.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RUser.java
    M repo/security-impl/src/test/resources/user-jack.xml
    M repo/task-quartz-impl/src/test/resources/basic/owner.xml
    M repo/task-quartz-impl/src/test/resources/basic/owner2.xml
    M repo/task-quartz-impl/src/test/resources/basic/tasks-for-cleanup.xml
    M testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapConnTest.java
    M testing/conntest/src/test/resources/389ds/resource-dn-localhost.xml
    M testing/conntest/src/test/resources/389ds/resource-dn-phobos.xml
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-localhost.xml
    M testing/conntest/src/test/resources/389ds/resource-nsuniqueid-phobos.xml
    M testing/conntest/src/test/resources/opendj-dumber/resource.xml
    M testing/conntest/src/test/resources/opendj/resource-dn.xml
    M testing/conntest/src/test/resources/opendj/resource-unsafe.xml
    M testing/conntest/src/test/resources/opendj/resource.xml
    M testing/conntest/src/test/resources/openldap-dumber/resource.xml
    M testing/conntest/src/test/resources/openldap/resource.xml
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestOrgSync.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestRetirement.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUniversity.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestUnix.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/consistency/TestConsistencyMechanism.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/TestLdapDependency.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/ldap/hierarchy/AbstractLdapHierarchyTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/AbstractNotoriousTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/notorious/TestSupernotoriousOrg.java
    M testing/story/src/test/resources/common/user-jack.xml
    M testing/story/src/test/resources/consistency/discovery.ldif
    M testing/story/src/test/resources/consistency/elaine.ldif
    M testing/story/src/test/resources/consistency/resource-opendj-reaper.xml
    M testing/story/src/test/resources/consistency/resource-opendj.xml
    M testing/story/src/test/resources/consistency/user-abom.xml
    M testing/story/src/test/resources/consistency/user-abomba.xml
    M testing/story/src/test/resources/consistency/user-bob-no-given-name.xml
    M testing/story/src/test/resources/consistency/user-deniels.xml
    M testing/story/src/test/resources/consistency/user-donald.xml
    M testing/story/src/test/resources/consistency/user-jack.xml
    M testing/story/src/test/resources/consistency/user-john.xml
    M testing/story/src/test/resources/delivery/orgs/0-org-monkey-island-modified.xml
    M testing/story/src/test/resources/delivery/roles/role-end-user.xml
    M testing/story/src/test/resources/entertainment/org-games-top.xml
    M testing/story/src/test/resources/entertainment/org-poker.xml
    M testing/story/src/test/resources/inbound-outbound-association/resource-dummy-dir.xml
    M testing/story/src/test/resources/ldap/complex/org-functional-top.xml
    M testing/story/src/test/resources/ldap/complex/org-project-top.xml
    M testing/story/src/test/resources/ldap/dependency/org-top.xml
    M testing/story/src/test/resources/ldap/hierarchy/deeply-hierarchical/org-top.xml
    M testing/story/src/test/resources/ldap/hierarchy/flat/org-top.xml
    M testing/story/src/test/resources/ldap/hierarchy/hierarchical/org-top.xml
    M testing/story/src/test/resources/ldap/hierarchy/nested/org-top.xml
    M testing/story/src/test/resources/ldap/virtualgroup/org-top.xml
    M testing/story/src/test/resources/machineintelligence/resource-csv-HR.xml
    M testing/story/src/test/resources/nullattribute/user-smack.xml
    M testing/story/src/test/resources/orgsync/object-template-org.xml
    M testing/story/src/test/resources/orgsync/object-template-user.xml
    M testing/story/src/test/resources/orgsync/org-top.xml
    M testing/story/src/test/resources/recon-null-value/org-top.xml
    M testing/story/src/test/resources/retirement/org-retired.xml
    M testing/story/src/test/resources/retirement/org-top.xml
    M testing/story/src/test/resources/strings/orgs/0-org-monkey-island-modified.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-1.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-2b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3a.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-3b.xml
    M testing/story/src/test/resources/strings/roles-specific/a-test-4.xml
    M testing/story/src/test/resources/strings/roles/global-policy-rules.xml
    M testing/story/src/test/resources/strings/roles/role-end-user.xml
    M testing/story/src/test/resources/university/object-template-org.xml
    M testing/story/src/test/resources/university/org-top.xml
    M testing/story/src/test/resources/university/resource-dummy-hr.xml
    M testing/story/src/test/resources/unix/object-template-user.xml
    M testing/story/src/test/resources/village/object-template-user.xml
    M testing/story/src/test/resources/village/org-project-jolly-roger.xml
    M testing/story/src/test/resources/village/orgs.xml
    M testing/story/src/test/resources/village/resource-dummy-source.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'

  Commit: 76568f1a4273f956b421cd1f98566ce894d55767
      https://github.com/Evolveum/midpoint/commit/76568f1a4273f956b421cd1f98566ce894d55767
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2021-09-16 (Thu, 16 Sep 2021)

  Changed paths:
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/OperationalDataManager.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/password/AbstractPasswordTest.java
    A model/model-intest/src/test/resources/password/task-change-jack-account-password.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/MetadataAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismObjectAsserter.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/TaskQuartzImpl.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint

Compare: https://github.com/Evolveum/midpoint/compare/ba158541c6e5...76568f1a4273