[midPoint-git] [Evolveum/midpoint] 0b71e8: Fix reconciliation task NPE in maintenance mode

mederly noreply at github.com
Wed Mar 31 12:00:00 CEST 2021 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 0b71e8135ab82e8b7a021c1ac39b3d57241a03f9
      https://github.com/Evolveum/midpoint/commit/0b71e8135ab82e8b7a021c1ac39b3d57241a03f9
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-03-31 (Wed, 31 Mar 2021)

  Changed paths:
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationTaskExecution.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestResourceInMaintenance.java
    M testing/story/src/test/resources/resource-in-maintenance/task-reconcile-csv.xml

  Log Message:
  -----------
  Fix reconciliation task NPE in maintenance mode

When a resource is in maintenance mode, the reconciliation task used
to fail with a NPE. This is now fixed.

Resolves MID-6946.


  Commit: ca31cb81d35b81804ec428adb22e7c56d3bd8522
      https://github.com/Evolveum/midpoint/commit/ca31cb81d35b81804ec428adb22e7c56d3bd8522
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-03-31 (Wed, 31 Mar 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ChooseMemberPopup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/ShadowWrapper.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/MultivalueContainerListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerValueWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ShadowWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/TableHeadersToolbar.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusMainPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/FocusProjectionsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/PropertySearchItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.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/SearchPropertyPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskIterativeProgressType.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/MidpointAuthFilter.java
    M gui/admin-gui/src/main/resources/initial-objects/021-archetype-system-role.xml
    M gui/admin-gui/src/main/resources/initial-objects/022-archetype-business-role.xml
    M gui/admin-gui/src/main/resources/initial-objects/040-role-enduser.xml
    M gui/admin-gui/src/main/resources/initial-objects/521-archetype-task-approval.xml
    M gui/admin-gui/src/main/resources/static/css/font-evosome.css
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.eot
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.svg
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.ttf
    M gui/admin-gui/src/main/resources/static/fonts/font-evosome.woff
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-security-3.xsd
    M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelService.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelController.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationServiceImpl.java
    M model/report-impl/src/test/resources/common/dashboard-default-columns.xml
    M model/report-impl/src/test/resources/common/dashboard-with-triple-view.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ObjectRefTableItemFilterProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/RefItemFilterProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleUpdateContext.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/UriItemFilterProcessor.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationDefinitionMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/assignment/QAssignmentMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/cases/QCaseMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/QConnectorHostMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/connector/QConnectorMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QFocusMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QUserMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/lookuptable/QLookupTableRowMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/node/QNodeMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QObjectMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QOperationExecutionMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QTriggerMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/ref/QReferenceMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/resource/QResourceMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/QAbstractRoleMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/QRoleMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/role/QServiceMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/shadow/QShadowMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/task/QTaskMapping.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/SqaleRepoModifyObjectTest.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlAuditServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/AuditSqlTransformerBase.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/AuditCustomColumnItemFilterProcessor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/AuditDeltaSqlTransformer.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/AuditRefItemFilterProcessor.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/audit/mapping/QAuditEventRecordMapping.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/QueryException.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/RepositoryException.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryContext.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlQueryExecutor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlTransformerSupport.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/FilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/NaryLogicalFilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/NotFilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/ObjectFilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/ValueFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/CanonicalItemPathItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/DetailTableItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/EnumItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/EnumOrdinalItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/ItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/PolyStringItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/SimpleItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/SinglePathItemFilterProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/filtering/item/TimestampItemFilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryModelMapping.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/QueryTableMapping.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/delta/ItemDeltaProcessor.java
    A repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/delta/SqlUpdateContext.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/CanonicalItemPathItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/DetailTableItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/EnumItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/EnumOrdinalItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/ItemFilterProcessor.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/ItemSqlMapper.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/PolyStringItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/SimpleItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/SinglePathItemFilterProcessor.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/mapping/item/TimestampItemFilterProcessor.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestServiceAccountsClassifier.java
    M testing/story/src/test/resources/service-accounts-classifier/resource-dummy-classifier.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/27c0b858f6c2...ca31cb81d35b

More information about the midPoint-svn mailing list