Refactor propertyConstraints -> itemConstraints

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -14886,10 +14886,23 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-            <xsd:element name="propertyConstraint" type="tns:PropertyConstraintType" minOccurs="0" maxOccurs="unbounded">
+            <xsd:element name="itemConstraint" type="tns:ItemConstraintType" minOccurs="0" maxOccurs="unbounded">
                 <xsd:annotation>
+                    <xsd:appinfo>
+                        <a:displayName>ObjectPolicyConfigurationType.itemConstraint</a:displayName>
+                        <a:since>4.1</a:since>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
+            <xsd:element name="propertyConstraint" type="tns:ItemConstraintType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        DEPRECATED. Use itemConstraint instead.
+                    </xsd:documentation>
                     <xsd:appinfo>
                         <a:displayName>ObjectPolicyConfigurationType.propertyConstraint</a:displayName>
+                        <a:deprecated>true</a:deprecated>
+                        <a:deprecatedSince>4.1</a:deprecatedSince>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
@@ -19477,21 +19490,21 @@
         </xsd:restriction>
     </xsd:simpleType>
 
-    <xsd:complexType name="PropertyConstraintType">
+    <xsd:complexType name="ItemConstraintType">
         <xsd:annotation>
             <xsd:documentation>
                 Definition of a property constraints.
             </xsd:documentation>
             <xsd:appinfo>
                 <a:container/>
-                <a:displayName>PropertyConstraintType.details</a:displayName>
+                <a:displayName>ItemConstraintType.details</a:displayName>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
             <xsd:element name="path" type="t:ItemPathType" minOccurs="1" maxOccurs="1">
                 <xsd:annotation>
                     <xsd:appinfo>
-                        <a:displayName>PropertyConstraintType.path</a:displayName>
+                        <a:displayName>ItemConstraintType.path</a:displayName>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>

model/model-common/src/main/java/com/evolveum/midpoint/model/common/ArchetypeManager.java

@@ -169,8 +169,14 @@ private ArchetypePolicyType merge(ArchetypePolicyType archetypePolicy, ObjectPol
         if (archetypePolicy.getObjectTemplateRef() == null && objectPolicy.getObjectTemplateRef() != null) {
             resultPolicy.setObjectTemplateRef(objectPolicy.getObjectTemplateRef().clone());
         }
+        if (archetypePolicy.getItemConstraint().isEmpty()) {
+            for (ItemConstraintType objItemConstraint : objectPolicy.getItemConstraint()) {
+                resultPolicy.getItemConstraint().add(objItemConstraint.clone());
+            }
+        }
+        // Deprecated
         if (archetypePolicy.getPropertyConstraint().isEmpty()) {
-            for (PropertyConstraintType objPropertyConstraint : objectPolicy.getPropertyConstraint()) {
+            for (ItemConstraintType objPropertyConstraint : objectPolicy.getPropertyConstraint()) {
                 resultPolicy.getPropertyConstraint().add(objPropertyConstraint.clone());
             }
         }