[midPoint-git] [Evolveum/midpoint] 018466: skip original filter if the previous filter is alr...
Lukas Skublik
noreply at github.com
Tue Jun 29 09:08:09 CEST 2021
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 018466fbb6cd793bc14bb47eddabb093ca18b7b2
https://github.com/Evolveum/midpoint/commit/018466fbb6cd793bc14bb47eddabb093ca18b7b2
Author: lskublik <lskublik at evolveum.com>
Date: 2021-06-29 (Tue, 29 Jun 2021)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/filter/MidpointAuthFilter.java
Log Message:
-----------
skip original filter if the previous filter is already commited (MID-7081)
Commit: 75452bccfb19158076492a84b751413a01c38510
https://github.com/Evolveum/midpoint/commit/75452bccfb19158076492a84b751413a01c38510
Author: lskublik <lskublik at evolveum.com>
Date: 2021-06-29 (Tue, 29 Jun 2021)
Changed paths:
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityPath.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityStateUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/CleanupActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/ResourceObjectClassSpecification.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/SyncTaskHelper.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateActivityExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportFromResourceTaskHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationActivityExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/recon/RemainingShadowsActivityExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityHandler.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/AbstractScanActivityExecution.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanActivityExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanActivityHandler.java
R model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanCompositeExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanPartialExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/simple/SimpleActivityExecution.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanActivityHandler.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/reporting/TestTaskReporting.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractResourceDummyInterruptedSync.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/DummyInterruptedSyncImpreciseResource.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/DummyInterruptedSyncResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestImportRecon.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTask.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanics.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTaskMechanicsMultithreaded.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestLiveSyncTasks.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestProgressReporting.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTask.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTaskMultiNode.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTaskMultithreaded.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTaskPartitioned.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTasks.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTasksMultiNode.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTasksMultithreaded.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestReconTasksPartitioned.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/AbstractResourceDummyInterruptedSync.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/DummyInterruptedSyncImpreciseResource.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/DummyInterruptedSyncResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestCleanupTask.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestLiveSyncTask.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestLiveSyncTaskMultithreaded.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestProgressReporting.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestReconTask.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestReconTaskMultiNode.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestTaskReporting.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/package-info.java
M model/model-intest/src/test/resources/reporting/resource-source.xml
R model/model-intest/src/test/resources/sync/resource-dummy-errors-source-precise.xml
R model/model-intest/src/test/resources/sync/resource-dummy-errors-target.xml
R model/model-intest/src/test/resources/sync/resource-dummy-interrupted-sync-imprecise.xml
R model/model-intest/src/test/resources/sync/resource-dummy-interrupted-sync.xml
R model/model-intest/src/test/resources/sync/resource-dummy-multi-changes.xml
R model/model-intest/src/test/resources/sync/resource-dummy-no-policy.xml
R model/model-intest/src/test/resources/sync/resource-dummy-xfer1-source.xml
R model/model-intest/src/test/resources/sync/resource-dummy-xfer1-target-deletable.xml
R model/model-intest/src/test/resources/sync/resource-dummy-xfer2-source.xml
R model/model-intest/src/test/resources/sync/resource-dummy-xfer2-target-not-deletable.xml
R model/model-intest/src/test/resources/sync/role-errors-target.xml
R model/model-intest/src/test/resources/sync/role-xfer1.xml
R model/model-intest/src/test/resources/sync/role-xfer2.xml
R model/model-intest/src/test/resources/sync/task-errors-precise-ignore-partial-stop-on-fatal.xml
R model/model-intest/src/test/resources/sync/task-errors-precise-ignore.xml
R model/model-intest/src/test/resources/sync/task-errors-precise-retry-later-max-4.xml
R model/model-intest/src/test/resources/sync/task-errors-precise-retry-later-on-any.xml
R model/model-intest/src/test/resources/sync/task-errors-precise-stop-on-any.xml
R model/model-intest/src/test/resources/sync/task-intsync-batched-imprecise.xml
R model/model-intest/src/test/resources/sync/task-intsync-batched.xml
R model/model-intest/src/test/resources/sync/task-intsync-dry-run-with-update.xml
R model/model-intest/src/test/resources/sync/task-intsync-dry-run.xml
R model/model-intest/src/test/resources/sync/task-intsync-error-imprecise.xml
R model/model-intest/src/test/resources/sync/task-intsync-error.xml
R model/model-intest/src/test/resources/sync/task-intsync-slow-model-imprecise.xml
R model/model-intest/src/test/resources/sync/task-intsync-slow-model.xml
R model/model-intest/src/test/resources/sync/task-intsync-slow-resource-imprecise.xml
R model/model-intest/src/test/resources/sync/task-intsync-slow-resource.xml
R model/model-intest/src/test/resources/sync/task-multi-changes.xml
R model/model-intest/src/test/resources/sync/task-no-policy.xml
R model/model-intest/src/test/resources/sync/task-xfer1.xml
R model/model-intest/src/test/resources/sync/task-xfer2.xml
A model/model-intest/src/test/resources/tasks/cleanup/task-cleanup-legacy.xml
A model/model-intest/src/test/resources/tasks/cleanup/task-cleanup.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-errors-source-precise.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-errors-target.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-interrupted-sync-imprecise.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-interrupted-sync.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-multi-changes.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-no-policy.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-xfer1-source.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-xfer1-target-deletable.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-xfer2-source.xml
A model/model-intest/src/test/resources/tasks/livesync/resource-dummy-xfer2-target-not-deletable.xml
A model/model-intest/src/test/resources/tasks/livesync/role-errors-target.xml
A model/model-intest/src/test/resources/tasks/livesync/role-xfer1.xml
A model/model-intest/src/test/resources/tasks/livesync/role-xfer2.xml
A model/model-intest/src/test/resources/tasks/livesync/task-errors-precise-ignore-partial-stop-on-fatal.xml
A model/model-intest/src/test/resources/tasks/livesync/task-errors-precise-ignore.xml
A model/model-intest/src/test/resources/tasks/livesync/task-errors-precise-retry-later-max-4.xml
A model/model-intest/src/test/resources/tasks/livesync/task-errors-precise-retry-later-on-any.xml
A model/model-intest/src/test/resources/tasks/livesync/task-errors-precise-stop-on-any.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-batched-imprecise.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-batched.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-dry-run-with-update.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-dry-run.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-error-imprecise.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-error.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-slow-model-imprecise.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-slow-model.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-slow-resource-imprecise.xml
A model/model-intest/src/test/resources/tasks/livesync/task-intsync-slow-resource.xml
A model/model-intest/src/test/resources/tasks/livesync/task-multi-changes.xml
A model/model-intest/src/test/resources/tasks/livesync/task-no-policy.xml
A model/model-intest/src/test/resources/tasks/livesync/task-xfer1.xml
A model/model-intest/src/test/resources/tasks/livesync/task-xfer2.xml
A model/model-intest/src/test/resources/tasks/recon/task-reconciliation-multinode.xml
A model/model-intest/src/test/resources/tasks/recon/task-reconciliation.xml
R model/model-intest/src/test/resources/tasks/task-cleanup-legacy.xml
R model/model-intest/src/test/resources/tasks/task-cleanup.xml
M model/model-intest/testng-db-specific.xml
M model/model-intest/testng-integration-full.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
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/shadows/task/PropagationActivityHandler.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/Activity.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/ActivityStateDefinition.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/BeforeExecutionRunner.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/EmbeddedActivity.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/StandaloneActivity.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/execution/AbstractActivityExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/execution/AbstractCompositeActivityExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/execution/DelegatingActivityExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/execution/DistributingActivityExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/execution/LocalActivityExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/ActivityHandler.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/handlers/PureCompositeActivityHandler.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/ActivityBucketManagementStatistics.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/ActivityItemProcessingStatistics.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/ActivityProgress.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/ActivityState.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/ActivityStatistics.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/CurrentActivityState.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/LegacyProgressUpdater.java
A repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/OtherActivityState.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/activity/state/TreeStatePurger.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/AbstractSearchIterativeActivityExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/task/GenericTaskExecution.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/task/GenericTaskHandler.java
M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/task/TaskExecution.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestActivities.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/CommonMockActivityHelper.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/CompositeMockActivityHandler.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/MockClosingActivityExecution.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/MockComponentActivityExecution.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/composite/MockOpeningActivityExecution.java
M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/simple/SimpleMockActivityExecution.java
M repo/repo-common/src/test/resources/schema/extension.xsd
M repo/repo-sqale/sql/pgnew-repo.sql
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/ExtensionProcessor.java
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/delta/item/ArrayItemDeltaProcessor.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/EmbeddedContainerDeltaProcessor.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ExtensionContainerDeltaProcessor.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/ExtensionItemDeltaProcessor.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/PolyStringItemDeltaProcessor.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/RefItemDeltaProcessor.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/delta/item/SinglePathItemDeltaProcessor.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/jsonb/Jsonb.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/jsonb/JsonbException.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ExtensionMappingResolver.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleMappingMixin.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/MAccessCertificationWorkItem.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCampaignMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationWorkItem.java
A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationWorkItemMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/assignment/QAssignmentMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QObjectMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/shadow/QShadowMapping.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/ContainerTableUpdateContext.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/ExtensionUpdateContext.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/NestedContainerUpdateContext.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/RootUpdateContext.java
M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/update/SqaleUpdateContext.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/SqaleRepoBaseTest.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoAddDeleteObjectTest.java
M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoModifyObjectTest.java
M repo/repo-sqlbase/src/main/java/com/evolveum/midpoint/repo/sqlbase/SqlRepoContext.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/TaskAsserter.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholds.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsLiveSyncSimulateMultithreaded.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconFull.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulate.java
M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestThresholdsReconSimulateMultithreaded.java
M testing/story/src/test/resources/thresholds/task-opendj-livesync-full.xml
M testing/story/testng-integration.xml
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/origin/master'
Compare: https://github.com/Evolveum/midpoint/compare/beda57568cdf...75452bccfb19
More information about the midPoint-svn
mailing list