Fix propagation activities

Propagation and Multi-propagation activities were not correctly defined in schema, preventing their use with new-style "activity" configuration style. This resolves MID-7539.
Evolveum · Jan 25, 2022 · aa3a388 · aa3a388
1 parent 1b2ebd4
commit aa3a388
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 20 deletions.
diff --git a/.../schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/WorkDefinitionUtil.java b/.../schema/src/main/java/com/evolveum/midpoint/schema/util/task/work/WorkDefinitionUtil.java
@@ -56,6 +56,8 @@ public static List<WorkDefinitionWrapper> getWorkDefinitions(WorkDefinitionsType
         addTypedParameters(values, definitions.getShadowIntegrityCheck());
         addTypedParameters(values, definitions.getActivityAutoScaling());
         addTypedParameters(values, definitions.getNoOp());
+        addTypedParameters(values, definitions.getPropagation());
+        addTypedParameters(values, definitions.getMultiPropagation());
 
         addUntypedParameters(values, definitions.getExtension());
         return values;

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-tasks-3.xsd
@@ -1966,6 +1966,20 @@
                         </xsd:documentation>
                     </xsd:annotation>
                 </xsd:element>
+                <xsd:element name="propagation" type="tns:PropagationWorkDefinitionType" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Executes the propagation activity.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:element>
+                <xsd:element name="multiPropagation" type="tns:MultiPropagationWorkDefinitionType" minOccurs="0">
+                    <xsd:annotation>
+                        <xsd:documentation>
+                            Executes the multi-propagation activity.
+                        </xsd:documentation>
+                    </xsd:annotation>
+                </xsd:element>
             </xsd:choice>
             <xsd:element name="extension" type="tns:ExtensionType" minOccurs="0">
                 <xsd:annotation>

diff --git a/model/model-intest/src/test/resources/manual/task-propagation-manual-grouping.xml b/model/model-intest/src/test/resources/manual/task-propagation-manual-grouping.xml
@@ -7,16 +7,18 @@
   -->
 
 <task oid="b84a2c46-f0b5-11e7-baff-d35c2f14080f"
-    xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+    xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3">
 
     <name>Propagation: Grouping Manual Resource</name>
 
     <taskIdentifier>b84a2c46-f0b5-11e7-baff-d35c2f14080f</taskIdentifier>
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
     <executionState>runnable</executionState>
-
-    <handlerUri>http://midpoint.evolveum.com/xml/ns/public/provisioning/task/propagation/handler-3</handlerUri>
-    <objectRef oid="a6e228a0-f092-11e7-b5bc-579f2e54e15c" type="ResourceType"/> <!-- Manual Grouping -->
+    <activity>
+        <work>
+            <propagation>
+                <resourceRef oid="a6e228a0-f092-11e7-b5bc-579f2e54e15c"/> <!-- Manual Grouping -->
+            </propagation>
+        </work>
+    </activity>
 </task>
diff --git a/model/model-intest/src/test/resources/manual/task-propagation-multi.xml b/model/model-intest/src/test/resources/manual/task-propagation-multi.xml
@@ -10,25 +10,28 @@
 
 <task oid="01db4542-f224-11e7-8833-bbe6634814e7"
     xmlns="http://midpoint.evolveum.com/xml/ns/public/common/common-3"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3"
-    xmlns:rext="http://midpoint.evolveum.com/xml/ns/samples/resource">
+    xmlns:q="http://prism.evolveum.com/xml/ns/public/query-3">
 
     <name>Propagation: propagated provisioning resources</name>
 
     <taskIdentifier>01db4542-f224-11e7-8833-bbe6634814e7</taskIdentifier>
     <ownerRef oid="00000000-0000-0000-0000-000000000002"/>
     <executionState>runnable</executionState>
 
-    <handlerUri>http://midpoint.evolveum.com/xml/ns/public/provisioning/task/propagation/multi-handler-3</handlerUri>
-    <objectRef type="ResourceType">
-        <filter>
-            <q:equal>
-                <q:path>extension/provisioning</q:path>
-                <q:value>propagated</q:value>
-            </q:equal>
-        </filter>
-        <resolutionTime>run</resolutionTime>
-    </objectRef>
+    <activity>
+        <work>
+            <multiPropagation>
+                <resources>
+                    <query>
+                        <q:filter>
+                            <q:equal>
+                                <q:path>extension/provisioning</q:path>
+                                <q:value>propagated</q:value>
+                            </q:equal>
+                        </q:filter>
+                    </query>
+                </resources>
+            </multiPropagation>
+        </work>
+    </activity>
 </task>