[midPoint-git] [Evolveum/midpoint] c9a081: Add merging of mappings and sync reactions

mederly noreply at github.com
Wed May 11 12:39:12 CEST 2022 

  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c9a08159202fb9d1f7124dfe6ab96972fc170a14
      https://github.com/Evolveum/midpoint/commit/c9a08159202fb9d1f7124dfe6ab96972fc170a14
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-11 (Wed, 11 May 2022)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismContainerWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismPropertyWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/objdef/LimitationsMerger.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/objdef/ResourceObjectTypeDefinitionMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/resource/ObjectTypeDefinitionMerger.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/resource/ResourceMergeOperation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/AbstractResourceObjectDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinitionImpl.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationActionDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/SynchronizationReactionDefinition.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MatchingUtil.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/reactions/SynchronizationActionFactory.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resourceobjects/TwoStateRealToSimulatedConverter.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceCompletionOperation.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    M provisioning/provisioning-impl/src/test/resources/logback-test.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-template.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java

  Log Message:
  -----------
  Add merging of mappings and sync reactions

To do this, a more flexible configuration of merger, based on types
instead of item paths, was introduced.

Other changes:
 - getTypeClassIfKnown was replaced by (fixed) getTypeClass call;
   see prism commit 4106e55c5c99e8f646edf94ef8e373eea7222a7a.


  Commit: 4902f701c9f62fc18eb725c202d56bd28855d756
      https://github.com/Evolveum/midpoint/commit/4902f701c9f62fc18eb725c202d56bd28855d756
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-11 (Wed, 11 May 2022)

  Changed paths:
    M gui/admin-gui/src/frontend/scss/midpoint-theme-variables.scss
    M gui/admin-gui/src/frontend/scss/midpoint-theme.scss
    M gui/admin-gui/src/frontend/scss/prism-forms.scss
    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/ObjectBrowserPanel.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/result/OperationResultPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/result/OperationResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/prism/wrapper/PrismReferenceWrapper.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
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractRoleSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/AbstractSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/AutoCompleteSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/AutoCompleteSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ChoicesSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ChoicesSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/DateSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/DateSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/DeadShadowSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/FilterSearchItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/FilterSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/FilterSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/IndirectSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/IndirectSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ItemPathSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ItemPathSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectClassSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectClassSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectCollectionListSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectCollectionListSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectCollectionSearchItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectCollectionSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectCollectionSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectTypeSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ObjectTypeSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/OidSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/OidSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Popover.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Popover.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ProjectSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ProjectSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/PropertySearchItemPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/PropertySearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/PropertySearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ReferenceSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ReferenceSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/RelationSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/RelationSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SaveSearchPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SaveSearchPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ScopeSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/ScopeSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/Search.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchConfigurationWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/TenantSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/TenantSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/TextSearchItemPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/TextSearchItemWrapper.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/DurationPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/PrismReferencePanelContext.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/panel/TextPanelFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/wrapper/TenantRefWrapperFactory.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/AbstractAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/ConstructionAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/DirectAndIndirectAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/FocusMappingsAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/PolicyRuleAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/AbstractInducementPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/FocusMappingsInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusProjectionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/ClassLoggersContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/ConfigurableUserDashboardContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/GuiObjectDetailsContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/ObjectCollectionViewsContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/component/UserDashboardLinkContentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferenceValuePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/PrismReferenceWrapperImpl.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/session/ContainerTabStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/session/WorkItemsStorage.java
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/Popover.html
    R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/Popover.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSearchDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/RepositoryObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanContainerDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/SelectableBeanObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/AceEditorFormGroup.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/ValueChoosePanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DurationPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/DurationPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/validator/DurationValidator.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/PopoverSearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/PopoverSearchPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPanel.html
    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/ReferenceValueSearchPopupPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/ReferenceValueSearchPopupPanel.java
    R 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/SearchObjectCollectionPanel.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/SearchPropertiesConfigPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/AssignmentListProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ContainerListDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/MultivalueContainerListDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/ProjectionsListProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/SchemaListPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/CaseWorkItemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/DebugSearchFragment.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/dto/DebugConfDialogDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AceEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/ReportObjectsListPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SearchFilterConfigurationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/SimpleAceEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.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/page/admin/resources/ResourceContentRepositoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleCompositedSearchItem.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/shadows/PageShadows.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/shadows/ShadowTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/AbstractShoppingCartTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/AuditLogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/CertCampaignsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/CertDecisionsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/GenericPageStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/MemberPanelStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ObjectListStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgStructurePanelStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/OrgTabPanelStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/PageStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ReportsStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourceContentStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/ResourcesStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/session/RoleCatalogStorage.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
    M tools/jenkins/midpoint-conntest-pipeline
    M tools/jenkins/midpoint-main-nativepg-pipeline
    M tools/jenkins/midpoint-main-pipeline
    M tools/jenkins/midpoint-quick-pipeline

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


Compare: https://github.com/Evolveum/midpoint/compare/bb32dfafee1b...4902f701c9f6

More information about the midPoint-svn mailing list