updated mergers/natural keys configuration

Evolveum · Apr 16, 2024 · 8f1e1ae · 8f1e1ae
1 parent 12926cb
commit 8f1e1ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 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
@@ -114,12 +114,12 @@ private ItemMergerFactory buildItemMergerFactory() {
                 "GuiObjectDetailsPageType",
                 GuiObjectDetailsPageType.class,
                 m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(GuiObjectDetailsPageType.F_TYPE)));
-        factory.registerMergerSupplier(
-                "GuiResourceDetailsPageType",
-                GuiResourceDetailsPageType.class,
-                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(
-                        GuiResourceDetailsPageType.F_TYPE,
-                        GuiResourceDetailsPageType.F_CONNECTOR_REF)));
+//        factory.registerMergerSupplier(
+//                "GuiResourceDetailsPageType",
+//                GuiResourceDetailsPageType.class,
+//                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(
+//                        GuiResourceDetailsPageType.F_TYPE,
+//                        GuiResourceDetailsPageType.F_CONNECTOR_REF)));
         factory.registerMergerSupplier(
                 "ExpressionEvaluatorProfileType",
                 ExpressionEvaluatorProfileType.class,

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
@@ -1278,7 +1278,8 @@
                 <a:since>4.6</a:since>
                 <a:displayName>GuiResourceDetailsPageType.details</a:displayName>
                 <a:experimental/>
-                <a:merger>GuiResourceDetailsPageType</a:merger>
+                <a:naturalKey>type</a:naturalKey>
+                <a:naturalKey>connectorRef</a:naturalKey>
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:complexContent>