renamed NaturalKey to NaturalKeyDefinition

Evolveum · Apr 17, 2024 · b14769f · b14769f
1 parent feb09df
commit b14769f
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 39 deletions.
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ItemWrapperImpl.java
@@ -18,7 +18,7 @@
 import com.evolveum.midpoint.prism.annotation.ItemDiagramSpecification;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 import com.evolveum.midpoint.schema.result.OperationResult;
 
 import com.evolveum.midpoint.util.exception.CommonException;
@@ -557,7 +557,7 @@ public DisplayHint getDisplayHint() {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return getItemDefinition().getNaturalKeyInstance();
     }
 

diff --git a/.../src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java b/.../src/main/java/com/evolveum/midpoint/gui/impl/prism/wrapper/ValueMetadataWrapperImpl.java
@@ -15,7 +15,7 @@
 import com.evolveum.midpoint.prism.delta.ContainerDelta;
 import com.evolveum.midpoint.prism.delta.ItemDelta;
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 import com.evolveum.midpoint.prism.path.ItemName;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -124,7 +124,7 @@ public DisplayHint getDisplayHint() {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return metadataValueWrapper.getNaturalKeyInstance();
     }
 

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
@@ -11,7 +11,7 @@
 import java.util.Collections;
 import javax.xml.XMLConstants;
 
-import com.evolveum.midpoint.prism.impl.key.DefaultNaturalKeyImpl;
+import com.evolveum.midpoint.prism.impl.key.DefaultNaturalKeyDefinitionImpl;
 import com.evolveum.midpoint.prism.impl.GenericItemMerger;
 import com.evolveum.midpoint.schema.merger.assignment.AssignmentMerger;
 import com.evolveum.midpoint.schema.merger.objdef.LimitationsMerger;
@@ -108,12 +108,12 @@ private ItemMergerFactory buildItemMergerFactory() {
                 SearchItemType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(
+                        DefaultNaturalKeyDefinitionImpl.of(
                                 SearchItemType.F_PATH, SearchItemType.F_FILTER, SearchItemType.F_FILTER_EXPRESSION)));
         factory.registerMergerSupplier(
                 "GuiObjectDetailsPageType",
                 GuiObjectDetailsPageType.class,
-                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(GuiObjectDetailsPageType.F_TYPE)));
+                m -> new GenericItemMerger(m, DefaultNaturalKeyDefinitionImpl.of(GuiObjectDetailsPageType.F_TYPE)));
 //        factory.registerMergerSupplier(
 //                "GuiResourceDetailsPageType",
 //                GuiResourceDetailsPageType.class,
@@ -123,12 +123,12 @@ private ItemMergerFactory buildItemMergerFactory() {
         factory.registerMergerSupplier(
                 "ExpressionEvaluatorProfileType",
                 ExpressionEvaluatorProfileType.class,
-                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(ExpressionEvaluatorProfileType.F_TYPE)));
+                m -> new GenericItemMerger(m, DefaultNaturalKeyDefinitionImpl.of(ExpressionEvaluatorProfileType.F_TYPE)));
         factory.registerMergerSupplier(
                 "ScriptLanguageExpressionProfileType",
                 ScriptLanguageExpressionProfileType.class,
                 m -> new GenericItemMerger(
-                        m, DefaultNaturalKeyImpl.of(ScriptLanguageExpressionProfileType.F_LANGUAGE)));
+                        m, DefaultNaturalKeyDefinitionImpl.of(ScriptLanguageExpressionProfileType.F_LANGUAGE)));
 //        factory.registerMergerSupplier(
 //                "ClassLoggerLevelOverrideType",
 //                ClassLoggerLevelOverrideType.class,
@@ -138,29 +138,29 @@ private ItemMergerFactory buildItemMergerFactory() {
                 ObjectSelectorType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(ObjectSelectorType.F_NAME, ObjectSelectorType.F_TYPE)));
+                        DefaultNaturalKeyDefinitionImpl.of(ObjectSelectorType.F_NAME, ObjectSelectorType.F_TYPE)));
         factory.registerMergerSupplier(
                 "CollectionSpecificationType",
                 CollectionSpecificationType.class,
                 m -> new GenericItemMerger(
-                        m, DefaultNaturalKeyImpl.of(CollectionSpecificationType.F_INTERPRETATION)));
+                        m, DefaultNaturalKeyDefinitionImpl.of(CollectionSpecificationType.F_INTERPRETATION)));
         factory.registerMergerSupplier(
                 "DashboardWidgetDataFieldType",
                 DashboardWidgetDataFieldType.class,
-                m -> new GenericItemMerger(m, DefaultNaturalKeyImpl.of(DashboardWidgetDataFieldType.F_FIELD_TYPE)));
+                m -> new GenericItemMerger(m, DefaultNaturalKeyDefinitionImpl.of(DashboardWidgetDataFieldType.F_FIELD_TYPE)));
         factory.registerMergerSupplier(
                 "DashboardWidgetVariationType",
                 DashboardWidgetVariationType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(
+                        DefaultNaturalKeyDefinitionImpl.of(
                                 DashboardWidgetVariationType.F_DISPLAY, DashboardWidgetVariationType.F_CONDITION)));
         factory.registerMergerSupplier(
                 "AssignmentRelationType",
                 AssignmentRelationType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(
+                        DefaultNaturalKeyDefinitionImpl.of(
                                 AssignmentRelationType.F_HOLDER_TYPE,
                                 AssignmentRelationType.F_RELATION,
                                 AssignmentRelationType.F_HOLDER_ARCHETYPE_REF)));
@@ -169,20 +169,20 @@ private ItemMergerFactory buildItemMergerFactory() {
                 ModificationPolicyConstraintType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(
+                        DefaultNaturalKeyDefinitionImpl.of(
                                 ModificationPolicyConstraintType.F_NAME,
                                 ModificationPolicyConstraintType.F_OPERATION)));
         factory.registerMergerSupplier(
                 "AbstractObjectTypeConfigurationType",
                 AbstractObjectTypeConfigurationType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(AbstractObjectTypeConfigurationType.F_TYPE)));
+                        DefaultNaturalKeyDefinitionImpl.of(AbstractObjectTypeConfigurationType.F_TYPE)));
         factory.registerMergerSupplier(
                 "GuiShadowDetailsPageType",
                 GuiShadowDetailsPageType.class,
                 m -> new GenericItemMerger(
-                        m, DefaultNaturalKeyImpl.of(
+                        m, DefaultNaturalKeyDefinitionImpl.of(
                         GuiShadowDetailsPageType.F_TYPE,
                         GuiShadowDetailsPageType.F_RESOURCE_REF,
                         GuiShadowDetailsPageType.F_KIND,
@@ -192,7 +192,7 @@ private ItemMergerFactory buildItemMergerFactory() {
                 SelectorQualifiedGetOptionType.class,
                 m -> new GenericItemMerger(
                         m,
-                        DefaultNaturalKeyImpl.of(
+                        DefaultNaturalKeyDefinitionImpl.of(
                                 SelectorQualifiedGetOptionType.F_OPTIONS,
                                 SelectorQualifiedGetOptionType.F_SELECTOR)));
 

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/IgnoreSourceItemMerger.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/IgnoreSourceItemMerger.java
@@ -7,9 +7,8 @@
 
 package com.evolveum.midpoint.schema.merger;
 
-import com.evolveum.midpoint.prism.MergeStrategy;
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -25,7 +24,7 @@ public class IgnoreSourceItemMerger implements ItemMerger {
     public static final IgnoreSourceItemMerger INSTANCE = new IgnoreSourceItemMerger();
 
     @Override
-    public NaturalKey getNaturalKey() {
+    public NaturalKeyDefinition getNaturalKey() {
         throw new UnsupportedOperationException("IgnoreSourceItemMerger does not support natural keys");
     }
 

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/RequiredItemMerger.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/RequiredItemMerger.java
@@ -10,7 +10,7 @@
 import static com.evolveum.midpoint.util.MiscUtil.configCheck;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -27,7 +27,7 @@ public class RequiredItemMerger implements ItemMerger {
     public static final RequiredItemMerger INSTANCE = new RequiredItemMerger();
 
     @Override
-    public NaturalKey getNaturalKey() {
+    public NaturalKeyDefinition getNaturalKey() {
         throw new UnsupportedOperationException("IgnoreSourceItemMerger does not support natural keys");
     }
 

diff --git a/...ain/java/com/evolveum/midpoint/schema/processor/AbstractResourceObjectDefinitionImpl.java b/...ain/java/com/evolveum/midpoint/schema/processor/AbstractResourceObjectDefinitionImpl.java
@@ -15,7 +15,7 @@
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
 
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -660,7 +660,7 @@ public DisplayHint getDisplayHint() {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return null;
     }
 

diff --git a/...a/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java b/...a/src/main/java/com/evolveum/midpoint/schema/processor/CompositeObjectDefinitionImpl.java
@@ -12,7 +12,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -838,7 +838,7 @@ public boolean isDefaultFor(@NotNull ShadowKindType kind) {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return structuralDefinition.getNaturalKeyInstance();
     }
 }
diff --git a/...com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java b/...com/evolveum/midpoint/schema/processor/NormalizationAwareResourceAttributeDefinition.java
@@ -11,7 +11,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.NotNull;
@@ -309,7 +309,7 @@ public DisplayHint getDisplayHint() {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return originalDefinition.getNaturalKeyInstance();
     }
 

diff --git a/...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java b/...src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java
@@ -17,7 +17,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -378,7 +378,7 @@ public boolean isEmphasized() {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return rawDefinition.getNaturalKeyInstance();
     }
 

diff --git a/...ema/src/main/java/com/evolveum/midpoint/schema/processor/ShadowAssociationDefinition.java b/...ema/src/main/java/com/evolveum/midpoint/schema/processor/ShadowAssociationDefinition.java
@@ -15,7 +15,7 @@
 import javax.xml.namespace.QName;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 
 import com.google.common.base.Preconditions;
 import org.jetbrains.annotations.NotNull;
@@ -256,7 +256,7 @@ public Integer getDisplayOrder() {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         return null;
     }
 

diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/validator/ObjectValidator.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/validator/ObjectValidator.java
@@ -13,7 +13,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.prism.*;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.util.LocalizableMessage;
 import com.evolveum.midpoint.util.SingleLocalizableMessage;
@@ -212,7 +212,7 @@ private void visitContainer(PrismContainer<?> container, ValidationResult result
             return;
         }
 
-        NaturalKey naturalKey = def.getNaturalKeyInstance();
+        NaturalKeyDefinition naturalKey = def.getNaturalKeyInstance();
 
         for (PrismContainerValue<?> value : container.getValues()) {
             for (QName key : constituents) {

diff --git a/...n/java/com/evolveum/midpoint/model/impl/schema/transform/TransformableItemDefinition.java b/...n/java/com/evolveum/midpoint/model/impl/schema/transform/TransformableItemDefinition.java
@@ -11,8 +11,8 @@
 import com.evolveum.midpoint.prism.*;
 
 import com.evolveum.midpoint.prism.delta.ItemMerger;
-import com.evolveum.midpoint.prism.impl.key.NaturalKeyImpl;
-import com.evolveum.midpoint.prism.key.NaturalKey;
+import com.evolveum.midpoint.prism.impl.key.NaturalKeyDefinitionImpl;
+import com.evolveum.midpoint.prism.key.NaturalKeyDefinition;
 import com.evolveum.midpoint.schema.util.MiscSchemaUtil;
 
 import org.jetbrains.annotations.NotNull;
@@ -212,9 +212,9 @@ public void setMergerIdentifier(String mergerIdentifier) {
     }
 
     @Override
-    public @Nullable NaturalKey getNaturalKeyInstance() {
+    public @Nullable NaturalKeyDefinition getNaturalKeyInstance() {
         // todo how to create proper NaturalKey instance, implementations could be outside of prism api/impl
-        return naturalKeyConstituents != null && !naturalKeyConstituents.isEmpty() ? NaturalKeyImpl.of(naturalKeyConstituents) : null;
+        return naturalKeyConstituents != null && !naturalKeyConstituents.isEmpty() ? NaturalKeyDefinitionImpl.of(naturalKeyConstituents) : null;
     }
 
     @Nullable