Add support for ObjectSetType.archetypeRef

(Plus minor code improvements.)
Evolveum · Aug 2, 2023 · 4fe443f · 4fe443f
1 parent 0ea99f6
commit 4fe443f
Show file tree

Hide file tree

Showing 22 changed files with 170 additions and 69 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
@@ -731,4 +731,13 @@ public static ObjectPaging convertToObjectPaging(PagingType pagingType, PrismCon
         query.setFilter(filter);
         return query;
     }
+
+    @SuppressWarnings("ReplaceNullCheck")
+    public static @NotNull ObjectQuery emptyIfNull(ObjectQuery objectQuery) {
+        if (objectQuery != null) {
+            return objectQuery;
+        } else {
+            return PrismContext.get().queryFactory().createQuery();
+        }
+    }
 }
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ObjectSetUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/ObjectSetUtil.java
@@ -45,7 +45,7 @@ public static void applyDefaultObjectType(@NotNull ObjectSetType set, @NotNull Q
         }
     }
 
-    public static @NotNull ObjectSetType fromConfiguration(ObjectSetType configured) {
+    public static @NotNull ObjectSetType emptyIfNull(ObjectSetType configured) {
         return configured != null ? configured : new ObjectSetType();
     }
 

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
@@ -131,12 +131,12 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
 
         MyWorkDefinition(@NotNull WorkDefinitionBean source) {
             var typedDefinition = (ShadowRefreshWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getShadows());
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getShadows());
             ObjectSetUtil.assumeObjectType(objects, ShadowType.COMPLEX_TYPE);
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 

diff --git a/...m/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java b/...m/evolveum/midpoint/model/impl/integrity/objects/ObjectIntegrityCheckActivityHandler.java
@@ -170,12 +170,12 @@ static class MyWorkDefinition extends AbstractWorkDefinition implements ObjectSe
 
         MyWorkDefinition(@NotNull WorkDefinitionBean source) {
             var typedDefinition = (ObjectIntegrityCheckWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
             histogramColumns = MoreObjects.firstNonNull(typedDefinition.getHistogramColumns(), DEFAULT_HISTOGRAM_COLUMNS);
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 

diff --git a/...om/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java b/...om/evolveum/midpoint/model/impl/integrity/shadows/ShadowIntegrityCheckWorkDefinition.java
@@ -46,7 +46,7 @@ public class ShadowIntegrityCheckWorkDefinition extends AbstractWorkDefinition i
 
     ShadowIntegrityCheckWorkDefinition(@NotNull WorkDefinitionBean source) {
         var typedDefinition = (ShadowIntegrityCheckWorkDefinitionType) source.getBean();
-        shadows = ObjectSetUtil.fromConfiguration(typedDefinition.getShadows());
+        shadows = ObjectSetUtil.emptyIfNull(typedDefinition.getShadows());
         ObjectSetUtil.assumeObjectType(shadows, ShadowType.COMPLEX_TYPE);
         aspectsToDiagnose = new HashSet<>(typedDefinition.getDiagnose());
         aspectsToFix = new HashSet<>(typedDefinition.getFix());
@@ -57,7 +57,7 @@ public class ShadowIntegrityCheckWorkDefinition extends AbstractWorkDefinition i
     }
 
     @Override
-    public ObjectSetType getObjectSetSpecification() {
+    public @NotNull ObjectSetType getObjectSetSpecification() {
         return shadows;
     }
 

diff --git a/...in/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java b/...in/java/com/evolveum/midpoint/model/impl/scripting/IterativeScriptingActivityHandler.java
@@ -120,12 +120,12 @@ private void executeScriptOnObject(ObjectType object, RunningTask workerTask, Op
 
     public static class MyWorkDefinition extends AbstractWorkDefinition implements ObjectSetSpecificationProvider {
 
-        private final ObjectSetType objects;
-        private final ExecuteScriptType scriptExecutionRequest;
+        @NotNull private final ObjectSetType objects;
+        @NotNull private final ExecuteScriptType scriptExecutionRequest;
 
         MyWorkDefinition(@NotNull WorkDefinitionBean source) {
             var typedDefinition = (IterativeScriptingWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
             scriptExecutionRequest = typedDefinition.getScriptExecutionRequest();
             argCheck(scriptExecutionRequest != null, "No script execution request provided");
             argCheck(scriptExecutionRequest.getScriptingExpression() != null, "No scripting expression provided");
@@ -135,11 +135,11 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 
-        public ExecuteScriptType getScriptExecutionRequest() {
+        public @NotNull ExecuteScriptType getScriptExecutionRequest() {
             return scriptExecutionRequest;
         }
 

diff --git a/...el-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java b/...el-impl/src/main/java/com/evolveum/midpoint/model/impl/tasks/DeletionActivityHandler.java
@@ -256,7 +256,7 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
 
         MyWorkDefinition(@NotNull WorkDefinitionBean source) {
             var typedDefinition = (DeletionWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects()); // Can contain search options.
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects()); // Can contain search options.
             executionOptions = Objects.requireNonNullElseGet(
                     fromModelExecutionOptionsType(typedDefinition.getExecutionOptions()),
                     ModelExecuteOptions::create);
@@ -265,7 +265,7 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 

diff --git a/.../java/com/evolveum/midpoint/model/impl/tasks/IterativeChangeExecutionActivityHandler.java b/.../java/com/evolveum/midpoint/model/impl/tasks/IterativeChangeExecutionActivityHandler.java
@@ -13,6 +13,7 @@
 import javax.xml.namespace.QName;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.model.api.ModelExecuteOptions;
@@ -131,28 +132,28 @@ public boolean processItem(@NotNull ObjectType object,
 
     public static class MyWorkDefinition extends AbstractWorkDefinition implements ObjectSetSpecificationProvider {
 
-        private final ObjectSetType objects;
-        private final ObjectDeltaType delta;
-        private final ModelExecuteOptions executionOptions;
+        @NotNull private final ObjectSetType objects;
+        @NotNull private final ObjectDeltaType delta;
+        @Nullable private final ModelExecuteOptions executionOptions;
 
         MyWorkDefinition(@NotNull WorkDefinitionBean source) {
             var typedDefinition = (IterativeChangeExecutionWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
             delta = typedDefinition.getDelta();
             argCheck(delta != null, "No delta specified");
             executionOptions = fromModelExecutionOptionsType(typedDefinition.getExecutionOptions());
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 
-        public ObjectDeltaType getDelta() {
+        public @NotNull ObjectDeltaType getDelta() {
             return delta;
         }
 
-        ModelExecuteOptions getExecutionOptions() {
+        @Nullable ModelExecuteOptions getExecutionOptions() {
             return executionOptions;
         }
 

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
@@ -123,15 +123,15 @@ public static class MyWorkDefinition extends AbstractWorkDefinition implements O
 
         MyWorkDefinition(WorkDefinitionBean source) {
             var typedDefinition = (RecomputationWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
             ObjectSetUtil.applyDefaultObjectType(objects, DEFAULT_OBJECT_TYPE_FOR_NEW_SPEC);
             executionOptions = java.util.Objects.requireNonNullElseGet(
                     fromModelExecutionOptionsType(typedDefinition.getExecutionOptions()),
                     () -> ModelExecuteOptions.create().reconcile()); // Default for compatibility reasons
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 

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
@@ -116,15 +116,15 @@ private void reindexObject(ObjectType object, OperationResult result) throws Com
 
     public static class MyWorkDefinition extends AbstractWorkDefinition implements ObjectSetSpecificationProvider {
 
-        private final ObjectSetType objects;
+        @NotNull private final ObjectSetType objects;
 
         MyWorkDefinition(@NotNull WorkDefinitionBean source) {
             var typedDefinition = (ReindexingWorkDefinitionType) source.getBean();
-            objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+            objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
         }
 
         @Override
-        public ObjectSetType getObjectSetSpecification() {
+        public @NotNull ObjectSetType getObjectSetSpecification() {
             return objects;
         }
 

diff --git a/...c/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingWorkDefinition.java b/...c/main/java/com/evolveum/midpoint/model/impl/tasks/cluster/AutoScalingWorkDefinition.java
@@ -22,15 +22,15 @@
 
 public class AutoScalingWorkDefinition extends AbstractWorkDefinition implements ObjectSetSpecificationProvider {
 
-    private final ObjectSetType tasks;
+    @NotNull private final ObjectSetType tasks;
     private final Duration minReconciliationInterval;
     private final Duration maxReconciliationInterval;
     private final boolean skipInitialReconciliation;
 
     AutoScalingWorkDefinition(@NotNull WorkDefinitionBean source) {
         var typedDefinition = (ActivityAutoScalingWorkDefinitionType) source.getBean();
 
-        tasks = ObjectSetUtil.fromConfiguration(typedDefinition.getTasks());
+        tasks = ObjectSetUtil.emptyIfNull(typedDefinition.getTasks());
         ObjectSetUtil.assumeObjectType(tasks, TaskType.COMPLEX_TYPE);
 
         minReconciliationInterval = typedDefinition.getMinReconciliationInterval();
@@ -39,7 +39,7 @@ public class AutoScalingWorkDefinition extends AbstractWorkDefinition implements
     }
 
     @Override
-    public ObjectSetType getObjectSetSpecification() {
+    public @NotNull ObjectSetType getObjectSetSpecification() {
         return tasks;
     }
 

diff --git a/.../java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanWorkDefinition.java b/.../java/com/evolveum/midpoint/model/impl/tasks/scanner/FocusValidityScanWorkDefinition.java
@@ -28,7 +28,7 @@ public class FocusValidityScanWorkDefinition extends AbstractWorkDefinition impl
     FocusValidityScanWorkDefinition(@NotNull WorkDefinitionBean source) {
         var typedDefinition = (FocusValidityScanWorkDefinitionType) source.getBean();
 
-        objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+        objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
         // We allow user to use types above FocusType if he needs to check e.g. assignments validity
         // on AssignmentHolderType objects.
         ObjectSetUtil.applyDefaultObjectType(objects, FocusType.COMPLEX_TYPE);
@@ -38,7 +38,7 @@ public class FocusValidityScanWorkDefinition extends AbstractWorkDefinition impl
     }
 
     @Override
-    public ObjectSetType getObjectSetSpecification() {
+    public @NotNull ObjectSetType getObjectSetSpecification() {
         return objects;
     }
 

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
@@ -24,11 +24,11 @@ public class TriggerScanWorkDefinition extends AbstractWorkDefinition implements
 
     TriggerScanWorkDefinition(@NotNull WorkDefinitionBean source) {
         var typedDefinition = (TriggerScanWorkDefinitionType) source.getBean();
-        objects = ObjectSetUtil.fromConfiguration(typedDefinition.getObjects());
+        objects = ObjectSetUtil.emptyIfNull(typedDefinition.getObjects());
     }
 
     @Override
-    public ObjectSetType getObjectSetSpecification() {
+    public @NotNull ObjectSetType getObjectSetSpecification() {
         return objects;
     }
 

diff --git a/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java b/...model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/TestRecomputeTask.java
@@ -11,6 +11,9 @@
 
 import java.io.File;
 import java.util.List;
+
+import com.evolveum.midpoint.test.*;
+
 import jakarta.xml.bind.JAXBElement;
 
 import org.springframework.test.annotation.DirtiesContext;
@@ -34,9 +37,6 @@
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.test.DummyResourceContoller;
-import com.evolveum.midpoint.test.IntegrationTestTools;
-import com.evolveum.midpoint.test.TestResource;
 import com.evolveum.midpoint.test.util.TestUtil;
 import com.evolveum.midpoint.util.exception.*;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -67,6 +67,12 @@ public class TestRecomputeTask extends AbstractInitializedModelIntegrationTest {
     private static final TestResource<ArchetypeType> ARCHETYPE_TASK_RECOMPUTATION =
             new TestResource<>(TEST_DIR, "archetype-task-recomputation.xml", "77615e4c-b82e-4b3a-b265-5487a6ac016b");
 
+    private static final TestObject<ArchetypeType> ARCHETYPE_EMPLOYEE = TestObject.file(
+            TEST_DIR, "archetype-employee.xml", "e3a9a6b9-17f6-4239-b935-6f88a655b9d7");
+
+    private static final TestTask TASK_USER_RECOMPUTE_EMPLOYEES = new TestTask(
+            TEST_DIR, "task-user-recompute-employees.xml", "fb1b8d77-d2a6-4bc3-b771-ba2a4159dae7");
+
     @Override
     public void initSystem(Task initTask, OperationResult initResult) throws Exception {
         super.initSystem(initTask, initResult);
@@ -78,6 +84,10 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti
         }
 
         assumeAssignmentPolicy(AssignmentPolicyEnforcementType.FULL);
+
+        initTestObjects(initTask, initResult,
+                ARCHETYPE_EMPLOYEE,
+                TASK_USER_RECOMPUTE_EMPLOYEES);
     }
 
     @Test
@@ -458,4 +468,31 @@ public void test130RecomputeLight() throws Exception {
 
         assertUsers(7);
     }
+
+    @Test
+    public void test140RecomputeEmployees() throws CommonException {
+        var task = getTestTask();
+        var result = task.getResult();
+
+        given("an employee exists");
+        UserType user = new UserType()
+                .name(getTestNameShort())
+                .assignment(ARCHETYPE_EMPLOYEE.assignmentTo());
+        addObject(user, task, result);
+
+        try {
+            when("recomputing employees");
+            TASK_USER_RECOMPUTE_EMPLOYEES.rerun(result);
+
+            then("only the employee is recomputed");
+            TASK_USER_RECOMPUTE_EMPLOYEES.assertAfter()
+                    .display()
+                    .assertProgress(1)
+                    .rootActivityState()
+                    .itemProcessingStatistics()
+                    .assertLastSuccessObjectName(user.getName().getOrig());
+        } finally {
+            deleteObject(UserType.class, user.getOid());
+        }
+    }
 }
diff --git a/model/model-intest/src/test/resources/sync/task-user-recompute-employees.xml b/model/model-intest/src/test/resources/sync/task-user-recompute-employees.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2010-2017 Evolveum and contributors
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<task xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
+        oid="fb1b8d77-d2a6-4bc3-b771-ba2a4159dae7">
+    <name>user-recompute-employees</name>
+    <assignment>
+        <targetRef oid="77615e4c-b82e-4b3a-b265-5487a6ac016b" type="ArchetypeType"/>
+    </assignment>
+    <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
+    <executionState>closed</executionState> <!-- run on demand -->
+    <activity>
+        <work>
+            <recomputation>
+                <objects>
+                    <type>UserType</type>
+                    <archetypeRef oid="e3a9a6b9-17f6-4239-b935-6f88a655b9d7"/>
+                </objects>
+            </recomputation>
+        </work>
+    </activity>
+</task>
diff --git a/.../com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationWorkDefinition.java b/.../com/evolveum/midpoint/provisioning/impl/shadows/task/MultiPropagationWorkDefinition.java
@@ -20,19 +20,16 @@
 
 public class MultiPropagationWorkDefinition extends AbstractWorkDefinition implements ObjectSetSpecificationProvider {
 
-    private final ObjectSetType resources;
+    @NotNull private final ObjectSetType resources;
 
     MultiPropagationWorkDefinition(@NotNull WorkDefinitionBean source) {
-        resources = ((MultiPropagationWorkDefinitionType) source.getBean()).getResources();
+        resources = ObjectSetUtil.emptyIfNull(
+                ((MultiPropagationWorkDefinitionType) source.getBean()).getResources());
         ObjectSetUtil.assumeObjectType(resources, ResourceType.COMPLEX_TYPE);
     }
 
-    public ObjectSetType getResources() {
-        return resources;
-    }
-
     @Override
-    public ObjectSetType getObjectSetSpecification() {
+    public @NotNull ObjectSetType getObjectSetSpecification() {
         return resources;
     }