[midPoint-git] [Evolveum/midpoint] f22da7: Add merging of resource object attributes

mederly noreply at github.com
Mon May 9 18:16:23 CEST 2022


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

  Changed paths:
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/BaseCustomItemMerger.java
    A 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/processor/PropertyLimitations.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/ResourceSchemaUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
    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/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/inbounds/prep/MSource.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/shadows/AccessChecker.java
    M provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/resources/TestResourceTemplateMerge.java
    M provisioning/provisioning-impl/src/test/resources/merge/resource-object-types-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-template-object-types.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/DummyResourceContoller.java

  Log Message:
  -----------
  Add merging of resource object attributes

This is a preliminary version of merging definitions of attributes
during resource object subtyping.

What is missing is a thorough review of the data structures, looking for
possible weak points and issues. Furthermore, attribute limitations are
not implemented at all, waiting for MID-7929 resolution.

Other changes:

1. Added convenience PropertyLimitations#canAdd (canRead, canModify)
methods, fixing a couple of potential NPEs along the way.

2. ResourceCredentialsDefinitionType is now a Containerable (it wasn't
yet most probably by mistake).

3. To avoid future misunderstanding like described in MID-7929,
MiscSchemaUtil#getLimitationsForLayer was renamed to
getLimitationsLabeled, and more properly documented.


  Commit: 055bd49e81ba4ae333459c1dc05b33da88c6bdda
      https://github.com/Evolveum/midpoint/commit/055bd49e81ba4ae333459c1dc05b33da88c6bdda
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2022-05-09 (Mon, 09 May 2022)

  Changed paths:
    M gui/admin-gui/.npmrc
    M gui/admin-gui/package-lock.json
    M gui/admin-gui/package.json
    A gui/admin-gui/patches/admin-lte+3.2.0.patch
    M gui/admin-gui/src/frontend/scss/midpoint-theme.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/password/PasswordPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/ExecuteChangeOptionsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationPanelPart.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationPanelPart.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationsPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PolyStringEditorPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/PrismReferencePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadDownloadPanel.html
    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/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.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/PageDebugView.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/AbstractPageLogin.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/AbstractPageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.html
    M gui/admin-gui/src/main/resources/initial-objects/506-archetype-task-cleanup.xml
    M pom.xml

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


Compare: https://github.com/Evolveum/midpoint/compare/834b78d89fc7...055bd49e81ba


More information about the midPoint-svn mailing list