[midPoint-git] [Evolveum/midpoint] 3e52c4: Add rudimentary object type inheritance
mederly
noreply at github.com
Fri May 6 22:08:27 CEST 2022
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 3e52c4e10f1dd94f40551d4f20f1dcc0fe4fcd1e
https://github.com/Evolveum/midpoint/commit/3e52c4e10f1dd94f40551d4f20f1dcc0fe4fcd1e
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-05-06 (Fri, 06 May 2022)
Changed paths:
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/BaseMergeOperation.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/GenericItemMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/IgnoreSourceItemMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/ItemMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/RequiredItemMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/objdef/ResourceObjectTypeDefinitionMergeOperation.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/package-info.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/resource/ObjectTypeDefinitionMerger.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/resource/ResourceMergeOperation.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/RefinedResourceSchemaParser.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinition.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeDefinitionImpl.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceObjectTypeIdentification.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceSchemaFactory.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceObjectTypeDefinitionTypeUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ProvisioningServiceImpl.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceCompletionOperation.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceExpansionOperation.java
M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceManager.java
R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/GenericItemMerger.java
R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/IgnoreSourceItemMerger.java
R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/ItemMerger.java
R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/RequiredItemMerger.java
R provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/ResourceMergeOperation.java
M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/AbstractProvisioningIntegrationTest.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
A provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
A provisioning/provisioning-impl/src/test/resources/merge/resource-template-object-types.xml
R provisioning/provisioning-impl/src/test/resources/merge/resource-template-single-type.xml
Log Message:
-----------
Add rudimentary object type inheritance
This commit implements merging resource object type definition beans,
so that implicit type inheritance relations are created. Afterwards,
when parsing the (refined) resource schema, it tries to resolve these
super/subtype relations, and creates flattened (merged) object type
definition beans. They are then parsed into ResourceObjectTypeDefinition
objects in the standard way.
Some fixes in resource completion and resource testing were made
(related to expanding the definitions after fetching from repo).
Work in progress: the algorithm for merging type definition beans
will need to be fine-tuned to (e.g.) merge related attribute/association
definitions.
Note: the generic bean merging mechanism has been moved to the schema
module, and is present in com.evolveum.midpoint.schema.merger package.
Commit: 1ec837eee7f4db01166b84ad10b8a34e62e6af16
https://github.com/Evolveum/midpoint/commit/1ec837eee7f4db01166b84ad10b8a34e62e6af16
Author: Pavol Mederly <mederly at evolveum.com>
Date: 2022-05-06 (Fri, 06 May 2022)
Changed paths:
M gui/admin-gui/src/frontend/scss/midpoint-theme.scss
M gui/admin-gui/src/frontend/scss/midpoint-utils.scss
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/form/CheckBoxPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/form/CheckBoxPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/form/TriStateFormGroup.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/GlobalPolicyRuleTabPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.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/configuration/component/NotificationConfigTabPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/ProfilingConfigurationTabPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StringPropertyNotificationPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/StringPropertyNotificationPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigPanel.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/configuration/component/SystemConfigurationSummaryPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/systemconfiguration/PageSystemConfiguration.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/ObjectPolicyContentPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/DefaultContainerablePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/DateInput.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/GridViewComponent.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/CheckFormGroup.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/form/TextFormGroup.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/page/admin/configuration/InternalsCachePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsClockPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsConfigPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsCountersPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsDebugUtilPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsLoggedInUsersPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsMemoryPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsPerformancePanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsThreadsPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/InternalsTracesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAbout.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugList.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageRepositoryQuery.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/component/DebugSearchFragment.java
M tools/jenkins/midpoint-quick-pipeline
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/1af28fc76132...1ec837eee7f4
More information about the midPoint-svn
mailing list