[midPoint-git] [Evolveum/midpoint] 1e141f: Improve resource expansion algorithm

mederly noreply at github.com
Thu May 5 20:45:24 CEST 2022


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

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/ResourceDetailsModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/ConfigurationStep.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ConnectorTypeUtil.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ConnectorManager.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ConnectorWithSchema.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
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/ResourceSchemaHelper.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/TestConnectionOperation.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/GenericItemMerger.java
    A provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/resources/merger/IgnoreSourceItemMerger.java
    M 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/merge/resource-basic-1.xml
    M provisioning/provisioning-impl/src/test/resources/merge/resource-template-basic.xml
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ResourceAsserter.java

  Log Message:
  -----------
  Improve resource expansion algorithm

Because we need to have definitions for all merged items, now we do the
expansion operation in two passes. First, we gather all the connector
configurations - to obtain the schema(s). The second pass will merge
the configurations with the appropriate definitions already applied.

Other changes:

1. Created ConnectorWithSchema to keep the schema along with the
connector object in a cleaner way. (And using this in ConnectorManager.)

2. ResourceManager#getConnectorSpec now throws ConfigurationException
(instead of SchemaExceptions) if it sees a misconfiguration like
a connector without a name or a reference.




More information about the midPoint-svn mailing list