Add test for "limited import" using new task spec

Plus a couple of minor fixes/cleanups regarding activity work definitions.
Evolveum · Aug 19, 2021 · 3be0953 · 3be0953
1 parent 9d91471
commit 3be0953
Show file tree

Hide file tree

Showing 18 changed files with 153 additions and 81 deletions.
diff --git a/...hema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ResourceObjectSetUtil.java b/...hema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ResourceObjectSetUtil.java
@@ -56,4 +56,8 @@ public static void setDefaultQueryApplicationMode(ResourceObjectSetType set, Res
             set.setQueryApplication(mode);
         }
     }
+
+    public static @NotNull ResourceObjectSetType fromConfiguration(ResourceObjectSetType resourceObjects) {
+         return resourceObjects != null ? resourceObjects : new ResourceObjectSetType(PrismContext.get());
+    }
 }
diff --git a/.../src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.java b/.../src/main/java/com/evolveum/midpoint/model/impl/cleanup/ShadowRefreshActivityHandler.java
@@ -16,7 +16,6 @@
 import com.evolveum.midpoint.model.impl.tasks.ModelActivityHandler;
 import com.evolveum.midpoint.model.impl.tasks.ModelSearchBasedActivityExecution;
 import com.evolveum.midpoint.model.impl.tasks.scanner.ScanActivityExecutionSpecifics;
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.repo.common.activity.ActivityExecutionException;
@@ -143,8 +142,7 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
             } else {
                 ShadowRefreshWorkDefinitionType typedDefinition = (ShadowRefreshWorkDefinitionType)
                         ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                objects = typedDefinition.getShadows() != null ?
-                        typedDefinition.getShadows() : new ObjectSetType(PrismContext.get());
+                objects = ObjectSetUtil.fromConfiguration(typedDefinition.getShadows());
             }
             ObjectSetUtil.assumeObjectType(objects, ShadowType.COMPLEX_TYPE);
         }

diff --git a/...m/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java b/...m/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java
@@ -13,7 +13,6 @@
 
 import com.evolveum.midpoint.model.api.ModelPublicConstants;
 import com.evolveum.midpoint.model.impl.tasks.simple.SimpleActivityHandler;
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.repo.common.activity.ActivityExecutionException;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
@@ -191,8 +190,7 @@ static class MyWorkDefinition extends AbstractWorkDefinition implements ObjectSe
             } else {
                 ObjectIntegrityCheckWorkDefinitionType typedDefinition = (ObjectIntegrityCheckWorkDefinitionType)
                         ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                objects = typedDefinition.getObjects() != null ?
-                        typedDefinition.getObjects() : new ObjectSetType(PrismContext.get());
+                objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
                 histogramColumns = MoreObjects.firstNonNull(typedDefinition.getHistogramColumns(), DEFAULT_HISTOGRAM_COLUMNS);
             }
         }

diff --git a/...om/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java b/...om/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java
@@ -15,11 +15,8 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
-
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.ObjectSetSpecificationProvider;
@@ -32,6 +29,7 @@
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectSetType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowIntegrityAspectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowIntegrityCheckWorkDefinitionType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 
 public class ShadowIntegrityCheckWorkDefinition extends AbstractWorkDefinition implements ObjectSetSpecificationProvider {
 
@@ -66,8 +64,7 @@ public class ShadowIntegrityCheckWorkDefinition extends AbstractWorkDefinition i
         } else {
             ShadowIntegrityCheckWorkDefinitionType typedDefinition = (ShadowIntegrityCheckWorkDefinitionType)
                     ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
-            shadows = typedDefinition.getShadows() != null ?
-                    typedDefinition.getShadows() : new ObjectSetType(PrismContext.get());
+            shadows = ObjectSetUtil.fromConfiguration(typedDefinition.getShadows());
             duplicateShadowsResolverNullable = typedDefinition.getDuplicateShadowsResolver();
             checkDuplicatesOnPrimaryIdentifiersOnlyNullable = typedDefinition.isCheckDuplicatesOnPrimaryIdentifiersOnly();
         }

diff --git a/...in/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java b/...in/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java
@@ -143,7 +143,7 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
             } else {
                 IterativeScriptingWorkDefinitionType typedDefinition = (IterativeScriptingWorkDefinitionType)
                         ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                objects = typedDefinition.getObjects();
+                objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
                 scriptExecutionRequest = typedDefinition.getScriptExecutionRequest();
             }
             argCheck(scriptExecutionRequest != null, "No script execution request provided");

diff --git a/...ain/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateWorkDefinition.java b/...ain/java/com/evolveum/midpoint/model/impl/sync/tasks/async/AsyncUpdateWorkDefinition.java
@@ -7,7 +7,6 @@
 
 package com.evolveum.midpoint.model.impl.sync.tasks.async;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.ResourceObjectSetSpecificationProvider;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
@@ -30,8 +29,7 @@ public class AsyncUpdateWorkDefinition extends AbstractWorkDefinition implements
         } else {
             AsyncUpdateWorkDefinitionType typedDefinition = (AsyncUpdateWorkDefinitionType)
                     ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-            resourceObjects = typedDefinition.getUpdatedResourceObjects() != null ?
-                    typedDefinition.getUpdatedResourceObjects() : new ResourceObjectSetType(PrismContext.get());
+            resourceObjects = ResourceObjectSetUtil.fromConfiguration(typedDefinition.getUpdatedResourceObjects());
         }
         ResourceObjectSetUtil.removeQuery(resourceObjects);
     }

diff --git a/...l/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java b/...l/src/main/java/com/evolveum/midpoint/model/impl/sync/tasks/imp/ImportWorkDefinition.java
@@ -7,13 +7,12 @@
 
 package com.evolveum.midpoint.model.impl.sync.tasks.imp;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.ResourceObjectSetSpecificationProvider;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.work.ResourceObjectSetUtil;
 import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionSource;
-import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper;
+import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper.TypedWorkDefinitionWrapper;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ImportWorkDefinitionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectSetType;
@@ -31,9 +30,8 @@ public class ImportWorkDefinition extends AbstractWorkDefinition implements Reso
             resourceObjects = ResourceObjectSetUtil.fromLegacySource((LegacyWorkDefinitionSource) source);
         } else {
             ImportWorkDefinitionType typedDefinition = (ImportWorkDefinitionType)
-                    ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-            resourceObjects = typedDefinition.getResourceObjects() != null ?
-                    typedDefinition.getResourceObjects() : new ResourceObjectSetType(PrismContext.get());
+                    ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
+            resourceObjects = ResourceObjectSetUtil.fromConfiguration(typedDefinition.getResourceObjects());
         }
         ResourceObjectSetUtil.setDefaultQueryApplicationMode(resourceObjects, REPLACE);
     }

diff --git a/.../java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationWorkDefinition.java b/.../java/com/evolveum/midpoint/model/impl/sync/tasks/recon/ReconciliationWorkDefinition.java
@@ -9,18 +9,16 @@
 
 import static com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectSetQueryApplicationModeType.APPEND;
 
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ReconciliationWorkDefinitionType;
-
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.ResourceObjectSetSpecificationProvider;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.work.ResourceObjectSetUtil;
 import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionSource;
-import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper;
+import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper.TypedWorkDefinitionWrapper;
 import com.evolveum.midpoint.util.DebugUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ReconciliationWorkDefinitionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectSetType;
 
 public class ReconciliationWorkDefinition extends AbstractWorkDefinition implements ResourceObjectSetSpecificationProvider {
@@ -32,9 +30,8 @@ public class ReconciliationWorkDefinition extends AbstractWorkDefinition impleme
             resourceObjects = ResourceObjectSetUtil.fromLegacySource((LegacyWorkDefinitionSource) source);
         } else {
             ReconciliationWorkDefinitionType typedDefinition = (ReconciliationWorkDefinitionType)
-                    ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-            resourceObjects = typedDefinition.getResourceObjects() != null ?
-                    typedDefinition.getResourceObjects() : new ResourceObjectSetType(PrismContext.get());
+                    ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
+            resourceObjects = ResourceObjectSetUtil.fromConfiguration(typedDefinition.getResourceObjects());
         }
         ResourceObjectSetUtil.setDefaultQueryApplicationMode(resourceObjects, APPEND);
     }

diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncWorkDefinition.java b/...rc/main/java/com/evolveum/midpoint/model/impl/sync/tasks/sync/LiveSyncWorkDefinition.java
@@ -9,15 +9,15 @@
 
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 
+import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper.TypedWorkDefinitionWrapper;
+
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.ResourceObjectSetSpecificationProvider;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.work.ResourceObjectSetUtil;
 import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionSource;
-import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.LiveSyncWorkDefinitionType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectSetType;
@@ -39,9 +39,8 @@ public class LiveSyncWorkDefinition extends AbstractWorkDefinition implements Re
                             Boolean.class);
         } else {
             LiveSyncWorkDefinitionType typedDefinition = (LiveSyncWorkDefinitionType)
-                    ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-            resourceObjects = typedDefinition.getResourceObjects() != null ?
-                    typedDefinition.getResourceObjects() : new ResourceObjectSetType(PrismContext.get());
+                    ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
+            resourceObjects = ResourceObjectSetUtil.fromConfiguration(typedDefinition.getResourceObjects());
             batchSize = typedDefinition.getBatchSize();
             updateLiveSyncTokenInDryRunRaw = typedDefinition.isUpdateLiveSyncTokenInDryRun();
         }

diff --git a/.../src/main/java/com/evolveum/midpoint/model/impl/tasks/ChangeExecutionActivityHandler.java b/.../src/main/java/com/evolveum/midpoint/model/impl/tasks/ChangeExecutionActivityHandler.java
@@ -155,7 +155,7 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
             } else {
                 ChangeExecutionWorkDefinitionType typedDefinition = (ChangeExecutionWorkDefinitionType)
                         ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                objects = typedDefinition.getObjects();
+                objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
                 delta = typedDefinition.getDelta();
                 executionOptions = fromModelExecutionOptionsType(typedDefinition.getExecutionOptions());
             }

diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/tasks/RecomputationActivityHandler.java
@@ -10,8 +10,6 @@
 
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.repo.common.task.BaseSearchBasedExecutionSpecificsImpl;
-
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
@@ -26,14 +24,15 @@
 import com.evolveum.midpoint.repo.common.activity.definition.ObjectSetSpecificationProvider;
 import com.evolveum.midpoint.repo.common.activity.definition.WorkDefinitionFactory.WorkDefinitionSupplier;
 import com.evolveum.midpoint.repo.common.task.ActivityReportingOptions;
+import com.evolveum.midpoint.repo.common.task.BaseSearchBasedExecutionSpecificsImpl;
 import com.evolveum.midpoint.repo.common.task.ItemProcessingRequest;
 import com.evolveum.midpoint.repo.common.task.SearchBasedActivityExecution;
 import com.evolveum.midpoint.repo.common.task.SearchBasedActivityExecution.SearchBasedSpecificsSupplier;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.work.ObjectSetUtil;
 import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionSource;
-import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper;
+import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper.TypedWorkDefinitionWrapper;
 import com.evolveum.midpoint.task.api.RunningTask;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.CommonException;
@@ -147,8 +146,8 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
                 ObjectSetUtil.applyDefaultObjectType(objects, DEFAULT_OBJECT_TYPE_FOR_LEGACY_SPEC);
             } else {
                 RecomputationWorkDefinitionType typedDefinition = (RecomputationWorkDefinitionType)
-                        ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                objects = typedDefinition.getObjects();
+                        ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
+                objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
                 executionOptions = fromModelExecutionOptionsType(typedDefinition.getExecutionOptions());
                 ObjectSetUtil.applyDefaultObjectType(objects, DEFAULT_OBJECT_TYPE_FOR_NEW_SPEC);
             }

diff --git a/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ReindexActivityHandler.java b/...del-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ReindexActivityHandler.java
@@ -10,8 +10,6 @@
 
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.repo.common.task.BaseSearchBasedExecutionSpecificsImpl;
-
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Component;
 
@@ -24,14 +22,15 @@
 import com.evolveum.midpoint.repo.common.activity.definition.ObjectSetSpecificationProvider;
 import com.evolveum.midpoint.repo.common.activity.definition.WorkDefinitionFactory.WorkDefinitionSupplier;
 import com.evolveum.midpoint.repo.common.task.ActivityReportingOptions;
+import com.evolveum.midpoint.repo.common.task.BaseSearchBasedExecutionSpecificsImpl;
 import com.evolveum.midpoint.repo.common.task.ItemProcessingRequest;
 import com.evolveum.midpoint.repo.common.task.SearchBasedActivityExecution;
 import com.evolveum.midpoint.repo.common.task.SearchBasedActivityExecution.SearchBasedSpecificsSupplier;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
 import com.evolveum.midpoint.schema.util.task.work.ObjectSetUtil;
 import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionSource;
-import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper;
+import com.evolveum.midpoint.schema.util.task.work.WorkDefinitionWrapper.TypedWorkDefinitionWrapper;
 import com.evolveum.midpoint.task.api.RunningTask;
 import com.evolveum.midpoint.util.DebugUtil;
 import com.evolveum.midpoint.util.exception.CommonException;
@@ -134,8 +133,8 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
                 objects = ObjectSetUtil.fromLegacySource((LegacyWorkDefinitionSource) source);
             } else {
                 ReindexingWorkDefinitionType typedDefinition = (ReindexingWorkDefinitionType)
-                        ((WorkDefinitionWrapper.TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                objects = typedDefinition.getObjects();
+                        ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
+                objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
             }
         }
 

diff --git a/...pl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java b/...pl/src/main/java/com/evolveum/midpoint/model/impl/tasks/ShadowCleanupActivityHandler.java
@@ -195,7 +195,7 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements R
             } else {
                 ShadowCleanupWorkDefinitionType typedDefinition = (ShadowCleanupWorkDefinitionType)
                         ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
-                shadows = typedDefinition.getShadows();
+                shadows = ResourceObjectSetUtil.fromConfiguration(typedDefinition.getShadows());
                 interval = typedDefinition.getInterval();
             }
             ResourceObjectSetUtil.setDefaultQueryApplicationMode(shadows, APPEND); // "replace" would be very dangerous

diff --git a/...mpl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanWorkDefinition.java b/...mpl/src/main/java/com/evolveum/midpoint/model/impl/trigger/TriggerScanWorkDefinition.java
@@ -9,7 +9,6 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.repo.common.activity.definition.AbstractWorkDefinition;
 import com.evolveum.midpoint.repo.common.activity.definition.ObjectSetSpecificationProvider;
 import com.evolveum.midpoint.schema.util.task.work.LegacyWorkDefinitionSource;
@@ -31,8 +30,7 @@ public class TriggerScanWorkDefinition extends AbstractWorkDefinition implements
         } else {
             TriggerScanWorkDefinitionType typedDefinition = (TriggerScanWorkDefinitionType)
                     ((TypedWorkDefinitionWrapper) source).getTypedDefinition();
-            objects = typedDefinition.getObjects() != null ?
-                    typedDefinition.getObjects() : new ObjectSetType(PrismContext.get());
+            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
         }
     }