added merger identifiers based for existing merger implementations

Evolveum · Apr 16, 2024 · 593e8c8 · 593e8c8
1 parent 212439f
commit 593e8c8
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/MidPointPrismContextFactory.java
@@ -101,18 +101,6 @@ private ItemMergerFactory buildItemMergerFactory() {
                 AssignmentType.class,
                 m -> new AssignmentMerger(m));
 
-        // todo this entry is incorrect since naturalKey is probably only "identifier" item (which is already defined
-        //  in XSD in parent type UserInterfaceFeatureType, however for 4.8 both identifier and path were used.
-        //  This should be reviewed and fixed in 4.9
-        factory.registerMergerSupplier(
-                "VirtualContainersSpecificationType",
-                VirtualContainersSpecificationType.class,
-                m -> new GenericItemMerger(
-                        m,
-                        DefaultNaturalKeyImpl.of(
-                                VirtualContainersSpecificationType.F_IDENTIFIER,
-                                VirtualContainersSpecificationType.F_PATH)));
-
         // todo entries below this should be removed and should be handled by annotations in xsd,
         //  natural keys should be reviewed and most probably changed
         factory.registerMergerSupplier(
@@ -141,10 +129,10 @@ private ItemMergerFactory buildItemMergerFactory() {
                 ScriptLanguageExpressionProfileType.class,
                 m -> new GenericItemMerger(
                         m, DefaultNaturalKeyImpl.of(ScriptLanguageExpressionProfileType.F_LANGUAGE)));
-        factory.registerMergerSupplier(
-                "ClassLoggerLevelOverrideType",
-                ClassLoggerLevelOverrideType.class,
-                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(ClassLoggerLevelOverrideType.F_LOGGER)));
+//        factory.registerMergerSupplier(
+//                "ClassLoggerLevelOverrideType",
+//                ClassLoggerLevelOverrideType.class,
+//                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(ClassLoggerLevelOverrideType.F_LOGGER)));
         factory.registerMergerSupplier(
                 "ObjectSelectorType",
                 ObjectSelectorType.class,

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -2897,6 +2897,7 @@
                     <a:version>4.0</a:version>
                     <a:operation>removed</a:operation>
                 </a:schemaMigration>
+                <a:merger>AssignmentType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -3305,6 +3306,7 @@
             <xsd:appinfo>
                 <a:container/>
                 <a:since>4.0</a:since>
+                <a:merger>AssignmentRelationType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
            <xsd:sequence>
@@ -8043,6 +8045,7 @@
             </xsd:documentation>
             <xsd:appinfo>
                 <a:container/>
+                <a:merger>ObjectSelectorType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -12101,6 +12104,7 @@
                 <a:container/>
                 <a:since>4.0</a:since>
                 <a:experimental>true</a:experimental>
+                <a:merger>ExpressionEvaluatorProfileType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -12160,6 +12164,7 @@
                 <a:container/>
                 <a:since>4.0</a:since>
                 <a:experimental>true</a:experimental>
+                <a:merger>ScriptLanguageExpressionProfileType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -14536,6 +14541,7 @@
             <xsd:appinfo>
                 <a:container/>
                 <a:displayName>ItemConstraintType.details</a:displayName>
+                <a:merger>ItemConstraintType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -17226,6 +17232,7 @@
             </xsd:documentation>
             <xsd:appinfo>
                 <a:container>true</a:container>
+                <a:merger>SelectorQualifiedGetOptionType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-gui-3.xsd
@@ -1188,6 +1188,7 @@
             <xsd:appinfo>
                 <a:container/>
                 <a:since>3.7</a:since>
+                <a:merger>AbstractObjectTypeConfigurationType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -1232,6 +1233,7 @@
                 <a:since>4.4</a:since>
                 <a:displayName>GuiObjectDetailsPageType.details</a:displayName>
                 <a:experimental/>
+                <a:merger>GuiShadowDetailsPageType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>
@@ -1276,6 +1278,7 @@
                 <a:since>4.6</a:since>
                 <a:displayName>GuiResourceDetailsPageType.details</a:displayName>
                 <a:experimental/>
+                <a:merger>GuiResourceDetailsPageType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>
@@ -1304,6 +1307,7 @@
                 <a:container/>
                 <a:since>3.7</a:since>
                 <a:displayName>GuiObjectDetailsPageType.details</a:displayName>
+                <a:merger>GuiObjectDetailsPageType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>
@@ -1491,8 +1495,6 @@
                 <a:container/>
                 <a:since>4.0</a:since>
                 <a:naturalKey>identifier</a:naturalKey>
-                <!-- todo this is incorrect -->
-                <!--<a:naturalKey>path</a:naturalKey>-->
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>
@@ -2650,6 +2652,7 @@
             <xsd:appinfo>
                 <a:container/>
                 <a:since>4.2</a:since>
+                <a:merger>SearchItemType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -3423,6 +3426,7 @@
                 <a:since>4.0</a:since>
                 <a:displayName>DashboardWidgetDataFieldType.details</a:displayName>
                 <a:experimental>true</a:experimental>
+                <a:merger>DashboardWidgetDataFieldType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -3506,6 +3510,7 @@
                 <a:since>4.0</a:since>
                 <a:displayName>DashboardWidgetVariationType.details</a:displayName>
                 <a:experimental>true</a:experimental>
+                <a:merger>DashboardWidgetVariationType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
@@ -3786,6 +3791,7 @@
             <xsd:appinfo>
                 <a:container/>
                 <a:since>4.0</a:since>
+                <a:merger>CollectionSpecificationType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-policy-3.xsd
@@ -724,6 +724,7 @@
             <xsd:appinfo>
                 <a:container/>
                 <a:since>3.5</a:since>
+                <a:merger>ModificationPolicyConstraintType</a:merger>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>