[midPoint-git] [Evolveum/midpoint] 7670f3: Fix handling of task.expectedTotal

mederly noreply at github.com
Tue Sep 7 11:18:36 CEST 2021


  Branch: refs/heads/master
  Home:   https://github.com/Evolveum/midpoint
  Commit: 7670f3c4921c23e5d6bb53e293856e708d8704b0
      https://github.com/Evolveum/midpoint/commit/7670f3c4921c23e5d6bb53e293856e708d8704b0
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-09-07 (Tue, 07 Sep 2021)

  Changed paths:
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ActivityProgressInformation.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/BucketingUtil.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/ItemsProgressInformation.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/sync/tasks/async/AsyncUpdateActivityExecutionSpecifics.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncActivityExecutionSpecifics.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ModelSearchBasedActivityExecution.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/scanner/ScanActivityExecutionSpecifics.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/tasks/TestProgressReporting.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicCollectionReportExportActivityExecutionSpecifics.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicDashboardReportExportActivityExecutionSpecifics.java
    M model/report-impl/src/main/java/com/evolveum/midpoint/report/impl/activity/ClassicReportImportActivityExecutionSpecifics.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/handlers/NoOpActivityHandler.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/task/ActivityReportingOptions.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/IterativeActivityExecution.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/PlainIterativeActivityExecution.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/PlainIterativeActivityExecutionSpecifics.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/SearchBasedActivityExecution.java
    M repo/repo-common/src/main/java/com/evolveum/midpoint/repo/common/task/work/segmentation/content/NumericIntervalBucketUtil.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/TestBucketingLive.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/TestWorkerTasks.java
    M repo/repo-common/src/test/java/com/evolveum/midpoint/repo/common/tasks/handlers/iterative/IterativeMockActivityExecutionSpecifics.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ActivityProgressInformationAsserter.java
    M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/ItemsProgressInformationAsserter.java
    M repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/execution/TaskThreadsDumper.java

  Log Message:
  -----------
  Fix handling of task.expectedTotal

The task-level expectedTotal property is no longer used for activity-
based tasks. Instead, progress.expectedTotal and
progress.expectedInCurrentBucket properties were introduced
in the activity state.

Their use is governed by the specific kind of the activity, and can be
tailored using reporting.itemCounting parameters.

The support for progress.expectedTotal is currently limited. For
example, distributed (coordinator-worker) activities do not provide
this functionality.

This resolves MID-7191.


  Commit: edac63719651a57ab5f421634f6b4ac0541f6f3b
      https://github.com/Evolveum/midpoint/commit/edac63719651a57ab5f421634f6b4ac0541f6f3b
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2021-09-07 (Tue, 07 Sep 2021)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleInducementPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/FocusApplicablePoliciesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/AssignmentHolderAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/AssignmentHolderBasicPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/AllAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/ConstructionAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/DirectAndIndirectAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/FocusMappingsAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/GdprAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/GenericAbstractRoleAssignmentPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/OrgAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/PolicyRuleAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/RoleAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/assignment/ServiceAssignmentsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/AllInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/ConstructionInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/FocusMappingsInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/InducedEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/OrgInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/PolicyRuleInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/RoleInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/assignmentholder/component/assignmentType/inducement/ServiceInducementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ApprovalCasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/CaseWorkitemsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ChildCasesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ManualCasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/OperationRequestCasePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusCasesPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusHistoryPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusProjectionsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/component/FocusTriggersPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/component/OrgMemberPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionParameterPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionSubreportPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/report/component/ReportCollectionViewPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceAccountsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceConnectorPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceDetailsTabPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceEntitlementsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceGenericsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceTasksPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/ActivitiesStatisticsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskActivityPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskControlFlowSpecificationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskDistributionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskEnvironmentalPerformancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskErrorsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskInternalPerformancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskMonitoringPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskOperationPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskPerformancePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskReportingPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskResultPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskSchedulePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskSubtasksAndThreadsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/task/component/TaskWorkPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/DelegatedToMePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserDelegationsPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserPersonasPanel.java
    M infra/schema/src/main/java/com/evolveum/midpoint/schema/GetOperationOptions.java
    M repo/repo-sqale/sql/pgnew-repo-audit.sql
    A repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/ReferenceNameResolver.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/mapping/SqaleTableMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/accesscert/QAccessCertificationCaseMapping.java
    M 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/cases/workitem/QCaseWorkItemMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/focus/QFocusMapping.java
    M repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/qmodel/object/QObjectMapping.java
    A repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoLookupTableTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSearchTest.java
    M repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/func/SqaleRepoSmokeTest.java
    R repo/repo-sqale/src/test/java/com/evolveum/midpoint/repo/sqale/specific/SqaleRepoLookupTableTest.java
    M testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestDelivery.java

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


Compare: https://github.com/Evolveum/midpoint/compare/9da9d318eb88...edac63719651


More information about the midPoint-svn mailing list