Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Mar 16, 2021 · 87825bc · 87825bc
2 parents 297e3ad + b70b48a
commit 87825bc
Show file tree

Hide file tree

Showing 49 changed files with 1,365 additions and 880 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
@@ -13,6 +13,7 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
 
+import com.evolveum.midpoint.schema.util.task.TaskTypeUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskExecutionStateType;
 
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
@@ -33,7 +34,6 @@
 import com.evolveum.midpoint.schema.GetOperationOptionsBuilder;
 import com.evolveum.midpoint.schema.SelectorOptions;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
-import com.evolveum.midpoint.task.api.TaskUtil;
 import com.evolveum.midpoint.web.application.AuthorizationAction;
 import com.evolveum.midpoint.web.application.PageDescriptor;
 import com.evolveum.midpoint.web.application.Url;
@@ -217,7 +217,7 @@ public Long getCompletionTimestamp(TaskType taskType) {
 
     private String createScheduledToRunAgain(IModel<SelectableBean<TaskType>> taskModel) {
         List<Object> localizationObjects = new ArrayList<>();
-        String key = TaskUtil.createScheduledToRunAgain(taskModel.getObject().getValue(), localizationObjects);
+        String key = TaskTypeUtil.createScheduledToRunAgain(taskModel.getObject().getValue(), localizationObjects);
 
         return PageBase.createStringResourceStatic(this, key, localizationObjects.isEmpty() ? null : localizationObjects.toArray())
                 .getString();

diff --git a/...ain/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java b/...ain/java/com/evolveum/midpoint/web/page/admin/server/TaskInternalPerformanceTabPanel.java
@@ -14,7 +14,7 @@
 
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.util.TaskTypeUtil;
+import com.evolveum.midpoint.schema.util.task.TaskOperationStatsUtil;
 import com.evolveum.midpoint.web.component.input.DropDownChoicePanel;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType;
 
@@ -122,7 +122,7 @@ private String getStatistics() {
             return "No operation statistics available";
         }
 
-        Integer iterations = TaskTypeUtil.getItemsProcessed(statistics);
+        Integer iterations = TaskOperationStatsUtil.getItemsProcessed(statistics);
         Integer seconds = getSeconds(task);
 
         AbstractStatisticsPrinter.Options options = new AbstractStatisticsPrinter.Options(formatModel.getObject(),

diff --git a/...c/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationStatisticsPanel.java b/...c/main/java/com/evolveum/midpoint/web/page/admin/server/TaskOperationStatisticsPanel.java
@@ -13,6 +13,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
+import com.evolveum.midpoint.schema.util.task.TaskOperationStatsUtil;
 import com.evolveum.midpoint.web.page.admin.server.dto.TaskIterativeProgressType;
 
 import org.apache.wicket.Component;
@@ -34,7 +35,6 @@
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.schema.constants.ObjectTypes;
-import com.evolveum.midpoint.schema.util.TaskTypeUtil;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
 import com.evolveum.midpoint.web.component.data.column.EnumPropertyColumn;
 import com.evolveum.midpoint.web.component.util.ListDataProvider;
@@ -65,7 +65,7 @@ private LoadableModel<OperationStatsType> createOperationStatsModel() {
            @Override
            protected OperationStatsType load() {
                PrismObject<TaskType> task = getModelObject().getObject();
-               return TaskTypeUtil.getOperationStatsFromTree(task.asObjectable(), getPrismContext());
+               return TaskOperationStatsUtil.getOperationStatsFromTree(task.asObjectable(), getPrismContext());
            }
        };
     }

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskSummaryPanel.java
@@ -12,7 +12,7 @@
 import com.evolveum.midpoint.prism.PrismProperty;
 import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
-import com.evolveum.midpoint.schema.util.TaskTypeUtil;
+import com.evolveum.midpoint.schema.util.task.TaskOperationStatsUtil;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.component.ObjectSummaryPanel;
@@ -202,7 +202,7 @@ protected IModel<String> getTitle2Model() {
             @Override
             public String getObject() {
                 TaskType taskType = getModelObject();
-                String lastSuccess = TaskTypeUtil.getLastSuccessObjectName(taskType);
+                String lastSuccess = TaskOperationStatsUtil.getLastSuccessObjectName(taskType);
                 if (lastSuccess != null) {
                     return createStringResource("TaskSummaryPanel.lastProcessed", lastSuccess).getString();
                 } else {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/TaskTablePanel.java
@@ -10,6 +10,8 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
+import com.evolveum.midpoint.schema.util.task.TaskOperationStatsUtil;
+import com.evolveum.midpoint.schema.util.task.TaskProgressUtil;
 import com.evolveum.midpoint.web.component.data.column.AjaxLinkPanel;
 import com.evolveum.midpoint.web.page.admin.server.dto.TaskDtoExecutionState;
 
@@ -44,8 +46,7 @@
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
-import com.evolveum.midpoint.schema.util.TaskTypeUtil;
-import com.evolveum.midpoint.schema.util.TaskWorkStateTypeUtil;
+import com.evolveum.midpoint.schema.util.task.TaskWorkStateUtil;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.task.api.TaskManager;
@@ -276,7 +277,7 @@ private AbstractExportableColumn<SelectableBean<TaskType>, String> createProgres
 
             @Override
             public void populateItem(Item<ICellPopulator<SelectableBean<TaskType>>> cellItem, String componentId, final IModel<SelectableBean<TaskType>> rowModel) {
-                if (!TaskTypeUtil.isPartitionedMaster(rowModel.getObject().getValue())) {
+                if (!TaskWorkStateUtil.isPartitionedMaster(rowModel.getObject().getValue())) {
                     cellItem.add(new Label(componentId,
                             (IModel<Object>) () -> getProgressDescription(rowModel.getObject())));
                 } else {
@@ -305,7 +306,7 @@ private AbstractColumn<SelectableBean<TaskType>, String> createErrorsColumn() {
             @Override
             public void populateItem(Item<ICellPopulator<SelectableBean<TaskType>>> cellItem, String componentId, IModel<SelectableBean<TaskType>> rowModel) {
                 TaskType task = rowModel.getObject().getValue();
-                cellItem.add(new Label(componentId, new Model<>(TaskTypeUtil.getItemsProcessedWithFailureFromTree(task, getPrismContext()))));
+                cellItem.add(new Label(componentId, new Model<>(TaskOperationStatsUtil.getItemsProcessedWithFailureFromTree(task, getPrismContext()))));
             }
         };
     }
@@ -320,7 +321,7 @@ private String getProgressDescription(SelectableBean<TaskType> task) {
     }
 
     private String getRealProgressDescription(SelectableBean<TaskType> task) {
-        if (TaskTypeUtil.isWorkStateHolder(task.getValue())) {
+        if (TaskWorkStateUtil.isWorkStateHolder(task.getValue())) {
             return getBucketedTaskProgressDescription(task.getValue());
         } else {
             return getPlainTaskProgressDescription(task.getValue());
@@ -342,25 +343,11 @@ private Integer getExpectedBuckets(TaskType taskType) {
     }
 
     private Integer getCompleteBuckets(TaskType taskType) {
-        return TaskWorkStateTypeUtil.getCompleteBucketsNumber(taskType);
+        return TaskWorkStateUtil.getCompleteBucketsNumber(taskType);
     }
 
     private String getPlainTaskProgressDescription(TaskType taskType) {
-        Long currentProgress = taskType.getProgress();
-        if (currentProgress == null && taskType.getExpectedTotal() == null) {
-            return "";      // the task handler probably does not report progress at all
-        } else {
-            StringBuilder sb = new StringBuilder();
-            if (currentProgress != null) {
-                sb.append(currentProgress);
-            } else {
-                sb.append("0");
-            }
-            if (taskType.getExpectedTotal() != null) {
-                sb.append("/").append(taskType.getExpectedTotal());
-            }
-            return sb.toString();
-        }
+        return TaskProgressUtil.getPlainTaskProgressDescription(taskType);
     }
 
     private Long getStalledSince(TaskType taskType) {
@@ -932,7 +919,7 @@ private static boolean isCoordinator(IModel<?> rowModel, boolean isHeader) {
             return false;
         }
         TaskType task = getTask((IModel<SelectableBean<TaskType>>) rowModel, isHeader);
-        return task != null && TaskTypeUtil.isCoordinator(task);
+        return task != null && TaskWorkStateUtil.isCoordinator(task);
     }
 
     // must be static, otherwise JVM crashes (probably because of some wicket serialization issues)
@@ -942,7 +929,7 @@ private static boolean isManageableTreeRoot(IModel<?> rowModel, boolean isHeader
             return false;
         }
         TaskType task = getTask((IModel<SelectableBean<TaskType>>) rowModel, isHeader);
-        return task != null && TaskTypeUtil.isManageableTreeRoot(task);
+        return task != null && TaskWorkStateUtil.isManageableTreeRoot(task);
     }
 
     @SuppressWarnings("BooleanMethodIsAlwaysInverted")

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/TaskOperationUtils.java
@@ -14,7 +14,7 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.result.OperationResultStatus;
 import com.evolveum.midpoint.schema.util.ObjectTypeUtil;
-import com.evolveum.midpoint.schema.util.TaskTypeUtil;
+import com.evolveum.midpoint.schema.util.task.TaskWorkStateUtil;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.exception.CommunicationException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
@@ -148,14 +148,14 @@ public static OperationResult runNowPerformed(List<String> oids, PageBase pageBa
     @NotNull
     private static List<TaskType> getPlainTasks(List<TaskType> selectedTasks) {
         return selectedTasks.stream()
-                .filter(task -> !TaskTypeUtil.isManageableTreeRoot(task))
+                .filter(task -> !TaskWorkStateUtil.isManageableTreeRoot(task))
                 .collect(Collectors.toList());
     }
 
     @NotNull
     private static List<TaskType> getTreeRoots(List<TaskType> selectedTasks) {
         return selectedTasks.stream()
-                .filter(TaskTypeUtil::isManageableTreeRoot)
+                .filter(TaskWorkStateUtil::isManageableTreeRoot)
                 .collect(Collectors.toList());
     }
 }
diff --git a/...chema/src/main/java/com/evolveum/midpoint/schema/statistics/IterationItemInformation.java b/...chema/src/main/java/com/evolveum/midpoint/schema/statistics/IterationItemInformation.java
@@ -11,6 +11,7 @@
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.PrismObjectDefinition;
 import com.evolveum.midpoint.prism.polystring.PolyString;
+import com.evolveum.midpoint.schema.util.task.TaskOperationStatsUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 
@@ -42,14 +43,14 @@ public IterationItemInformation(PrismObject<? extends ObjectType> object) {
 
     public IterationItemInformation(PrismObject<? extends ObjectType> object, PrismContext prismContext) {
         this.objectName = PolyString.getOrig(object.getName());
-        this.objectDisplayName = StatisticsUtil.getDisplayName(object);
+        this.objectDisplayName = TaskOperationStatsUtil.getDisplayName(object);
         this.objectType = determineTypeName(object, prismContext);
         this.objectOid = object.getOid();
     }
 
     private QName determineTypeName(PrismObject<? extends ObjectType> object, PrismContext prismContext) {
         if (prismContext != null) {
-            return StatisticsUtil.getObjectType(object.asObjectable(), prismContext);
+            return TaskOperationStatsUtil.getObjectType(object.asObjectable(), prismContext);
         } else {
             PrismObjectDefinition<? extends ObjectType> definition = object.getDefinition();
             return definition != null ? definition.getTypeName() : null;
@@ -58,7 +59,7 @@ private QName determineTypeName(PrismObject<? extends ObjectType> object, PrismC
 
     public IterationItemInformation(ShadowType shadow) {
         this(PolyString.getOrig(shadow.getName()),
-                StatisticsUtil.getDisplayName(shadow.asPrismObject()),
+                TaskOperationStatsUtil.getDisplayName(shadow.asPrismObject()),
                 ShadowType.COMPLEX_TYPE, shadow.getOid());
     }
 

diff --git a/...a/schema/src/main/java/com/evolveum/midpoint/schema/util/TaskPartitioningInformation.java b/...a/schema/src/main/java/com/evolveum/midpoint/schema/util/TaskPartitioningInformation.java