[midPoint-git] [Evolveum/midpoint] c7cfb2: MID-6780: Added support of Query Langugage to XML ...

Tony Tkáčik noreply at github.com
Wed Jan 20 11:10:51 CET 2021


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: c7cfb250621ba54d82fa590d6783f93da6b12d7d
      https://github.com/Evolveum/midpoint/commit/c7cfb250621ba54d82fa590d6783f93da6b12d7d
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-01-18 (Mon, 18 Jan 2021)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java
    M infra/prism-impl/src/main/resources/xml/ns/public/query-3.xsd
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryConverters.java
    A infra/prism-impl/src/test/resources/query/lang/filter-not-full-text.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-not-in-oid.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-type-user-none.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-user-and.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-user-name.xml

  Log Message:
  -----------
  MID-6780: Added support of Query Langugage to XML filters

Query Language is encoded inside SearchFilterType as item "text".

Signed-off-by: Tony Tkacik <tonydamage at gmail.com>


  Commit: 2cd29a05f6dfdd384d19fde358ae03548eae4d6d
      https://github.com/Evolveum/midpoint/commit/2cd29a05f6dfdd384d19fde358ae03548eae4d6d
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-01-19 (Tue, 19 Jan 2021)

  Changed paths:
    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/prism/wrapper/PrismReferenceWrapper.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/wrapper/PrismReferenceWrapperFactory.java
    A 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/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/web/component/form/ValueChoosePanel.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/SearchPanel.java
    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/roles/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.java
    M infra/common/src/main/java/com/evolveum/midpoint/common/configuration/api/MidpointConfiguration.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/PropertyValueFilterImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/SubstringFilterImpl.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/ValueFilterImpl.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
    M infra/schema/src/main/resources/xml/ns/public/common/common-workflows-3.xsd
    M model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/execution/ExecutionHelper.java
    A model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/other/TestApprovalTaskOwner.java
    A model/workflow-impl/src/test/resources/approval-task-owner/metarole-approve-manager.xml
    A model/workflow-impl/src/test/resources/approval-task-owner/role-approver.xml
    A model/workflow-impl/src/test/resources/approval-task-owner/role-duelling-classroom-teacher.xml
    A model/workflow-impl/src/test/resources/approval-task-owner/user-manager.xml
    M model/workflow-impl/src/test/resources/test-config.xml
    M model/workflow-impl/testng-integration.xml
    M repo/repo-api/pom.xml
    R repo/repo-api/src/main/java/com/evolveum/midpoint/repo/api/RepositoryServiceFactory.java
    M repo/repo-cache/src/test/resources/ctx-configuration-test-no-audit.xml
    M repo/repo-cache/src/test/resources/test-config.xml
    M repo/repo-sqale/pom.xml
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryBeanConfig.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryConfiguration.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
    R repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryServiceFactory.java
    M repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryBeanPostProcessor.java
    A repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryConfigurationFactory.java
    R repo/repo-sql-impl-test/src/main/java/com/evolveum/midpoint/repo/sql/testing/TestSqlRepositoryFactory.java
    M repo/repo-sql-impl-test/src/main/resources/ctx-repository-test.xml
    M repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/EmbeddedServerModeTest.java
    M repo/repo-sql-impl-test/src/test/resources/ctx-configuration-sql-test.xml
    M repo/repo-sql-impl-test/src/test/resources/ctx-test-datasource.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/Database.java
    A repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlEmbeddedRepository.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryBeanConfig.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryConfiguration.java
    R repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryFactory.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryServiceImpl.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/dictionary/ExtItemDictionary.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/BaseHelper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/delta/ObjectDeltaUpdater.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/modify/PrismEntityMapper.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/schemacheck/SchemaActionComputer.java
    M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/DataSourceFactory.java
    R repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/JdbcRepositoryServiceFactory.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
    M repo/repo-test-util/src/main/resources/ctx-configuration-test.xml
    M repo/repo-test-util/src/main/resources/test-config-no-repo.xml
    M repo/system-init/pom.xml
    R repo/system-init/src/main/java/com/evolveum/midpoint/init/RepositoryFactory.java
    M repo/system-init/src/main/java/com/evolveum/midpoint/init/StartupConfiguration.java
    M repo/system-init/src/main/resources/ctx-configuration.xml
    M repo/system-init/src/test/java/com/evolveum/midpoint/init/TestConfigurationLoad.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/Initializer.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/handlers/JdbcPingTaskHandler.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/AbstractSchrodingerTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/ImportTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/UserTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/UsersTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/component/FilterConfigPanelTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/component/SearchPanelTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/AbstractLabTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M10ObjectTemplate.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M11SystemConfiguration.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M12Authorizations.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M3ResourcesAttributesAndMappingsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M4ProvisioningToResources.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M5AccountsAssignmentsAndRoles.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M6ConfiguringMultipleAccountTypes.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M7SynchronizationFlavours.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M8ExtendingMidPointXMLSchema.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/labs/M9OrganizationalStructure.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/AboutPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/AbstractLoginPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/BulkActionsTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/CredentialsPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/InternalsConfigurationPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/LoginPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/LoginPageWithAuthenticationConfigTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/PreviewPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/QueryPlaygroundPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/TaskPageTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/AccountTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/CaseTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/CustomColumnTest.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ObjectListArchetypeTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/OrgMembersTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/OrganizationStructureTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/PolyStringTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/PostAuthenticationTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/ReportTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/SynchronizationTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserAccountTests.java
    M testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/scenarios/UserPhotoTests.java
    M testing/schrodingertest/src/test/resources/component/objects/orgs/org-membership-search-by-type.xml
    A testing/schrodingertest/src/test/resources/component/objects/orgs/org-root-member-search.xml
    A testing/schrodingertest/src/test/resources/component/objects/systemConfiguation/system-configuration-search-configuration.xml
    A testing/schrodingertest/src/test/resources/component/objects/systemConfiguation/system-configuration-search-without-def-search-items.xml
    A testing/schrodingertest/src/test/resources/component/objects/users/user-org-assignment-member-search.xml
    A testing/schrodingertest/src/test/resources/labs/M3/resources/localhost-csvfile-1-document-access-simple.xml
    A testing/schrodingertest/src/test/resources/labs/M3/resources/localhost-csvfile-2-canteen.xml
    A testing/schrodingertest/src/test/resources/labs/M3/resources/localhost-csvfile-3-ldap.xml
    A testing/schrodingertest/src/test/resources/labs/M3/valuePolicies/numeric-pin-first-nonzero-policy.xml
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/DateTimePanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/assignmentholder/AssignmentHolderObjectListPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/assignmentholder/AssignmentHolderObjectListTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/cases/OperationRequestTab.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/cases/WorkitemDetailsPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/DelegationDetailsPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/FeedbackBox.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/PrismForm.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/SummaryPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/search/ReferenceSearchItemPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/search/Search.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/Table.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/table/TableWithPageRedirect.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/org/OrgHierarchyPanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/prism/show/PartialSceneHeader.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/prism/show/ScenePanel.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/table/DirectIndirectAssignmentTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/task/TaskBasicTab.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/user/UsersPageTable.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/AssignmentHolderDetailsPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/BasicPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/FocusPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/configuration/AboutPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/configuration/BulkActionsPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/login/FormLoginPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/login/RegistrationConfirmationPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/login/RegistrationFinishPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/org/OrgTreePage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/ResourceWizardPage.java
    M tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/page/resource/SchemaStepSchemaTab.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/query-xml


  Commit: 031a8564629c299f723f125c169e4dfc46b62d4c
      https://github.com/Evolveum/midpoint/commit/031a8564629c299f723f125c169e4dfc46b62d4c
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-01-19 (Tue, 19 Jan 2021)

  Changed paths:
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestFilterResolverQueryDsl.java
    A model/model-impl/src/test/resources/common/resource-dummy-dependency-filter-querydsl.xml
    M model/model-impl/testng-unit.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java

  Log Message:
  -----------
  MID-6780: Added unit test with resource using query language

Signed-off-by: Tony Tkacik <tonydamage at gmail.com>


  Commit: ba67478e82c023d50ff38a6a91475d20307d42c9
      https://github.com/Evolveum/midpoint/commit/ba67478e82c023d50ff38a6a91475d20307d42c9
  Author: Tony Tkacik <tonydamage at gmail.com>
  Date:   2021-01-20 (Wed, 20 Jan 2021)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/query_3/SearchFilterType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java
    M infra/prism-impl/src/main/resources/xml/ns/public/query-3.xsd
    A infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/query/lang/TestQueryConverters.java
    A infra/prism-impl/src/test/resources/query/lang/filter-not-full-text.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-not-in-oid.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-type-user-none.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-user-and.xml
    A infra/prism-impl/src/test/resources/query/lang/filter-user-name.xml
    A model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/TestFilterResolverQueryDsl.java
    A model/model-impl/src/test/resources/common/resource-dummy-dependency-filter-querydsl.xml
    M model/model-impl/testng-unit.xml
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/PrismIdentifierGenerator.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/feature/query-xml'


Compare: https://github.com/Evolveum/midpoint/compare/20f8b1172248...ba67478e82c0


More information about the midPoint-svn mailing list