diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java index f844cd1bff4..aded7cb4246 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionPanel.java @@ -52,7 +52,7 @@ ID_INPUT, itemDefinitionAsStringModel, String.class, createAutoCompleteSettings( protected Iterator getChoices(String input) { List defsAsString = new ArrayList<>(); for (ItemDefinition def : listChoices(input).values()) { - defsAsString.add(def.getName().getLocalPart()); + defsAsString.add(def.getItemName().getLocalPart()); } return defsAsString.iterator(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionRenderer.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionRenderer.java index 1c43194231b..f11b4f75d9f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionRenderer.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/AutoCompleteItemDefinitionRenderer.java @@ -12,7 +12,7 @@ public class AutoCompleteItemDefinitionRenderer extends AbstractAutoCompleteRend @Override protected String getTextValue(ItemDefinition object) { - return object.getName().getLocalPart(); + return object.getItemName().getLocalPart(); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java index 4a3fd8c697b..fd19c5b78c4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathDto.java @@ -51,9 +51,9 @@ public ItemDefinition getItemDef() { public void setItemDef(ItemDefinition itemDef) { if (parentPath == null) { - this.path = itemDef.getName(); + this.path = itemDef.getItemName(); } else { - this.path = parentPath.toItemPath().append(itemDef.getName()); + this.path = parentPath.toItemPath().append(itemDef.getItemName()); } this.itemDef = itemDef; } @@ -71,12 +71,12 @@ public ItemPath toItemPath() { if (itemDef == null) { return path; } - this.path = itemDef.getName(); + this.path = itemDef.getItemName(); } else { if (itemDef == null) { return parentPath.toItemPath(); } - this.path = parentPath.toItemPath().append(itemDef.getName()); + this.path = parentPath.toItemPath().append(itemDef.getItemName()); } return path; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java index c6d5ce2536a..0337a17048b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/path/ItemPathSegmentPanel.java @@ -115,10 +115,10 @@ private void collectItems(Collection definitions, Stri } for (ItemDefinition def : definitions) { if (StringUtils.isBlank(input)) { - toSelect.put(def.getName().getLocalPart(), def); + toSelect.put(def.getItemName().getLocalPart(), def); } else { - if (def.getName().getLocalPart().startsWith(input)) { - toSelect.put(def.getName().getLocalPart(), def); + if (def.getItemName().getLocalPart().startsWith(input)) { + toSelect.put(def.getItemName().getLocalPart(), def); } } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/DropDownChoicePanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/DropDownChoicePanelFactory.java index dcefbb9c2df..1783d1018ec 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/DropDownChoicePanelFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/DropDownChoicePanelFactory.java @@ -59,7 +59,7 @@ public void register() { } @Override public boolean match(IW wrapper) { - return AssignmentType.F_FOCUS_TYPE.equals(wrapper.getName()) || DOMUtil.XSD_QNAME.equals(wrapper.getTypeName()); + return AssignmentType.F_FOCUS_TYPE.equals(wrapper.getItemName()) || DOMUtil.XSD_QNAME.equals(wrapper.getTypeName()); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java index 729de419226..448073c26f4 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/HeterogenousContainerWrapperFactory.java @@ -69,7 +69,7 @@ public class HeterogenousContainerWrapperFactory implem @Override public PrismContainerWrapper createWrapper(PrismContainerValueWrapper parent, ItemDefinition def, WrapperContext context) throws SchemaException { - ItemName name = def.getName(); + ItemName name = def.getItemName(); PrismContainer childItem = parent.getNewValue().findContainer(name); ItemStatus status = ItemStatus.NOT_CHANGED; @@ -99,7 +99,7 @@ public PrismContainerValueWrapper createValueWrapper(PrismContainerWrapper for (ItemDefinition def : value.getDefinition().getDefinitions()) { - Item childItem = value.findItem(def.getName()); + Item childItem = value.findItem(def.getItemName()); if (childItem == null && def instanceof PrismContainerDefinition) { LOGGER.trace("Skipping craeting wrapper for {}, only property and refernce wrappers are created for heterogenous containers."); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemPanelContext.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemPanelContext.java index a9b8adc3b02..0f2b019187d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemPanelContext.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemPanelContext.java @@ -66,7 +66,7 @@ public boolean isPropertyReadOnly() { } public ItemName getDefinitionName() { - return unwrapWrapperModel().getName(); + return unwrapWrapperModel().getItemName(); } public Component getParentComponent() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java index fdfc468ac35..6e3cb25b180 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ItemWrapperFactoryImpl.java @@ -59,7 +59,7 @@ public abstract class ItemWrapperFactoryImpl parent, ItemDefinition def, WrapperContext context) throws SchemaException { - ItemName name = def.getName(); + ItemName name = def.getItemName(); I childItem = null; @@ -180,7 +180,7 @@ private boolean skipCreateWrapper(ItemDefinition def, ItemStatus status, Wrap protected boolean canCreateWrapper(ItemDefinition def, ItemStatus status, WrapperContext context, boolean isEmptyValue) { if (!context.isCreateOperational() && def.isOperational()) { - LOGGER.trace("Skipping creating wrapper for {}, because it is operational.", def.getName()); + LOGGER.trace("Skipping creating wrapper for {}, because it is operational.", def.getItemName()); return false; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LockoutStatusPanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LockoutStatusPanelFactory.java index d4ae27598a7..72e5bb2be55 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LockoutStatusPanelFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LockoutStatusPanelFactory.java @@ -53,7 +53,7 @@ public Integer getOrder() { @Override public boolean match(IW wrapper) { - return ActivationType.F_LOCKOUT_STATUS.equals(wrapper.getName()); + return ActivationType.F_LOCKOUT_STATUS.equals(wrapper.getItemName()); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingAppenderWrapperFactoryImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingAppenderWrapperFactoryImpl.java index c547b339c60..5f484a87f75 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingAppenderWrapperFactoryImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingAppenderWrapperFactoryImpl.java @@ -45,7 +45,7 @@ public class LoggingAppenderWrapperFactoryImpl extends PrismPropertyWrapperFa @Override public boolean match(ItemDefinition def) { return def instanceof PrismPropertyDefinition - && QNameUtil.match(def.getName(), ClassLoggerConfigurationType.F_APPENDER); + && QNameUtil.match(def.getItemName(), ClassLoggerConfigurationType.F_APPENDER); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingPackageWrapperFactoryImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingPackageWrapperFactoryImpl.java index f3a0a1799a3..67515c82b3e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingPackageWrapperFactoryImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/LoggingPackageWrapperFactoryImpl.java @@ -49,7 +49,7 @@ public class LoggingPackageWrapperFactoryImpl extends PrismPropertyWrapperFac @Override public boolean match(ItemDefinition def) { return def instanceof PrismPropertyDefinition - && QNameUtil.match(def.getName(), ClassLoggerConfigurationType.F_PACKAGE); + && QNameUtil.match(def.getItemName(), ClassLoggerConfigurationType.F_PACKAGE); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ProfilingLoggerLevelPanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ProfilingLoggerLevelPanelFactory.java index f3b31571609..c1d035d43e5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ProfilingLoggerLevelPanelFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ProfilingLoggerLevelPanelFactory.java @@ -62,7 +62,7 @@ public void register() { @Override public boolean match(IW wrapper) { - return wrapper.getParent() instanceof ProfilingClassLoggerContainerValueWrapperImpl && wrapper.getName().equals(ClassLoggerConfigurationType.F_LEVEL); + return wrapper.getParent() instanceof ProfilingClassLoggerContainerValueWrapperImpl && wrapper.getItemName().equals(ClassLoggerConfigurationType.F_LEVEL); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ShadowAssociationWrapperFactoryImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ShadowAssociationWrapperFactoryImpl.java index e5a8e08bce0..eaa181def10 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ShadowAssociationWrapperFactoryImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/ShadowAssociationWrapperFactoryImpl.java @@ -99,7 +99,7 @@ public int getOrder() { @Override public PrismContainerWrapper createWrapper(PrismContainerValueWrapper parent, ItemDefinition def, WrapperContext context) throws SchemaException { - ItemName name = def.getName(); + ItemName name = def.getItemName(); PrismContainer childItem = (PrismContainer) parent.getNewValue().findItem(name); ItemStatus status = ItemStatus.NOT_CHANGED; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TextAreaPanelFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TextAreaPanelFactory.java index 8bcb988f0c5..f8713737ba6 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TextAreaPanelFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/factory/TextAreaPanelFactory.java @@ -47,7 +47,7 @@ public void register() { @Override public boolean match(IW wrapper) { - return FocusType.F_DESCRIPTION.equals(wrapper.getName()) || QueryType.COMPLEX_TYPE.equals(wrapper.getTypeName()); // || CleanupPoliciesType.COMPLEX_TYPE.equals(wrapper.getTypeName()); + return FocusType.F_DESCRIPTION.equals(wrapper.getItemName()) || QueryType.COMPLEX_TYPE.equals(wrapper.getTypeName()); // || CleanupPoliciesType.COMPLEX_TYPE.equals(wrapper.getTypeName()); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ContainersPopupDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ContainersPopupDto.java index b3ed987b3ac..648e24c748b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ContainersPopupDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ContainersPopupDto.java @@ -40,7 +40,7 @@ public String getDisplayName() { return def.getDisplayName(); } - return def.getName().getLocalPart(); + return def.getItemName().getLocalPart(); } public PrismContainerDefinition getDef() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java index 02218353ab5..76f9a1a8c17 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ItemWrapperImpl.java @@ -113,7 +113,7 @@ public > Collection getDelta() throws SchemaExcep LOGGER.trace("Start computing delta for {}", newItem); D delta = null; if (parent != null && ValueStatus.ADDED == parent.getStatus()) { - delta = (D) createEmptyDelta(getName()); + delta = (D) createEmptyDelta(getItemName()); } else { delta = (D) createEmptyDelta(getPath()); } @@ -455,8 +455,8 @@ ItemStatus getItemStatus() { @Override - public ItemName getName() { - return getItemDefinition().getName(); + public ItemName getItemName() { + return getItemDefinition().getItemName(); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java index 42ce88d162c..85d97c61e03 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerValueWrapperImpl.java @@ -314,7 +314,7 @@ private ItemPath getVirtualItemPath(VirtualContainerItemSpecificationType virtua } protected > void collectExtensionItems(ItemWrapper item, boolean containers, List itemWrappers) { - if (!ObjectType.F_EXTENSION.equals(item.getName())) { + if (!ObjectType.F_EXTENSION.equals(item.getItemName())) { return; } @@ -392,9 +392,9 @@ private IW findItemByQName(QName subName) throws Schema } IW matching = null; for (ItemWrapper item : items) { - if (QNameUtil.match(subName, item.getName())) { + if (QNameUtil.match(subName, item.getItemName())) { if (matching != null) { - String containerName = getParent() != null ? DebugUtil.formatElementName(getParent().getName()) : ""; + String containerName = getParent() != null ? DebugUtil.formatElementName(getParent().getItemName()) : ""; throw new SchemaException("More than one items matching " + subName + " in container " + containerName); } else { matching = (IW) item; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerWrapperImpl.java index 8aa9129696b..ab66761c860 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/PrismContainerWrapperImpl.java @@ -331,7 +331,7 @@ public , PrismContainerDefinition> protected ItemPath getDeltaPathForStatus(ItemStatus status) { if (ItemStatus.ADDED == status) { - return getName(); + return getItemName(); } return getPath(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerContainerWrapperImpl.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerContainerWrapperImpl.java index 9302f80b61d..e7fada833bc 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerContainerWrapperImpl.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerContainerWrapperImpl.java @@ -38,7 +38,7 @@ public ProfilingClassLoggerContainerWrapperImpl(PrismContainerValueWrapper pa } @Override - public ItemName getName() { + public ItemName getItemName() { return ItemName.fromQName(ProfilingClassLoggerWrapperFactoryImpl.PROFILING_LOGGER_PATH); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerPanel.java index de7b624be97..deb77f2c97c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/ProfilingClassLoggerPanel.java @@ -34,7 +34,7 @@ public ProfilingClassLoggerPanel(String id, IModel, PrismCon } ShadowAssociationType shadowAssociationType = new ShadowAssociationType(); shadowAssociationType.asPrismContainerValue().applyDefinition(getItemDefinition()); - shadowAssociationType.setName(refWrapper.getName()); + shadowAssociationType.setName(refWrapper.getItemName()); shadowAssociationType.setShadowRef(ObjectTypeUtil.createObjectRef((PrismReferenceValue) updatedRefValue.getNewValue())); delta.addValueToAdd(shadowAssociationType.asPrismContainerValue()); } @@ -108,7 +108,7 @@ public , PrismCon } ShadowAssociationType shadowAssociationType = new ShadowAssociationType(); shadowAssociationType.asPrismContainerValue().applyDefinition(getItemDefinition()); - shadowAssociationType.setName(refWrapper.getName()); + shadowAssociationType.setName(refWrapper.getItemName()); shadowAssociationType.setShadowRef(ObjectTypeUtil.createObjectRef((PrismReferenceValue) updatedRefValue.getNewValue())); switch (updatedRefValue.getStatus()) { @@ -141,7 +141,7 @@ public , PrismCon } ShadowAssociationType shadowAssociationType = new ShadowAssociationType(); shadowAssociationType.asPrismContainerValue().applyDefinition(getItemDefinition()); - shadowAssociationType.setName(refWrapper.getName()); + shadowAssociationType.setName(refWrapper.getItemName()); shadowAssociationType.setShadowRef(ObjectTypeUtil.createObjectRef((PrismReferenceValue) updatedRefValue.getNewValue())); delta.addValueToDelete(shadowAssociationType.asPrismContainerValue()); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java index 8bdb05f3214..98f02c3c96a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeDto.java @@ -102,7 +102,7 @@ public PrismPropertyDefinition getDefinition() { public String getName() { String name = definition.getDisplayName(); - return StringUtils.isNotEmpty(name) ? name : definition.getName().getLocalPart(); + return StringUtils.isNotEmpty(name) ? name : definition.getItemName().getLocalPart(); } public boolean isEmpty() { @@ -129,7 +129,7 @@ public ResourceAttributeDefinitionType getConstruction(PrismContext prismContext if (construction != null && construction.getRef() != null) { attrConstruction.setRef(construction.getRef()); // preserves original ref (including xmlns prefix!) - in order to avoid false deltas when comparing old and new values } else { - attrConstruction.setRef(new ItemPathType(definition.getName())); + attrConstruction.setRef(new ItemPathType(definition.getItemName())); } MappingType outbound; if (construction != null && construction.getOutbound() != null) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java index 253b576a4dd..e926ffd92e9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ACAttributeValuePanel.java @@ -134,7 +134,7 @@ private InputPanel createTypedInputComponent(String id, PrismPropertyDefinition panel = new TextPanel<>(id, new PropertyModel<>(getModel(), baseExpression), type); - if (ObjectType.F_NAME.equals(definition.getName())) { + if (ObjectType.F_NAME.equals(definition.getItemName())) { panel.getBaseFormComponent().setRequired(true); } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java index 6fc49aabb06..1b228789bae 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java @@ -296,7 +296,7 @@ private List prepareAssignmentAttributes(AssignmentType assignme } if (ItemPathTypeUtil.asSingleNameOrFail(attribute.getRef()) - .equals(propertyDef.getName())) { + .equals(propertyDef.getItemName())) { acAtrList.add(ACAttributeDto.createACAttributeDto(propertyDef, attribute, prismContext)); break; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java index 741f44d0ae7..94ef19e9f68 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java @@ -909,13 +909,13 @@ private PrismObject getReference(ObjectReferenceType ref, OperationResult result private ResourceAttributeDefinitionType findOrCreateValueConstruction(PrismPropertyDefinition attrDef, List attrConstructions) { for (ResourceAttributeDefinitionType construction : attrConstructions) { - if (attrDef.getName().equals(construction.getRef())) { + if (attrDef.getItemName().equals(construction.getRef())) { return construction; } } ResourceAttributeDefinitionType construction = new ResourceAttributeDefinitionType(); - construction.setRef(new ItemPathType(ItemPath.create(attrDef.getName()))); + construction.setRef(new ItemPathType(ItemPath.create(attrDef.getItemName()))); return construction; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java index 630b668d1af..28f46fc06a5 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ConstructionAssignmentPanel.java @@ -128,14 +128,4 @@ protected IModel getSpecificContainerModel(IModel itemWrapper, ItemPath parentAssignmentPath, ItemPath assignmentPath, AssignmentType prismContainerValue) { - if (itemWrapper.getPath().containsNameExactly(AssignmentType.F_CONSTRUCTION)) { - return ItemVisibility.AUTO; - } else { - return super.getAssignmentBasicTabVisibity(itemWrapper, parentAssignmentPath, assignmentPath, prismContainerValue); - } - - } - } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ModificationDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ModificationDto.java index 16ba8a25bad..16d10ecd322 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ModificationDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/model/delta/ModificationDto.java @@ -90,8 +90,8 @@ private static String getItemName(ItemDelta delta) { if (delta.getDefinition().getDisplayName() != null) { return delta.getDefinition().getDisplayName(); } - if (delta.getDefinition().getName() != null) { - return delta.getDefinition().getName().getLocalPart(); + if (delta.getDefinition().getItemName() != null) { + return delta.getDefinition().getItemName().getLocalPart(); } } ItemPath path = delta.getPath(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java index 2d5294a19a1..41456845100 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Property.java @@ -110,7 +110,7 @@ private String getItemDefinitionName(ItemDefinition def) { } String name = def.getDisplayName(); // TODO this is always null here, isn't it? if (StringUtils.isEmpty(name)) { - name = def.getName().getLocalPart(); + name = def.getItemName().getLocalPart(); } return name; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java index 137e5d0fd12..ebf9f915a59 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java @@ -116,8 +116,8 @@ public List getAllDefinitions() { public SearchItem addItem(ItemDefinition def) { boolean isPresent = false; for (ItemDefinition itemDefinition : availableDefinitions){ - if (itemDefinition.getName() != null && - itemDefinition.getName().equals(def.getName())){ + if (itemDefinition.getItemName() != null && + itemDefinition.getItemName().equals(def.getItemName())){ isPresent = true; break; } @@ -128,7 +128,7 @@ public SearchItem addItem(ItemDefinition def) { SearchItemDefinition itemToRemove = null; for (SearchItemDefinition entry : allDefinitions) { - if (entry.getDef().getName().equals(def.getName())) { + if (entry.getDef().getItemName().equals(def.getItemName())) { itemToRemove = entry; break; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java index 42b21a2bcc5..4b50e5ed67f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java @@ -308,7 +308,7 @@ public static List createExtensi } for (ItemDefinition def : (List) ext.getDefinitions()) { - ItemPath itemPath = ItemPath.create(extensionPath, def.getName()); + ItemPath itemPath = ItemPath.create(extensionPath, def.getItemName()); if (!isIndexed(def)) { continue; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java index 5fb8fa41c17..2eec082b923 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchItem.java @@ -86,7 +86,7 @@ public String getName() { String key = definition.getDisplayName(); if (StringUtils.isEmpty(key)) { StringBuilder sb = new StringBuilder(); - sb.append(search.getType().getSimpleName()).append('.').append(definition.getName().getLocalPart()); + sb.append(search.getType().getSimpleName()).append('.').append(definition.getItemName().getLocalPart()); key = sb.toString(); } @@ -101,7 +101,7 @@ public String getName() { return name; } - return definition.getName().getLocalPart(); + return definition.getItemName().getLocalPart(); } public Type getType() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java index bb82e9813ed..0039b9ba107 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/CapabilityStep.java @@ -310,7 +310,7 @@ protected List load() { if (schema != null) { ObjectClassComplexTypeDefinition def = schema.findDefaultObjectClassDefinition(ShadowKindType.ACCOUNT); for (ResourceAttributeDefinition attribute : def.getAttributeDefinitions()) { - choices.add(attribute.getName()); + choices.add(attribute.getItemName()); } } } catch (CommonException | RuntimeException e) { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java index 384ffe8dccb..2b859e27bd1 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAssociationEditor.java @@ -445,13 +445,13 @@ private List loadObjectReferences(boolean restrictObjectClass){ if(objectType != null && def.getTypeName().equals(objectType.getObjectClass())){ for(ResourceAttributeDefinition attributeDefinition : def.getAttributeDefinitions()) { - references.add(attributeDefinition.getName()); + references.add(attributeDefinition.getItemName()); } } } else { for(ResourceAttributeDefinition attributeDefinition : def.getAttributeDefinitions()) { - references.add(attributeDefinition.getName()); + references.add(attributeDefinition.getItemName()); } } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java index f76fd1d6afd..be525ea7a7b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/component/schemahandling/ResourceAttributeEditor.java @@ -464,7 +464,7 @@ private List loadObjectReferences(){ if (objectType.getObjectClass().equals(def.getTypeName()) || objectType.getAuxiliaryObjectClass().contains(def.getTypeName())) { for (ResourceAttributeDefinition attributeDefinition : def.getAttributeDefinitions()) { - ItemPath itemPath = attributeDefinition.getName(); + ItemPath itemPath = attributeDefinition.getItemName(); ItemPathType itemPathType = new ItemPathType(itemPath); if (!references.contains(itemPathType)) { references.add(itemPathType); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/AttributeDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/AttributeDto.java index 7294b295ff2..09075e92c5e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/AttributeDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/AttributeDto.java @@ -41,11 +41,11 @@ public AttributeDto(ResourceAttributeDefinition def) { } public String getName() { - return definition.getName().getLocalPart(); + return definition.getItemName().getLocalPart(); } public String getfNameCaseInsensitive() { - return StringUtils.lowerCase(definition.getName().getLocalPart()); + return StringUtils.lowerCase(definition.getItemName().getLocalPart()); } public String getMinMaxOccurs() { diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java index ddc5e838a6f..e49cb799385 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java @@ -521,7 +521,7 @@ protected PrismObjectDefinition getObjectDefinition() { protected ContainerDelta handleAssignmentDeltas(ObjectDelta focusDelta, List assignments, PrismContainerDefinition def, boolean isDelegation) throws SchemaException { - ContainerDelta assDelta = getPrismContext().deltaFactory().container().create(ItemPath.EMPTY_PATH, def.getName(), def); + ContainerDelta assDelta = getPrismContext().deltaFactory().container().create(ItemPath.EMPTY_PATH, def.getItemName(), def); for (AssignmentEditorDto assDto : assignments) { PrismContainerValue newValue = assDto.getNewValue(getPrismContext()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java index 4271bebed93..a4044e601c9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentResourcePanel.java @@ -102,7 +102,7 @@ private List createAttributeDefinit } private ItemName getAttributeName(ResourceAttributeDefinition def) { - return def.getName(); + return def.getItemName(); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java index cefa5897ae2..07779a0c48c 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java @@ -369,7 +369,7 @@ private void clearStorage(){ private ContainerDelta handleAssignmentDeltas(ObjectDelta focusDelta, List assignments, PrismContainerDefinition def) throws SchemaException { - ContainerDelta assDelta = getPrismContext().deltaFactory().container().create(ItemPath.EMPTY_PATH, def.getName(), def); + ContainerDelta assDelta = getPrismContext().deltaFactory().container().create(ItemPath.EMPTY_PATH, def.getItemName(), def); for (AssignmentEditorDto assDto : assignments) { PrismContainerValue newValue = assDto.getNewValue(getPrismContext()); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java index cf2ceda1a3d..0799b0d1d4f 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExpressionUtil.java @@ -429,6 +429,7 @@ public static MapXNode getOrCreateAssociationTargetSearchValues(ExpressionType e if (values == null) { values = prismContext.xnodeFactory().map(); // todo [med] this has no effect on the map node! } + expression.getExpressionEvaluator().add(element); return values; } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java index 13e0174ee8a..fa13e8f7fd9 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/SchrodingerComponentInitListener.java @@ -90,7 +90,7 @@ private void handleLocalization(Component component) { PrismPropertyWrapper iw = (PrismPropertyWrapper) ppp.getModel().getObject(); String key = iw.getDisplayName(); - QName qname = iw.getName(); + QName qname = iw.getItemName(); writeDataAttribute(component, ATTR_RESOURCE_KEY, key); writeDataAttribute(component, ATTR_QNAME, qnameToString(qname)); diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java index 422b0a5dd28..caf9a7b65af 100644 --- a/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java +++ b/gui/admin-gui/src/test/java/com/evolveum/midpoint/gui/TestIntegrationObjectWrapperFactory.java @@ -656,7 +656,7 @@ public void test220AssignRoleLandluberToWally() throws Exception { PrismReferenceValue groupAssociationValuePVal = (PrismReferenceValue) groupAssociationValue.getNewValue(); display("groupAssociationValuePVal", groupAssociationValuePVal); assertEquals("wrong number of values in "+groupAssociationValue, ValueStatus.NOT_CHANGED, groupAssociationValue.getStatus()); - assertEquals("Wrong group association name", RESOURCE_DUMMY_ASSOCIATION_GROUP_QNAME, groupAssociationWrapper.getName()); + assertEquals("Wrong group association name", RESOURCE_DUMMY_ASSOCIATION_GROUP_QNAME, groupAssociationWrapper.getItemName()); assertEquals("Wrong group association value", GROUP_DUMMY_MAPMAKERS_NAME, groupAssociationValuePVal.asReferencable().getTargetName().getOrig()); // PrismContainer groupAssociationValueIdentifiers = groupAssociationValuePVal.findContainer(ShadowAssociationType.F_IDENTIFIERS); // PrismProperty groupAssociationUidProp = groupAssociationValueIdentifiers.findProperty(new QName(null,"uid")); diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java index a0b2b4fb4ba..b439c44c8dd 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/CompositeRefinedObjectClassDefinitionImpl.java @@ -427,7 +427,7 @@ public Collection> getAttributeDefinitio for (RefinedAttributeDefinition auxRAttrDef: auxiliaryObjectClassDefinition.getAttributeDefinitions()) { boolean add = true; for (RefinedAttributeDefinition def: defs) { - if (def.getName().equals(auxRAttrDef.getName())) { + if (def.getItemName().equals(auxRAttrDef.getItemName())) { add = false; break; } diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java index ecdefe506f3..6c23ecb4863 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java @@ -457,8 +457,8 @@ public boolean isPrimaryIdentifier(ResourceAttributeContainerDefinition objectDe @Override @NotNull - public ItemName getName() { - return refinedAttributeDefinition.getName(); + public ItemName getItemName() { + return refinedAttributeDefinition.getItemName(); } @Override diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java index 925316149f5..4ed68b47681 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedObjectClassDefinitionImpl.java @@ -113,7 +113,7 @@ public List getIgnoredNamespaces() { } private LayerRefinedAttributeDefinition substituteLayerRefinedAttributeDefinition(ResourceAttributeDefinition attributeDef) { - return findAttributeDefinition(attributeDef.getName()); + return findAttributeDefinition(attributeDef.getItemName()); } private Collection> substituteLayerRefinedAttributeDefinitionCollection(Collection> attributes) { @@ -246,7 +246,7 @@ public ResourceAttributeContainer instantiate(QName name) { @Override public LayerRefinedAttributeDefinition findAttributeDefinition(@NotNull QName elementQName) { for (LayerRefinedAttributeDefinition definition : getAttributeDefinitions()) { - if (QNameUtil.match(definition.getName(), elementQName)) { + if (QNameUtil.match(definition.getItemName(), elementQName)) { //noinspection unchecked return definition; } diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java index e7c26db0575..3d9d6db13ff 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedAttributeDefinitionImpl.java @@ -71,7 +71,7 @@ public class RefinedAttributeDefinitionImpl extends ResourceAttributeDefiniti private boolean isVolatilityTrigger = false; protected RefinedAttributeDefinitionImpl(ResourceAttributeDefinition attrDef, PrismContext prismContext) { - super(attrDef.getName(), attrDef.getTypeName(), prismContext); + super(attrDef.getItemName(), attrDef.getTypeName(), prismContext); this.attributeDefinition = attrDef; } @@ -252,8 +252,8 @@ public void setInboundMappingTypes(List inboundAssignmentTypes) { } @NotNull - public ItemName getName() { - return attributeDefinition.getName(); + public ItemName getItemName() { + return attributeDefinition.getItemName(); } @NotNull diff --git a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java index fd59dd0c26d..6b99277e11f 100644 --- a/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java +++ b/infra/common/src/main/java/com/evolveum/midpoint/common/refinery/RefinedObjectClassDefinitionImpl.java @@ -110,7 +110,7 @@ public List getDefinitions() { public Collection getNamesOfAttributesWithOutboundExpressions() { return getAttributeDefinitions().stream() .filter(attrDef -> attrDef.getOutboundMappingType() != null) - .map(attrDef -> attrDef.getName()) + .map(attrDef -> attrDef.getItemName()) .collect(Collectors.toCollection(HashSet::new)); } @@ -118,7 +118,7 @@ public Collection getNamesOfAttributesWithOutboundExpressions() public Collection getNamesOfAttributesWithInboundExpressions() { return getAttributeDefinitions().stream() .filter(attrDef -> CollectionUtils.isNotEmpty(attrDef.getInboundMappingTypes())) - .map(attrDef -> attrDef.getName()) + .map(attrDef -> attrDef.getItemName()) .collect(Collectors.toCollection(HashSet::new)); } @@ -184,7 +184,7 @@ private RefinedAttributeDefinition substituteRefinedAttributeDefinition( if (original == null) { return null; } - value = findAttributeDefinition(original.getName()); + value = findAttributeDefinition(original.getItemName()); setter.accept(value); } return value; @@ -975,8 +975,8 @@ public static RefinedObjectClassDefinition parseFromSchema(ObjectClassComplexTyp attrContextDescription); rOcDef.processIdentifiers(rAttrDef, objectClassDef); - if (rOcDef.containsAttributeDefinition(rAttrDef.getName())) { - throw new SchemaException("Duplicate definition of attribute " + rAttrDef.getName() + " in " + attrContextDescription); + if (rOcDef.containsAttributeDefinition(rAttrDef.getItemName())) { + throw new SchemaException("Duplicate definition of attribute " + rAttrDef.getItemName() + " in " + attrContextDescription); } rOcDef.add(rAttrDef); @@ -1102,8 +1102,8 @@ private void parseAttributesFrom(RefinedResourceSchema rSchema, ObjectClassCompl return; } for (ResourceAttributeDefinition road : ocDef.getAttributeDefinitions()) { - String attrContextDescription = road.getName() + ", in " + contextDescription; - ResourceAttributeDefinitionType attrDefType = findAttributeDefinitionType(road.getName(), schemaHandlingObjectTypeDefinitionType, + String attrContextDescription = road.getItemName() + ", in " + contextDescription; + ResourceAttributeDefinitionType attrDefType = findAttributeDefinitionType(road.getItemName(), schemaHandlingObjectTypeDefinitionType, attrContextDescription); // We MUST NOT skip ignored attribute definitions here. We must include them in the schema as // the shadows will still have that attributes and we will need their type definition to work @@ -1116,11 +1116,11 @@ private void parseAttributesFrom(RefinedResourceSchema rSchema, ObjectClassCompl processIdentifiers(rAttrDef, ocDef); } - if (containsAttributeDefinition(rAttrDef.getName())) { + if (containsAttributeDefinition(rAttrDef.getItemName())) { if (auxiliary) { continue; } else { - throw new SchemaException("Duplicate definition of attribute " + rAttrDef.getName() + " in "+kind+" type " + + throw new SchemaException("Duplicate definition of attribute " + rAttrDef.getItemName() + " in "+kind+" type " + intent + ", in " + contextDescription); } } @@ -1136,7 +1136,7 @@ private void parseAttributesFrom(RefinedResourceSchema rSchema, ObjectClassCompl } private void processIdentifiers(RefinedAttributeDefinition rAttrDef, ObjectClassComplexTypeDefinition objectClassDef) { - QName attrName = rAttrDef.getName(); + QName attrName = rAttrDef.getItemName(); if (objectClassDef.isPrimaryIdentifier(attrName)) { ((Collection)getPrimaryIdentifiers()).add(rAttrDef); @@ -1417,7 +1417,7 @@ public void trimTo(@NotNull Collection paths) { .filter(p -> p.isSingleName()) .map(p -> p.asSingleName()) .collect(Collectors.toList()); - attributeDefinitions.removeIf(itemDefinition -> !QNameUtil.contains(names, itemDefinition.getName())); + attributeDefinitions.removeIf(itemDefinition -> !QNameUtil.contains(names, itemDefinition.getItemName())); associationDefinitions.removeIf(itemDefinition -> !QNameUtil.contains(names, itemDefinition.getName())); } diff --git a/infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java b/infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java index 4a8c2d4c265..0e285e059f6 100644 --- a/infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java +++ b/infra/common/src/test/java/com/evolveum/midpoint/common/refinery/TestRefinedSchema.java @@ -199,7 +199,7 @@ private void assertRefinedSchema(ResourceType resourceType, RefinedResourceSchem RefinedAttributeDefinition displayNameAttributeDef = rAccountDef.getDisplayNameAttribute(); assertNotNull("No account displayNameAttribute", displayNameAttributeDef); - assertEquals("Wrong account displayNameAttribute", new QName(resourceType.getNamespace(), "uid"), displayNameAttributeDef.getName()); + assertEquals("Wrong account displayNameAttribute", new QName(resourceType.getNamespace(), "uid"), displayNameAttributeDef.getItemName()); // This is compatibility with PrismContainerDefinition, it should work well Collection propertyDefinitions = rAccountDef.getDefinitions(); @@ -229,7 +229,7 @@ private void assertRefinedSchema(ResourceType resourceType, RefinedResourceSchem RefinedAttributeDefinition entDisplayNameAttributeDef = rEntDef.getDisplayNameAttribute(); assertNotNull("No entitlement displayNameAttribute", entDisplayNameAttributeDef); - assertEquals("Wrong entitlement displayNameAttribute", new QName(resourceType.getNamespace(), "cn"), entDisplayNameAttributeDef.getName()); + assertEquals("Wrong entitlement displayNameAttribute", new QName(resourceType.getNamespace(), "cn"), entDisplayNameAttributeDef.getItemName()); assertEquals("Unexpected number of entitlement associations", 1, rAccountDef.getAssociationDefinitions().size()); } @@ -287,7 +287,7 @@ private void assertRefinedToLayer(ResourceAttributeDefinition attrDef, LayerType return; } if (!(attrDef instanceof LayerRefinedAttributeDefinition)) { - AssertJUnit.fail("Expected that definition of attribute "+attrDef.getName()+" in layer "+expectedLayer + AssertJUnit.fail("Expected that definition of attribute "+attrDef.getItemName()+" in layer "+expectedLayer +" will be LayerRefinedAttributeDefinition, but it is "+attrDef.getClass()+": "+attrDef); } assertEquals("Wrong layer in "+attrDef, expectedLayer, ((LayerRefinedAttributeDefinition)attrDef).getLayer()); @@ -513,7 +513,7 @@ private void assertAttributeDef(Collection boolean hasOutbound, boolean ignore, boolean canCreate, boolean canRead, boolean canUpdate, LayerType sourceLayer, LayerType validationLayer) { for (RefinedAttributeDefinition def : attrDefs) { - if (def.getName().equals(name)) { + if (def.getItemName().equals(name)) { assertEquals("Attribute " + name + " ("+sourceLayer+") type mismatch", typeName, def.getTypeName()); assertEquals("Attribute " + name + " ("+sourceLayer+") minOccurs mismatch", minOccurs, def.getMinOccurs()); assertEquals("Attribute " + name + " ("+sourceLayer+") maxOccurs mismatch", maxOccurs, def.getMaxOccurs()); @@ -646,7 +646,7 @@ public void test140ParseFromResourcePosix() throws Exception { RefinedAttributeDefinition displayNameAttributeDef = rAccountDef.getDisplayNameAttribute(); assertNotNull("No account displayNameAttribute", displayNameAttributeDef); assertEquals("Wrong account displayNameAttribute", new QName(ResourceTypeUtil.getResourceNamespace(resourceType), "dn"), - displayNameAttributeDef.getName()); + displayNameAttributeDef.getItemName()); // This is compatibility with PrismContainerDefinition, it should work well Collection propertyDefinitions = rAccountDef.getDefinitions(); @@ -671,7 +671,7 @@ public void test140ParseFromResourcePosix() throws Exception { RefinedAttributeDefinition entDisplayNameAttributeDef = rEntDef.getDisplayNameAttribute(); assertNotNull("No entitlement displayNameAttribute", entDisplayNameAttributeDef); assertEquals("Wrong entitlement displayNameAttribute", new QName(ResourceTypeUtil.getResourceNamespace(resourceType), "dn"), - entDisplayNameAttributeDef.getName()); + entDisplayNameAttributeDef.getItemName()); assertEquals("Unexpected number of entitlement associations", 1, rAccountDef.getAssociationDefinitions().size()); diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java index bbcca4174dc..61658658953 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ public interface ItemDefinition extends Definition, Visitable { @NotNull - ItemName getName(); + ItemName getItemName(); String getNamespace(); diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableItemDefinition.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableItemDefinition.java index 2880d9e61ac..903fd5d027d 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableItemDefinition.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/MutableItemDefinition.java @@ -40,7 +40,7 @@ public interface MutableItemDefinition extends ItemDefinition void setDynamic(boolean value); // use with care - void setName(QName name); + void setItemName(QName name); void setReadOnly(); diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java index e6d6f19fb4e..c1d4f79888e 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/schema/DefinitionStoreUtils.java @@ -59,7 +59,7 @@ public static ID getOne(List list, boolean excep } else { if (exceptionIfAmbiguous) { throw new IllegalArgumentException(message + ": " + - list.stream().map(ItemDefinition::getName).collect(Collectors.toList())); + list.stream().map(ItemDefinition::getItemName).collect(Collectors.toList())); } else { return null; } diff --git a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java index a539d07178b..968aec3369d 100644 --- a/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java +++ b/infra/prism-api/src/main/java/com/evolveum/midpoint/prism/util/PrismAsserts.java @@ -178,7 +178,7 @@ public void visit(Visitable visitable) { public static void assertObjectDefinition(PrismObjectDefinition objDef, QName elementName, QName typeName, Class compileTimeClass) { assertNotNull("No definition", objDef); - assertEquals("Wrong elementName for "+objDef, elementName, objDef.getName()); + assertEquals("Wrong elementName for "+objDef, elementName, objDef.getItemName()); assertEquals("Wrong typeName for "+objDef, typeName, objDef.getTypeName()); assertEquals("Wrong compileTimeClass for " + objDef, compileTimeClass, objDef.getCompileTimeClass()); } @@ -1001,7 +1001,7 @@ public static void assertEqualsFilter(ObjectFilter objectFilter, QName expectedF EqualFilter filter = (EqualFilter) objectFilter; //we don't have definition in all situation..this is almost OK..it will be computed dynamicaly if (filter.getDefinition() != null){ - assertEquals("Wrong filter definition element name", expectedFilterDef, filter.getDefinition().getName()); + assertEquals("Wrong filter definition element name", expectedFilterDef, filter.getDefinition().getItemName()); assertEquals("Wrong filter definition type", expectedTypeName, filter.getDefinition().getTypeName()); } assertPathEquivalent("Wrong filter path", path, filter.getFullPath()); @@ -1020,7 +1020,7 @@ public static void assertRefFilter(ObjectFilter objectFilter, QName expectedFilt ItemPath path) { assertTrue("Wrong filter class: " + objectFilter.getClass(), objectFilter instanceof RefFilter); RefFilter filter = (RefFilter) objectFilter; - assertEquals("Wrong filter definition element name", expectedFilterDef, filter.getDefinition().getName()); + assertEquals("Wrong filter definition element name", expectedFilterDef, filter.getDefinition().getItemName()); assertEquals("Wrong filter definition type", expectedTypeName, filter.getDefinition().getTypeName()); assertPathEquivalent("Wrong filter path", path, filter.getFullPath()); } diff --git a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java index d11d09c1c68..26db8e00ce1 100644 --- a/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java +++ b/infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/RawType.java @@ -225,7 +225,7 @@ public IV getParsedValue(@Null if (itemDefinition != null && !(itemDefinition instanceof PrismPropertyDefinition && ((PrismPropertyDefinition) itemDefinition).isAnyType())) { if (itemName == null) { - itemName = itemDefinition.getName(); + itemName = itemDefinition.getItemName(); } checkPrismContext(); Item subItem = prismContext.parserFor(getRootXNode(itemName)).name(itemName).definition(itemDefinition).parseItem(); @@ -286,7 +286,7 @@ public T getParsedRealValue(@NotNull Class clazz) throws SchemaException public Item getParsedItem(ID itemDefinition) throws SchemaException { Validate.notNull(itemDefinition); - return getParsedItem(itemDefinition, itemDefinition.getName()); + return getParsedItem(itemDefinition, itemDefinition.getItemName()); } public Item getParsedItem(ID itemDefinition, QName itemName) throws SchemaException { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java index f5861f8e1ba..b32cfc341e9 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ComplexTypeDefinitionImpl.java @@ -288,10 +288,10 @@ public ID findNamedItemDefinition(@NotNull QName fir @Override public void merge(ComplexTypeDefinition otherComplexTypeDef) { for (ItemDefinition otherItemDef: otherComplexTypeDef.getDefinitions()) { - ItemDefinition existingItemDef = findItemDefinition(otherItemDef.getName()); + ItemDefinition existingItemDef = findItemDefinition(otherItemDef.getItemName()); if (existingItemDef != null) { LOGGER.warn("Overwriting existing definition {} by {} (in {})", existingItemDef, otherItemDef, this); - replaceDefinition(otherItemDef.getName(), otherItemDef.clone()); + replaceDefinition(otherItemDef.getItemName(), otherItemDef.clone()); } else { add(otherItemDef.clone()); } @@ -380,13 +380,13 @@ protected void copyDefinitionData(ComplexTypeDefinitionImpl clone) { public void replaceDefinition(QName itemName, ItemDefinition newDefinition) { for (int i=0; i paths) { } for (Iterator iterator = itemDefinitions.iterator(); iterator.hasNext(); ) { ItemDefinition itemDef = iterator.next(); - ItemPath itemPath = itemDef.getName(); + ItemPath itemPath = itemDef.getItemName(); if (!ItemPathCollectionsUtil.containsSuperpathOrEquivalent(paths, itemPath)) { iterator.remove(); } else if (itemDef instanceof PrismContainerDefinition) { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java index 707ea51cfaa..327ce8a0fdd 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/ItemDefinitionImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,9 +55,9 @@ * */ public abstract class ItemDefinitionImpl extends DefinitionImpl implements MutableItemDefinition { - private static final long serialVersionUID = -2643332934312107274L; - @NotNull protected ItemName name; + + @NotNull protected ItemName itemName; private int minOccurs = 1; private int maxOccurs = 1; private boolean operational = false; @@ -78,12 +78,12 @@ public abstract class ItemDefinitionImpl extends DefinitionImpl * The constructors should be used only occasionally (if used at all). * Use the factory methods in the ResourceObjectDefintion instead. * - * @param name definition name (element Name) + * @param itemName definition name (element Name) * @param typeName type name (XSD complex or simple type) */ - ItemDefinitionImpl(@NotNull QName name, @NotNull QName typeName, @NotNull PrismContext prismContext) { + ItemDefinitionImpl(@NotNull QName itemName, @NotNull QName typeName, @NotNull PrismContext prismContext) { super(typeName, prismContext); - this.name = ItemName.fromQName(name); // todo + this.itemName = ItemName.fromQName(itemName); // todo } /** @@ -103,17 +103,17 @@ public abstract class ItemDefinitionImpl extends DefinitionImpl */ @Override @NotNull - public ItemName getName() { - return name; + public ItemName getItemName() { + return itemName; } - public void setName(@NotNull QName name) { - this.name = ItemName.fromQName(name); // todo + public void setItemName(@NotNull QName name) { + this.itemName = ItemName.fromQName(name); // todo } @Override public String getNamespace() { - return getName().getNamespaceURI(); + return getItemName().getNamespaceURI(); } /** @@ -302,7 +302,7 @@ public boolean isValidFor(QName elementQName, Class cl public boolean isValidFor(@NotNull QName elementQName, @NotNull Class clazz, boolean caseInsensitive) { return clazz.isAssignableFrom(this.getClass()) - && QNameUtil.match(elementQName, getName(), caseInsensitive); + && QNameUtil.match(elementQName, getItemName(), caseInsensitive); } @Override @@ -310,7 +310,7 @@ public void adoptElementDefinitionFrom(ItemDefinition otherDef) { if (otherDef == null) { return; } - setName(otherDef.getName()); + setItemName(otherDef.getItemName()); setMinOccurs(otherDef.getMinOccurs()); setMaxOccurs(otherDef.getMaxOccurs()); } @@ -355,7 +355,7 @@ public void accept(Visitor visitor) { protected void copyDefinitionData(ItemDefinitionImpl clone) { super.copyDefinitionData(clone); - clone.name = this.name; + clone.itemName = this.itemName; clone.minOccurs = this.minOccurs; clone.maxOccurs = this.maxOccurs; clone.dynamic = this.dynamic; @@ -400,7 +400,7 @@ public void revive(PrismContext prismContext) { public int hashCode() { final int prime = 31; int result = super.hashCode(); - result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((itemName == null) ? 0 : itemName.hashCode()); result = prime * result + maxOccurs; result = prime * result + minOccurs; result = prime * result + (canAdd ? 1231 : 1237); @@ -418,10 +418,10 @@ public boolean equals(Object obj) { if (getClass() != obj.getClass()) return false; ItemDefinitionImpl other = (ItemDefinitionImpl) obj; - if (name == null) { - if (other.name != null) + if (itemName == null) { + if (other.itemName != null) return false; - } else if (!name.equals(other.name)) + } else if (!itemName.equals(other.itemName)) return false; if (maxOccurs != other.maxOccurs) return false; @@ -441,7 +441,7 @@ public String toString() { StringBuilder sb = new StringBuilder(); sb.append(getDebugDumpClassName()); sb.append(":"); - sb.append(PrettyPrinter.prettyPrint(getName())); + sb.append(PrettyPrinter.prettyPrint(getItemName())); sb.append(" "); debugDumpShortToString(sb); return sb.toString(); diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java index 27cca19563c..d7ff1e21b44 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerDefinitionImpl.java @@ -119,7 +119,7 @@ public Class getTypeClass() { } protected String getSchemaNamespace() { - return getName().getNamespaceURI(); + return getItemName().getNamespaceURI(); } @Override @@ -204,7 +204,7 @@ public ID findItemDefinition(@NotNull ItemPath path, public ID findNamedItemDefinition(@NotNull QName firstName, @NotNull ItemPath rest, @NotNull Class clazz) { for (ItemDefinition def : getDefinitions()) { - if (QNameUtil.match(firstName, def.getName())) { + if (QNameUtil.match(firstName, def.getItemName())) { return (ID) def.findItemDefinition(rest, clazz); } } @@ -267,7 +267,7 @@ public List getPropertyDefinitions() { @NotNull @Override public PrismContainer instantiate() throws SchemaException { - return instantiate(getName()); + return instantiate(getItemName()); } @NotNull @@ -276,7 +276,7 @@ public PrismContainer instantiate(QName elementName) throws SchemaException { if (isAbstract()) { throw new SchemaException("Cannot instantiate abstract definition "+this); } - elementName = DefinitionUtil.addNamespaceIfApplicable(elementName, this.name); + elementName = DefinitionUtil.addNamespaceIfApplicable(elementName, this.itemName); return new PrismContainerImpl<>(elementName, this, prismContext); } @@ -299,7 +299,7 @@ public void accept(Visitor visitor) { @NotNull @Override public PrismContainerDefinitionImpl clone() { - PrismContainerDefinitionImpl clone = new PrismContainerDefinitionImpl<>(name, complexTypeDefinition, prismContext, compileTimeClass); + PrismContainerDefinitionImpl clone = new PrismContainerDefinitionImpl<>(itemName, complexTypeDefinition, prismContext, compileTimeClass); copyDefinitionData(clone); return clone; } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java index 7c46972fe7e..7109a628118 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismContainerValueImpl.java @@ -546,7 +546,7 @@ public PrismProperty findProperty(PrismPropertyDefinition propertyDefi if (propertyDefinition == null) { throw new IllegalArgumentException("No property definition"); } - return findProperty(propertyDefinition.getName()); + return findProperty(propertyDefinition.getItemName()); } public PrismContainer findContainer(QName containerName) { @@ -608,7 +608,7 @@ public > if (itemDefinition == null) { throw new IllegalArgumentException("No item definition"); } - return findItem(itemDefinition.getName(), type); + return findItem(itemDefinition.getItemName(), type); } public boolean containsItem(ItemPath path, boolean acceptEmptyItem) throws SchemaException { @@ -800,7 +800,7 @@ public PrismProperty findOrCreateProperty(ItemPath propertyPath) throws S } public PrismProperty findOrCreateProperty(PrismPropertyDefinition propertyDef) throws SchemaException { - PrismProperty property = findItem(propertyDef.getName(), PrismProperty.class); + PrismProperty property = findItem(propertyDef.getItemName(), PrismProperty.class); if (property != null) { return property; } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectDefinitionImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectDefinitionImpl.java index 267e3aff849..8994da5f934 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectDefinitionImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismObjectDefinitionImpl.java @@ -58,7 +58,7 @@ public PrismObject instantiate() throws SchemaException { if (isAbstract()) { throw new SchemaException("Cannot instantiate abstract definition "+this); } - return new PrismObjectImpl<>(getName(), this, prismContext); + return new PrismObjectImpl<>(getItemName(), this, prismContext); } @NotNull @@ -67,14 +67,14 @@ public PrismObject instantiate(QName name) throws SchemaException { if (isAbstract()) { throw new SchemaException("Cannot instantiate abstract definition "+this); } - name = DefinitionUtil.addNamespaceIfApplicable(name, this.name); + name = DefinitionUtil.addNamespaceIfApplicable(name, this.itemName); return new PrismObjectImpl<>(name, this, prismContext); } @NotNull @Override public PrismObjectDefinitionImpl clone() { - PrismObjectDefinitionImpl clone = new PrismObjectDefinitionImpl<>(name, complexTypeDefinition, prismContext, compileTimeClass); + PrismObjectDefinitionImpl clone = new PrismObjectDefinitionImpl<>(itemName, complexTypeDefinition, prismContext, compileTimeClass); copyDefinitionData(clone); return clone; } @@ -136,7 +136,7 @@ public PrismObjectValue createValue() { private ItemName getExtensionQName() { - String namespace = getName().getNamespaceURI(); + String namespace = getItemName().getNamespaceURI(); return new ItemName(namespace, PrismConstants.EXTENSION_LOCAL_NAME); } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyDefinitionImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyDefinitionImpl.java index bd6bb4975c4..e423d75042d 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyDefinitionImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismPropertyDefinitionImpl.java @@ -140,13 +140,13 @@ public void setMatchingRuleQName(QName matchingRuleQName) { @NotNull @Override public PrismProperty instantiate() { - return instantiate(getName()); + return instantiate(getItemName()); } @NotNull @Override public PrismProperty instantiate(QName name) { - name = DefinitionUtil.addNamespaceIfApplicable(name, this.name); + name = DefinitionUtil.addNamespaceIfApplicable(name, this.itemName); return new PrismPropertyImpl<>(name, this, prismContext); } @@ -178,7 +178,7 @@ public boolean canBeDefinitionOf(PrismValue pvalue) { @NotNull @Override public PrismPropertyDefinitionImpl clone() { - PrismPropertyDefinitionImpl clone = new PrismPropertyDefinitionImpl<>(getName(), getTypeName(), getPrismContext()); + PrismPropertyDefinitionImpl clone = new PrismPropertyDefinitionImpl<>(getItemName(), getTypeName(), getPrismContext()); copyDefinitionData(clone); return clone; } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java index dbd0823530a..e7bdfca054f 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/PrismReferenceDefinitionImpl.java @@ -100,7 +100,7 @@ public boolean isValidFor(QName elementQName, Class cl @Override public boolean isValidFor(@NotNull QName elementQName, @NotNull Class clazz, boolean caseInsensitive) { return clazz.isAssignableFrom(this.getClass()) && - (QNameUtil.match(elementQName, getName(), caseInsensitive) || + (QNameUtil.match(elementQName, getItemName(), caseInsensitive) || QNameUtil.match(elementQName, getCompositeObjectElementName(), caseInsensitive)); } @@ -118,13 +118,13 @@ public T findItemDefinition(@NotNull ItemPath path, @ @NotNull @Override public PrismReference instantiate() { - return instantiate(getName()); + return instantiate(getItemName()); } @NotNull @Override public PrismReference instantiate(QName name) { - name = DefinitionUtil.addNamespaceIfApplicable(name, this.name); + name = DefinitionUtil.addNamespaceIfApplicable(name, this.itemName); return new PrismReferenceImpl(name, this, prismContext); } @@ -165,7 +165,7 @@ public MutablePrismReferenceDefinition toMutable() { @NotNull @Override public PrismReferenceDefinition clone() { - PrismReferenceDefinitionImpl clone = new PrismReferenceDefinitionImpl(getName(), getTypeName(), getPrismContext()); + PrismReferenceDefinitionImpl clone = new PrismReferenceDefinitionImpl(getItemName(), getTypeName(), getPrismContext()); copyDefinitionData(clone); return clone; } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java index abaa8ec236f..2dd5f3b0984 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/delta/ItemDeltaImpl.java @@ -75,7 +75,7 @@ protected ItemDeltaImpl(D itemDefinition, PrismContext prismContext) { } //checkPrismContext(prismContext, itemDefinition); this.prismContext = prismContext; - this.elementName = itemDefinition.getName(); + this.elementName = itemDefinition.getItemName(); this.parentPath = ItemPath.EMPTY_PATH; this.definition = itemDefinition; } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java index 740bcd0c5f8..63b2e3972fc 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java @@ -530,7 +530,7 @@ private void unmarshalEntry(@NotNull T bean, @NotNull Class beanClass, .isAssignableFrom(valueClass))) .findFirst(); if (itemDefOpt.isPresent()) { - jaxbElementName = itemDefOpt.get().getName(); + jaxbElementName = itemDefOpt.get().getItemName(); } else { LOGGER.warn("Heterogeneous list member with unknown element name '" + elementName + "': " + value); jaxbElementName = elementName; // unqualified diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/ItemInfo.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/ItemInfo.java index 54317b9ac8e..c552e008c05 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/ItemInfo.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/ItemInfo.java @@ -90,12 +90,12 @@ public static ItemInfo determine(ItemDefinition item info.itemName = itemNameExplicit; } else if (itemNameFromSource != null) { if (QNameUtil.noNamespace(itemNameFromSource) && definition != null) { - info.itemName = new QName(definition.getName().getNamespaceURI(), itemNameFromSource.getLocalPart()); + info.itemName = new QName(definition.getItemName().getNamespaceURI(), itemNameFromSource.getLocalPart()); } else { info.itemName = itemNameFromSource; } } else if (definition != null) { - info.itemName = definition.getName(); + info.itemName = definition.getItemName(); } else { info.itemName = itemNameDefault; } @@ -178,7 +178,7 @@ private static ID augmentWithType(ID definition, Cla private static ID augmentWithItemName(ID definition, Class definitionClass, SchemaRegistry schemaRegistry, QName itemName) throws SchemaException { - if (itemName == null || definition != null && QNameUtil.match(definition.getName(), itemName)) { // just an optimization to avoid needless lookups + if (itemName == null || definition != null && QNameUtil.match(definition.getItemName(), itemName)) { // just an optimization to avoid needless lookups return definition; } ID defFromItemName = DefinitionStoreUtils.getOne( @@ -271,7 +271,7 @@ public static ItemInfo determineFromValue(@NotNull PrismValue value, QName itemN info.itemName = value.getParent().getElementName(); } if (info.itemName == null && info.itemDefinition != null) { - info.itemName = info.itemDefinition.getName(); + info.itemName = info.itemDefinition.getItemName(); } // item type diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java index d210d9aaf24..b4c451f6a7e 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java @@ -239,7 +239,7 @@ private boolean shouldPutTypeInExportMode(SerializationContext ctx, ItemDefiniti if (!SerializationContext.isSerializeForExport(ctx) || definition == null || !definition.isRuntimeSchema()) { return false; } - QName itemName = definition.getName(); + QName itemName = definition.getItemName(); if (StringUtils.isEmpty(itemName.getNamespaceURI())) { return true; // ambiguous item name - let's put xsi:type, to be on the safe side } @@ -312,7 +312,7 @@ private void marshalContainerValue(MapXNodeImpl xmap, // ordering-sensitive. We need to keep that ordering otherwise the resulting // document won't pass schema validation for (ItemDefinition itemDef: containerDefinition.getDefinitions()) { - ItemName elementName = itemDef.getName(); + ItemName elementName = itemDef.getItemName(); Item item = containerVal.findItem(elementName); if (item != null) { if (!shouldSkipItem(itemsToSkip, elementName, itemDef, ctx)) { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismSerializerImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismSerializerImpl.java index 50fa25a0927..c7d5a929780 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismSerializerImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismSerializerImpl.java @@ -118,7 +118,7 @@ public T serialize(@NotNull PrismValue value) throws SchemaException { if (itemName != null) { nameToUse = itemName; } else if (itemDefinition != null) { - nameToUse = itemDefinition.getName(); + nameToUse = itemDefinition.getItemName(); } else if (value.getParent() != null) { nameToUse = value.getParent().getElementName(); } else { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java index 6b5e1092c5f..790cd3f99f0 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismUnmarshaller.java @@ -460,7 +460,7 @@ private PrismReferenceValue parseReferenceValueFromXNode(@NotNull XNodeImpl node ItemDefinition contentDefinition = getSchemaRegistry().findItemDefinitionByType(typeName); isComposite = contentDefinition instanceof PrismObjectDefinition; } else { - isComposite = !QNameUtil.match(itemName, definition.getName()); + isComposite = !QNameUtil.match(itemName, definition.getItemName()); } @@ -489,7 +489,7 @@ private PrismReferenceValue parseReferenceValueAsReference(@NotNull XNodeImpl xn if (!pc.isAllowMissingRefTypes() && !allowMissingRefTypesOverride) { type = definition.getTargetTypeName(); if (type == null) { - throw new SchemaException("Target type in reference " + definition.getName() + + throw new SchemaException("Target type in reference " + definition.getItemName() + " not specified in reference nor in the schema"); } } @@ -500,7 +500,7 @@ private PrismReferenceValue parseReferenceValueAsReference(@NotNull XNodeImpl xn QName defTargetType = definition.getTargetTypeName(); if (defTargetType != null) { if (!(prismContext.getSchemaRegistry().isAssignableFrom(defTargetType, type))) { - throw new SchemaException("Target type specified in reference " + definition.getName() + + throw new SchemaException("Target type specified in reference " + definition.getItemName() + " (" + type + ") does not match target type in schema (" + defTargetType + ")"); } } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java index 635bfeace73..e3446198dea 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/QueryConverterImpl.java @@ -278,7 +278,7 @@ private ObjectFilter parseComparisonFilter(QName cla ItemDefinition itemDefinition = locateItemDefinition(valueXnode, itemPath, pcd); if (itemDefinition != null) { - itemName = itemDefinition.getName(); + itemName = itemDefinition.getItemName(); } if (valueXnode != null) { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/path/CanonicalItemPathImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/path/CanonicalItemPathImpl.java index 1498b2ae2f7..78d2b557a93 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/path/CanonicalItemPathImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/path/CanonicalItemPathImpl.java @@ -95,7 +95,7 @@ public CanonicalItemPathImpl(ItemPath path, Class clazz if (def instanceof PrismContainerDefinition) { def = ((PrismContainerDefinition) def).findItemDefinition(name); if (def != null && !QNameUtil.hasNamespace(name)) { - name = def.getName(); + name = def.getItemName(); } } addToSegments(name); diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/EqualFilterImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/EqualFilterImpl.java index c49ace2c03c..554bd9b3639 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/EqualFilterImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/EqualFilterImpl.java @@ -151,7 +151,7 @@ private boolean matches(PrismPropertyValue filterValue, PrismPropertyVal PrismPropertyDefinition definition = getDefinition(); if (definition != null) { // We clone here to avoid modifying original data structure. - Object parsedObjectRealValue = ((RawType) objectRealValue).clone().getParsedRealValue(definition, definition.getName()); + Object parsedObjectRealValue = ((RawType) objectRealValue).clone().getParsedRealValue(definition, definition.getItemName()); //noinspection unchecked return matchingRule.match((T1) filterRealValue, (T1) parsedObjectRealValue); } else { diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/ValueFilterImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/ValueFilterImpl.java index 70bb855ff69..9606ba34296 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/ValueFilterImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/query/ValueFilterImpl.java @@ -94,7 +94,7 @@ public ItemPath getParentPath() { @NotNull public ItemName getElementName() { if (definition != null) { - return definition.getName(); // this is more precise, as the name in path can be unqualified + return definition.getItemName(); // this is more precise, as the name in path can be unqualified } if (fullPath.isEmpty()) { throw new IllegalStateException("Empty full path in filter "+this); @@ -469,7 +469,7 @@ public void checkConsistence(boolean requireDefinitions) { } } if (definition != null && ItemPath.isName(last)) { - if (!QNameUtil.match(definition.getName(), ItemPath.toName(last))) { + if (!QNameUtil.match(definition.getItemName(), ItemPath.toName(last))) { throw new IllegalArgumentException("Last segment of item path (" + fullPath.lastName() + ") " + "does not match item name from the definition: " + definition); } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java index b0848780368..39f449f3d7c 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/PrismSchemaImpl.java @@ -124,7 +124,7 @@ public void add(@NotNull Definition def) { definitions.add(def); if (def instanceof ItemDefinition) { ItemDefinition itemDef = (ItemDefinition) def; - itemDefinitionMap.put(itemDef.getName(), itemDef); + itemDefinitionMap.put(itemDef.getItemName(), itemDef); QName typeName = def.getTypeName(); if (QNameUtil.isUnqualified(typeName)) { throw new IllegalArgumentException("Item definition (" + itemDef + ") of unqualified type " + typeName + " cannot be added to " + this); diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaToDomProcessor.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaToDomProcessor.java index a2d45507bb0..202d530c688 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaToDomProcessor.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/schema/SchemaToDomProcessor.java @@ -186,7 +186,7 @@ private void addContainerDefinition(PrismContainerDefinition definition, addComplexTypeDefinition(complexTypeDefinition,complexTypeParent); } - Element elementElement = addElementDefinition(definition.getName(), definition.getTypeName(), definition.getMinOccurs(), definition.getMaxOccurs(), + Element elementElement = addElementDefinition(definition.getItemName(), definition.getTypeName(), definition.getMinOccurs(), definition.getMaxOccurs(), elementParent); if (complexTypeDefinition == null || !complexTypeDefinition.isContainerMarker()) { @@ -205,12 +205,12 @@ private void addPropertyDefinition(PrismPropertyDefinition definition, Element p // Add to document first, so following methods will be able to resolve namespaces parent.appendChild(property); - String attrNamespace = definition.getName().getNamespaceURI(); + String attrNamespace = definition.getItemName().getNamespaceURI(); if (attrNamespace != null && attrNamespace.equals(getNamespace())) { - setAttribute(property, "name", definition.getName().getLocalPart()); + setAttribute(property, "name", definition.getItemName().getLocalPart()); setQNameAttribute(property, "type", definition.getTypeName()); } else { - setQNameAttribute(property, "ref", definition.getName()); + setQNameAttribute(property, "ref", definition.getItemName()); } if (definition.getMinOccurs() != 1) { @@ -274,12 +274,12 @@ private void addReferenceDefinition(PrismReferenceDefinition definition, Element // Add to document first, so following methods will be able to resolve namespaces parent.appendChild(property); - String attrNamespace = definition.getName().getNamespaceURI(); + String attrNamespace = definition.getItemName().getNamespaceURI(); if (attrNamespace != null && attrNamespace.equals(getNamespace())) { - setAttribute(property, "name", definition.getName().getLocalPart()); + setAttribute(property, "name", definition.getItemName().getLocalPart()); setQNameAttribute(property, "type", definition.getTypeName()); } else { - setQNameAttribute(property, "ref", definition.getName()); + setQNameAttribute(property, "ref", definition.getItemName()); } if (definition.getCompositeObjectElementName() == null) { @@ -325,7 +325,7 @@ private void addReferenceDefinition(PrismReferenceDefinition definition, Element appinfo = createElement(new QName(W3C_XML_SCHEMA_NS_URI, "appinfo")); annotation.appendChild(appinfo); - addAnnotation(A_OBJECT_REFERENCE, definition.getName(), appinfo); + addAnnotation(A_OBJECT_REFERENCE, definition.getItemName(), appinfo); if (definition.isComposite()) { addAnnotation(A_COMPOSITE, definition.isComposite(), appinfo); } diff --git a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/util/JaxbTestUtil.java b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/util/JaxbTestUtil.java index 88e731a2a3e..de9ffe4c343 100644 --- a/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/util/JaxbTestUtil.java +++ b/infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/util/JaxbTestUtil.java @@ -707,8 +707,8 @@ private QName determineElementQName(Objectable objectable) { } PrismObjectDefinition definition = prismObject.getDefinition(); if (definition != null) { - if (definition.getName() != null) { - return definition.getName(); + if (definition.getItemName() != null) { + return definition.getItemName(); } } throw new IllegalStateException("Cannot determine element name of "+objectable); @@ -718,8 +718,8 @@ private QName determineElementQName(Containerable containerable) { PrismContainerValue prismContainerValue = containerable.asPrismContainerValue(); PrismContainerDefinition definition = prismContainerValue.getParent() != null ? prismContainerValue.getParent().getDefinition() : null; if (definition != null) { - if (definition.getName() != null) { - return definition.getName(); + if (definition.getItemName() != null) { + return definition.getItemName(); } } throw new IllegalStateException("Cannot determine element name of " + containerable + " (parent = " + prismContainerValue.getParent() + ", definition = " + definition + ")"); diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java index d58f0d4dce1..65459b75e89 100644 --- a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java +++ b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java @@ -406,7 +406,7 @@ public static void assertUserJackContent(PrismObject user, boolean exp new QName(NS_FOO, "dummy"), // element name DOMUtil.XSD_STRING // type name ); - PrismPropertyValue prismValue1 = value1.getParsedValue(value1def, value1def.getName()); + PrismPropertyValue prismValue1 = value1.getParsedValue(value1def, value1def.getItemName()); assertEquals("Wrong value #1", "ABC", prismValue1.getValue()); } else { assertNull("Value #1 has XNode present", value1.getXnode()); @@ -414,7 +414,7 @@ public static void assertUserJackContent(PrismObject user, boolean exp } RawType value2 = accountConstructionType.getValue().get(1).clone(); assertNotNull("Value #2 has no XNode present", value2.getXnode()); - PrismValue prismValue2 = value2.getParsedValue(user.getDefinition(), user.getDefinition().getName()); + PrismValue prismValue2 = value2.getParsedValue(user.getDefinition(), user.getDefinition().getItemName()); PrismContainerValue prismUserValue2 = (PrismContainerValue) prismValue2; assertEquals("Wrong value #2", "Nobody", prismUserValue2.findProperty(new ItemName(NS_FOO, "fullName")).getRealValue()); diff --git a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java index 612fd89903b..361d8b878a8 100644 --- a/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java +++ b/infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestExtraSchema.java @@ -207,7 +207,7 @@ private void assertUserDefinition(PrismObjectDefinition userDef) { private void assertDefinitionOrder(List definitions, QName elementName, int i) { assertEquals("Wrong definition, expected that "+PrettyPrinter.prettyPrint(elementName)+" definition will be at index " + - i + " but there was a "+definitions.get(i).getName()+" instead", elementName, definitions.get(i).getName()); + i + " but there was a "+definitions.get(i).getItemName()+" instead", elementName, definitions.get(i).getItemName()); } /** diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java index 52bb77cff72..18374bf217d 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/MidPointSchemaDefinitionFactory.java @@ -182,19 +182,19 @@ private void addExtraObjectClassAnnotations(ObjectClassComplexTypeDefinition def // displayName, identifier, secondaryIdentifier for (ResourceAttributeDefinition identifier : definition.getPrimaryIdentifiers()) { - processor.addRefAnnotation(MidPointConstants.RA_IDENTIFIER, identifier.getName(), appinfo); + processor.addRefAnnotation(MidPointConstants.RA_IDENTIFIER, identifier.getItemName(), appinfo); } for (ResourceAttributeDefinition identifier : definition.getSecondaryIdentifiers()) { - processor.addRefAnnotation(MidPointConstants.RA_SECONDARY_IDENTIFIER,identifier.getName(),appinfo); + processor.addRefAnnotation(MidPointConstants.RA_SECONDARY_IDENTIFIER,identifier.getItemName(),appinfo); } if (definition.getDisplayNameAttribute() != null) { - processor.addRefAnnotation(MidPointConstants.RA_DISPLAY_NAME_ATTRIBUTE, definition.getDisplayNameAttribute().getName(), appinfo); + processor.addRefAnnotation(MidPointConstants.RA_DISPLAY_NAME_ATTRIBUTE, definition.getDisplayNameAttribute().getItemName(), appinfo); } if (definition.getDescriptionAttribute() != null) { - processor.addRefAnnotation(MidPointConstants.RA_DESCRIPTION_ATTRIBUTE, definition.getDescriptionAttribute().getName(), appinfo); + processor.addRefAnnotation(MidPointConstants.RA_DESCRIPTION_ATTRIBUTE, definition.getDescriptionAttribute().getItemName(), appinfo); } if (definition.getNamingAttribute() != null) { - processor.addRefAnnotation(MidPointConstants.RA_NAMING_ATTRIBUTE, definition.getNamingAttribute().getName(), appinfo); + processor.addRefAnnotation(MidPointConstants.RA_NAMING_ATTRIBUTE, definition.getNamingAttribute().getItemName(), appinfo); } // TODO: what to do with native object class, composite // // nativeObjectClass diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java index 289e8145ea8..0cbaff54870 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ObjectClassComplexTypeDefinition.java @@ -102,7 +102,7 @@ default ResourceAttributeDefinition findAttributeDefinition(String name) */ default boolean isPrimaryIdentifier(QName attrName) { return getPrimaryIdentifiers().stream() - .anyMatch(idDef -> QNameUtil.match(idDef.getName(), attrName)); + .anyMatch(idDef -> QNameUtil.match(idDef.getItemName(), attrName)); } /** @@ -128,7 +128,7 @@ default boolean isPrimaryIdentifier(QName attrName) { */ default boolean isSecondaryIdentifier(QName attrName) { return getSecondaryIdentifiers().stream() - .anyMatch(idDef -> QNameUtil.match(idDef.getName(), attrName)); + .anyMatch(idDef -> QNameUtil.match(idDef.getItemName(), attrName)); } /** diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java index 4ecb36e0209..6c10ad5ea0a 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinitionImpl.java @@ -288,20 +288,20 @@ public void setDisplayNameAttribute(QName displayName) { @NotNull @Override public ResourceAttributeContainer instantiate() { - return instantiate(getName()); + return instantiate(getItemName()); } @NotNull @Override public ResourceAttributeContainer instantiate(QName name) { - name = DefinitionUtil.addNamespaceIfApplicable(name, this.name); + name = DefinitionUtil.addNamespaceIfApplicable(name, this.itemName); return new ResourceAttributeContainerImpl(name, this, prismContext); } @NotNull @Override public ResourceAttributeContainerDefinitionImpl clone() { - ResourceAttributeContainerDefinitionImpl clone = new ResourceAttributeContainerDefinitionImpl(name, + ResourceAttributeContainerDefinitionImpl clone = new ResourceAttributeContainerDefinitionImpl(itemName, (ObjectClassComplexTypeDefinition)complexTypeDefinition.clone(), prismContext); copyDefinitionData(clone); return clone; @@ -328,7 +328,7 @@ public ResourceAttributeDefinition findAttributeDefinition(ItemPath elementPath) @Override public ResourceAttributeDefinition findAttributeDefinition(String elementLocalname) { - ItemName elementQName = new ItemName(getName().getNamespaceURI(),elementLocalname); + ItemName elementQName = new ItemName(getItemName().getNamespaceURI(),elementLocalname); return findAttributeDefinition(elementQName); } @@ -386,7 +386,7 @@ public String debugDump(int indent) { @Override public String toString() { StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()).append(":").append(getName()).append(" (").append(getTypeName()).append(")"); + sb.append(getClass().getSimpleName()).append(":").append(getItemName()).append(" (").append(getTypeName()).append(")"); if (isDefaultInAKind()) { sb.append(" def"); } diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerImpl.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerImpl.java index ca814dceb05..d38cfb917a4 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerImpl.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerImpl.java @@ -201,7 +201,7 @@ public Collection> extractAttributesByDefinitions( Collection> attributes = new ArrayList<>(definitions.size()); for (ResourceAttributeDefinition attrDef : definitions) { for (ResourceAttribute property : getAttributes()){ - if (attrDef.getName().equals(property.getElementName())){ + if (attrDef.getItemName().equals(property.getElementName())){ property.setDefinition(attrDef); attributes.add(property); } diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java index 78b5a2f0c02..a3be9d0c325 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/processor/ResourceAttributeDefinitionImpl.java @@ -57,13 +57,13 @@ public ResourceAttributeDefinitionImpl(QName elementName, QName typeName, PrismC @NotNull @Override public ResourceAttribute instantiate() { - return instantiate(getName()); + return instantiate(getItemName()); } @NotNull @Override public ResourceAttribute instantiate(QName name) { - name = addNamespaceIfApplicable(name, this.name); + name = addNamespaceIfApplicable(name, this.itemName); return new ResourceAttributeImpl<>(name, this, prismContext); } @@ -166,7 +166,7 @@ public void setFrameworkAttributeName(String frameworkAttributeName) { @NotNull @Override public ResourceAttributeDefinitionImpl clone() { - ResourceAttributeDefinitionImpl clone = new ResourceAttributeDefinitionImpl<>(getName(), getTypeName(), getPrismContext()); + ResourceAttributeDefinitionImpl clone = new ResourceAttributeDefinitionImpl<>(getItemName(), getTypeName(), getPrismContext()); copyDefinitionData(clone); return clone; } diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java index 1d075680758..8f1104dd31d 100644 --- a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java +++ b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java @@ -707,7 +707,7 @@ public static void validateObjectClassDefinition(ObjectClassComplexTypeDefinitio PrismObject resource) throws SchemaException { Set attributeNames = new HashSet<>(); for (ResourceAttributeDefinition attributeDefinition: objectClassDefinition.getAttributeDefinitions()) { - QName attrName = attributeDefinition.getName(); + QName attrName = attributeDefinition.getItemName(); if (attributeNames.contains(attrName)) { throw new SchemaException("Duplicate definition of attribute "+attrName+" in object class "+objectClassDefinition.getTypeName()+" in resource schema of "+resource); } diff --git a/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java b/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java index 59fb76f68d8..18bcb22069a 100644 --- a/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java +++ b/infra/schema/src/test/java/com/evolveum/midpoint/schema/TestQueryConverter.java @@ -284,7 +284,7 @@ public void testTypeFilterQuery() throws Exception { assertNotNull("filter in type filter must not be null", typeFilter.getFilter()); ItemPath namePath = UserType.F_NAME; PrismPropertyDefinition ppd = getUserDefinition().findPropertyDefinition(namePath); - PrismAsserts.assertEqualsFilter(typeFilter.getFilter(), ppd.getName(), ppd.getTypeName(), namePath); + PrismAsserts.assertEqualsFilter(typeFilter.getFilter(), ppd.getItemName(), ppd.getTypeName(), namePath); PrismAsserts.assertEqualsFilterValue((EqualFilter) typeFilter.getFilter(), PrismTestUtil.createPolyString("some name identificator")); // PrismAsserts.assertEqualsFilter(query.getFilter(), ConnectorType.F_CONNECTOR_TYPE, DOMUtil.XSD_STRING, // prismContext.path(ConnectorType.F_CONNECTOR_TYPE)); diff --git a/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java b/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java index e0f21d42912..30f7a8f91b2 100644 --- a/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java +++ b/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/SchemaProcessorTest.java @@ -126,29 +126,29 @@ public void testRoundTripGeneric() throws SchemaException { // THEN PrismPropertyDefinition number1def = newSchema.findItemDefinitionByElementName(new ItemName(SCHEMA_NS,"number1"), PrismPropertyDefinition.class); - assertEquals(new ItemName(SCHEMA_NS,"number1"),number1def.getName()); + assertEquals(new ItemName(SCHEMA_NS,"number1"),number1def.getItemName()); assertEquals(DOMUtil.XSD_INT,number1def.getTypeName()); PrismContainerDefinition newContainerDef = schema.findContainerDefinitionByType(new ItemName(SCHEMA_NS,"ContainerType")); assertEquals(new ItemName(SCHEMA_NS,"ContainerType"),newContainerDef.getTypeName()); PrismPropertyDefinition loginDef = newContainerDef.findPropertyDefinition(new ItemName(SCHEMA_NS,"login")); - assertEquals(new ItemName(SCHEMA_NS,"login"), loginDef.getName()); + assertEquals(new ItemName(SCHEMA_NS,"login"), loginDef.getItemName()); assertEquals(DOMUtil.XSD_STRING, loginDef.getTypeName()); assertTrue("Read flag is wrong",loginDef.canRead()); assertTrue("Create flag is wrong",loginDef.canAdd()); assertTrue("Update flag is wrong",loginDef.canModify()); PrismPropertyDefinition passwdDef = newContainerDef.findPropertyDefinition(new ItemName(SCHEMA_NS,"password")); - assertEquals(new ItemName(SCHEMA_NS,"password"), passwdDef.getName()); + assertEquals(new ItemName(SCHEMA_NS,"password"), passwdDef.getItemName()); assertEquals(ProtectedStringType.COMPLEX_TYPE, passwdDef.getTypeName()); PrismPropertyDefinition credDef = newContainerDef.findPropertyDefinition(new ItemName(SchemaConstants.NS_C,"credentials")); - assertEquals(new ItemName(SchemaConstants.NS_C,"credentials"), credDef.getName()); + assertEquals(new ItemName(SchemaConstants.NS_C,"credentials"), credDef.getItemName()); assertEquals(new ItemName(SchemaConstants.NS_C,"CredentialsType"), credDef.getTypeName()); PrismPropertyDefinition countDef = newContainerDef.findPropertyDefinition(new ItemName(SCHEMA_NS,"counter")); - assertEquals(new ItemName(SCHEMA_NS,"counter"), countDef.getName()); + assertEquals(new ItemName(SCHEMA_NS,"counter"), countDef.getItemName()); assertEquals(DOMUtil.XSD_INT, countDef.getTypeName()); assertTrue("Read flag is wrong",countDef.canRead()); assertFalse("Create flag is wrong",countDef.canAdd()); @@ -170,7 +170,7 @@ public void testRoundTripResource() throws SchemaException { ResourceAttributeDefinitionImpl xloginDef = containerDefinition.createAttributeDefinition("login", DOMUtil.XSD_STRING); containerDefinition.addPrimaryIdentifier(xloginDef); xloginDef.setNativeAttributeName("LOGIN"); - containerDefinition.setDisplayNameAttribute(xloginDef.getName()); + containerDefinition.setDisplayNameAttribute(xloginDef.getItemName()); // ... and local property with a type from another schema ResourceAttributeDefinitionImpl xpasswdDef = containerDefinition.createAttributeDefinition("password", ProtectedStringType.COMPLEX_TYPE); xpasswdDef.setNativeAttributeName("PASSWORD"); @@ -211,12 +211,12 @@ public void testRoundTripResource() throws SchemaException { assertTrue(newObjectClassDef.isDefaultInAKind()); PrismPropertyDefinition loginDef = newObjectClassDef.findPropertyDefinition(new ItemName(SCHEMA_NS,"login")); - assertEquals(new ItemName(SCHEMA_NS,"login"), loginDef.getName()); + assertEquals(new ItemName(SCHEMA_NS,"login"), loginDef.getItemName()); assertEquals(DOMUtil.XSD_STRING, loginDef.getTypeName()); assertFalse(loginDef.isIgnored()); PrismPropertyDefinition passwdDef = newObjectClassDef.findPropertyDefinition(new ItemName(SCHEMA_NS,"password")); - assertEquals(new ItemName(SCHEMA_NS,"password"), passwdDef.getName()); + assertEquals(new ItemName(SCHEMA_NS,"password"), passwdDef.getItemName()); assertEquals(ProtectedStringType.COMPLEX_TYPE, passwdDef.getTypeName()); assertFalse(passwdDef.isIgnored()); @@ -226,7 +226,7 @@ public void testRoundTripResource() throws SchemaException { // assertFalse(credDef.isIgnored()); PrismPropertyDefinition sepDef = newObjectClassDef.findPropertyDefinition(new ItemName(SCHEMA_NS,"sep")); - assertEquals(new ItemName(SCHEMA_NS,"sep"), sepDef.getName()); + assertEquals(new ItemName(SCHEMA_NS,"sep"), sepDef.getItemName()); assertEquals(DOMUtil.XSD_STRING, sepDef.getTypeName()); assertTrue(sepDef.isIgnored()); diff --git a/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java b/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java index 8d07a189c2a..d4945f8d013 100644 --- a/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java +++ b/infra/schema/src/test/java/com/evolveum/midpoint/schema/processor/TestResourceSchema.java @@ -125,17 +125,17 @@ private void assertSimpleSchema(ResourceSchema schema, String filename) { assertTrue("Not a default account", accDef.isDefaultInAKind()); PrismPropertyDefinition loginAttrDef = accDef.findPropertyDefinition(new ItemName(SCHEMA_NAMESPACE, "login")); - assertEquals(new ItemName(SCHEMA_NAMESPACE, "login"), loginAttrDef.getName()); + assertEquals(new ItemName(SCHEMA_NAMESPACE, "login"), loginAttrDef.getItemName()); assertEquals(DOMUtil.XSD_STRING, loginAttrDef.getTypeName()); assertFalse("Ignored while it should not be", loginAttrDef.isIgnored()); PrismPropertyDefinition groupAttrDef = accDef.findPropertyDefinition(new ItemName(SCHEMA_NAMESPACE, "group")); - assertEquals(new ItemName(SCHEMA_NAMESPACE, "group"), groupAttrDef.getName()); + assertEquals(new ItemName(SCHEMA_NAMESPACE, "group"), groupAttrDef.getItemName()); assertEquals(DOMUtil.XSD_INT, groupAttrDef.getTypeName()); assertFalse("Ignored while it should not be", groupAttrDef.isIgnored()); PrismPropertyDefinition ufoAttrDef = accDef.findPropertyDefinition(new ItemName(SCHEMA_NAMESPACE, "ufo")); - assertEquals(new ItemName(SCHEMA_NAMESPACE, "ufo"), ufoAttrDef.getName()); + assertEquals(new ItemName(SCHEMA_NAMESPACE, "ufo"), ufoAttrDef.getItemName()); assertTrue("Not ignored as it should be", ufoAttrDef.isIgnored()); ObjectClassComplexTypeDefinition groupDef = schema.findObjectClassDefinition(new ItemName(SCHEMA_NAMESPACE, "GroupObjectClass")); @@ -239,11 +239,11 @@ private void assertResourceSchema(ResourceSchema unSchema) { assertTrue("AccountObjectClass class not a DEFAULT account", objectClassDef.isDefaultInAKind()); PrismPropertyDefinition loginDef = objectClassDef.findPropertyDefinition(new ItemName(SCHEMA_NAMESPACE,"login")); - assertEquals(new ItemName(SCHEMA_NAMESPACE,"login"), loginDef.getName()); + assertEquals(new ItemName(SCHEMA_NAMESPACE,"login"), loginDef.getItemName()); assertEquals(DOMUtil.XSD_STRING, loginDef.getTypeName()); PrismPropertyDefinition passwdDef = objectClassDef.findPropertyDefinition(new ItemName(SCHEMA_NAMESPACE,"password")); - assertEquals(new ItemName(SCHEMA_NAMESPACE,"password"), passwdDef.getName()); + assertEquals(new ItemName(SCHEMA_NAMESPACE,"password"), passwdDef.getItemName()); assertEquals(ProtectedStringType.COMPLEX_TYPE, passwdDef.getTypeName()); // PrismContainerDefinition credDef = objectClassDef.findContainerDefinition(new SingleNamePath(SchemaConstants.NS_C,"credentials")); @@ -342,7 +342,7 @@ private ResourceSchema createResourceSchema() { ((Collection)containerDefinition.getPrimaryIdentifiers()).add(icfUidDef); ResourceAttributeDefinitionImpl xloginDef = containerDefinition.createAttributeDefinition("login", DOMUtil.XSD_STRING); xloginDef.setNativeAttributeName("LOGIN"); - containerDefinition.setDisplayNameAttribute(xloginDef.getName()); + containerDefinition.setDisplayNameAttribute(xloginDef.getItemName()); // ... and local property with a type from another schema ResourceAttributeDefinitionImpl xpasswdDef = containerDefinition.createAttributeDefinition("password", ProtectedStringType.COMPLEX_TYPE); xpasswdDef.setNativeAttributeName("PASSWORD"); diff --git a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java index 510788669b9..8a55e64f900 100644 --- a/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java +++ b/model/model-common/src/main/java/com/evolveum/midpoint/model/common/mapping/MappingImpl.java @@ -197,7 +197,7 @@ public ObjectResolver getObjectResolver() { public QName getItemName() { if (outputDefinition != null) { - return outputDefinition.getName(); + return outputDefinition.getItemName(); } return null; } @@ -608,7 +608,7 @@ private void checkRangeTarget(Task task, OperationResult result) if (outputPath != null) { name = outputPath.lastName().getLocalPart(); } else { - name = outputDefinition.getName().getLocalPart(); + name = outputDefinition.getItemName().getLocalPart(); } if (originalTargetValues == null) { throw new IllegalStateException("Couldn't check range for mapping in " + contextDescription + ", as original target values are not known."); @@ -1493,7 +1493,7 @@ private String getMappingDisplayName() { if (outputDefinition == null) { return null; } - return SchemaDebugUtil.prettyPrint(outputDefinition.getName()); + return SchemaDebugUtil.prettyPrint(outputDefinition.getItemName()); } private String toStringStrength() { diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java index 6cd4931bb1a..5fe7f1e66cd 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/ModelInteractionServiceImpl.java @@ -465,11 +465,11 @@ public RefinedObjectClassDefinition getEditObjectClassDefinition(PrismObject void applySecurityConstraintsItemDef(D itemDe PrismContainerDefinition containerDefinition = (PrismContainerDefinition)itemDefinition; List subDefinitions = ((PrismContainerDefinition)containerDefinition).getDefinitions(); for (ItemDefinition subDef: subDefinitions) { - ItemPath subPath = ItemPath.create(nameOnlyItemPath, subDef.getName()); + ItemPath subPath = ItemPath.create(nameOnlyItemPath, subDef.getItemName()); if (subDef.isElaborate()) { LOGGER.trace("applySecurityConstraints(itemDef): {}: skip (elaborate)", subPath); continue; } - if (!subDef.getName().equals(ShadowType.F_ATTRIBUTES)) { // Shadow attributes have special handling + if (!subDef.getItemName().equals(ShadowType.F_ATTRIBUTES)) { // Shadow attributes have special handling applySecurityConstraintsItemDef(subDef, definitionsSeen, subPath, securityConstraints, readDecision, addDecision, modifyDecision, phase); } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java index c33614f7af4..ab48bd48da1 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/DataModelVisualizerImpl.java @@ -133,9 +133,9 @@ private void processResourceMappings(DataModel model, List> re if (attributeDefinition.isIgnored()) { continue; } - LOGGER.debug("Registering refined attribute definition for {}", attributeDefinition.getName()); - ResourceDataItem attrItem = new ResourceDataItem(model, resource.getOid(), kind, intent, refinedResourceSchema, refinedDefinition, attributeDefinition.getName()); + LOGGER.debug("Registering refined attribute definition for {}", attributeDefinition.getItemName()); + ResourceDataItem attrItem = new ResourceDataItem(model, resource.getOid(), kind, intent, refinedResourceSchema, refinedDefinition, attributeDefinition.getItemName()); attrItem.setRefinedAttributeDefinition(attributeDefinition); // TODO check the name model.registerDataItem(attrItem); diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/dot/DotModel.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/dot/DotModel.java index 543f133b2f5..fcb318294ee 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/dot/DotModel.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/dataModel/dot/DotModel.java @@ -116,7 +116,7 @@ public String exportDot() { if (attrDef.isIgnored()) { continue; } - ResourceDataItem item = dataModel.findResourceItem(resource.getOid(), def.getKind(), def.getIntent(), getObjectClassName(def), attrDef.getName()); + ResourceDataItem item = dataModel.findResourceItem(resource.getOid(), def.getKind(), def.getIntent(), getObjectClassName(def), attrDef.getItemName()); previousNodeName = addResourceItem(itemsShown, indent, sb1, previousNodeName, item); } for (RefinedAssociationDefinition assocDef : def.getAssociationDefinitions()) { diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java index 43eb4551ae0..3188d95e55b 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/expr/MidpointFunctionsImpl.java @@ -619,7 +619,7 @@ private Integer countAccounts(ResourceType resourceType, QName attributeName RefinedObjectClassDefinition rAccountDef = rSchema.getDefaultRefinedDefinition(ShadowKindType.ACCOUNT); RefinedAttributeDefinition attrDef = rAccountDef.findAttributeDefinition(attributeName); ObjectQuery query = prismContext.queryFor(ShadowType.class) - .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getName()).eq(attributeValue) + .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq(attributeValue) .and().item(ShadowType.F_OBJECT_CLASS).eq(rAccountDef.getObjectClassDefinition().getTypeName()) .and().item(ShadowType.F_RESOURCE_REF).ref(resourceType.getOid()) .build(); @@ -734,7 +734,7 @@ private boolean isUniqueAccountValue(ResourceType resourceType, final Shadow RefinedObjectClassDefinition rAccountDef = rSchema.getDefaultRefinedDefinition(ShadowKindType.ACCOUNT); RefinedAttributeDefinition attrDef = rAccountDef.findAttributeDefinition(attributeName); ObjectQuery query = prismContext.queryFor(ShadowType.class) - .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getName()).eq(attributeValue) + .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq(attributeValue) .and().item(ShadowType.F_OBJECT_CLASS).eq(rAccountDef.getObjectClassDefinition().getTypeName()) .and().item(ShadowType.F_RESOURCE_REF).ref(resourceType.getOid()) .build(); diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java index 05a2860ad17..f965864c044 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java @@ -428,26 +428,26 @@ private void checkShadow(ShadowCheckResult checkResult, PrismObject } for (RefinedAttributeDefinition identifier : identifiers) { - PrismProperty property = attributesContainer.getValue().findProperty(identifier.getName()); + PrismProperty property = attributesContainer.getValue().findProperty(identifier.getItemName()); if (property == null || property.size() == 0) { - checkResult.recordWarning(ShadowStatistics.OTHER_FAILURE, "No value for identifier " + identifier.getName()); + checkResult.recordWarning(ShadowStatistics.OTHER_FAILURE, "No value for identifier " + identifier.getItemName()); continue; } if (property.size() > 1) { // we don't expect multi-valued identifiers checkResult.recordError( - ShadowStatistics.OTHER_FAILURE, new SchemaException("Multi-valued identifier " + identifier.getName() + " with values " + property.getValues())); + ShadowStatistics.OTHER_FAILURE, new SchemaException("Multi-valued identifier " + identifier.getItemName() + " with values " + property.getValues())); continue; } // size == 1 String value = (String) property.getValue().getValue(); if (value == null) { - checkResult.recordWarning(ShadowStatistics.OTHER_FAILURE, "Null value for identifier " + identifier.getName()); + checkResult.recordWarning(ShadowStatistics.OTHER_FAILURE, "Null value for identifier " + identifier.getItemName()); continue; } if (checkUniqueness) { if (!checkDuplicatesOnPrimaryIdentifiersOnly || primaryIdentifiers.contains(identifier)) { - addIdentifierValue(checkResult, context, identifier.getName(), value, shadow); + addIdentifierValue(checkResult, context, identifier.getItemName(), value, shadow); } } if (checkNormalization) { @@ -580,7 +580,7 @@ private void doCheckNormalization(ShadowCheckResult checkResult, RefinedAttribut } catch (SchemaException e) { checkResult.recordError( ShadowStatistics.OTHER_FAILURE, new SchemaException("Couldn't retrieve matching rule for identifier " + - identifier.getName() + " (rule name = " + matchingRuleQName + ")")); + identifier.getItemName() + " (rule name = " + matchingRuleQName + ")")); return; } @@ -588,7 +588,7 @@ ShadowStatistics.OTHER_FAILURE, new SchemaException("Couldn't retrieve matching if (!(normalizedValue instanceof String)) { checkResult.recordError( ShadowStatistics.OTHER_FAILURE, new SchemaException("Normalized value is not a string, it's " + normalizedValue.getClass() + - " (identifier " + identifier.getName() + ", value " + value)); + " (identifier " + identifier.getItemName() + ", value " + value)); return; } if (value.equals(normalizedValue)) { @@ -597,11 +597,11 @@ ShadowStatistics.OTHER_FAILURE, new SchemaException("Normalized value is not a s String normalizedStringValue = (String) normalizedValue; checkResult.recordError(ShadowStatistics.NON_NORMALIZED_IDENTIFIER_VALUE, - new SchemaException("Non-normalized value of identifier " + identifier.getName() + new SchemaException("Non-normalized value of identifier " + identifier.getItemName() + ": " + value + " (normalized form: " + normalizedValue + ")")); if (fixNormalization) { - PropertyDelta delta = identifier.createEmptyDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, identifier.getName())); + PropertyDelta delta = identifier.createEmptyDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, identifier.getItemName())); delta.setRealValuesToReplace(normalizedStringValue); checkResult.addFixDelta(delta, ShadowStatistics.NON_NORMALIZED_IDENTIFIER_VALUE); } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java index b9a969b1c83..2afd724b8b0 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/MappingEvaluator.java @@ -636,7 +636,7 @@ public void setOutputDefinition(ItemDefinition outputDefinition) { @Override public ValuePolicyType resolve() { // TODO need to switch to ObjectValuePolicyEvaluator - if (outputDefinition.getName().equals(PasswordType.F_VALUE)) { + if (outputDefinition.getItemName().equals(PasswordType.F_VALUE)) { ValuePolicyType passwordPolicy = credentialsProcessor.determinePasswordPolicy(context.getFocusContext(), task, result); if (passwordPolicy == null) { return null; @@ -652,7 +652,7 @@ public ValuePolicyType resolve() { ObjectReferenceType ref = ((GenerateExpressionEvaluatorType) object).getValuePolicyRef(); try { ValuePolicyType valuePolicyType = mappingFactory.getObjectResolver().resolve(ref, ValuePolicyType.class, - null, "resolving value policy for generate attribute "+ outputDefinition.getName()+" value", task, new OperationResult("Resolving value policy")); + null, "resolving value policy for generate attribute "+ outputDefinition.getItemName()+" value", task, new OperationResult("Resolving value policy")); if (valuePolicyType != null) { return valuePolicyType; } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java index 1a998405eb6..a1d58bad093 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/OutboundProcessor.java @@ -143,7 +143,7 @@ public void processOutbound(LensContext context, LensPr } MappingImpl.Builder,RefinedAttributeDefinition> builder = mappingFactory.createMappingBuilder(outboundMappingType, - "outbound mapping for " + PrettyPrinter.prettyPrint(refinedAttributeDefinition.getName()) + "outbound mapping for " + PrettyPrinter.prettyPrint(refinedAttributeDefinition.getItemName()) + " in " + projCtx.getResource()); builder = builder.originObject(projCtx.getResource()) .originType(OriginType.OUTBOUND); @@ -283,7 +283,7 @@ public ValuePolicyType resolve() { ObjectReferenceType ref = ((GenerateExpressionEvaluatorType) object).getValuePolicyRef(); try { ValuePolicyType valuePolicyType = mappingBuilder.getObjectResolver().resolve(ref, ValuePolicyType.class, - null, "resolving value policy for generate attribute "+ outputDefinition.getName()+"value", task, new OperationResult("Resolving value policy")); + null, "resolving value policy for generate attribute "+ outputDefinition.getItemName()+"value", task, new OperationResult("Resolving value policy")); if (valuePolicyType != null) { return valuePolicyType; } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java index 38e75627297..5b7001a4f5e 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ProjectionValuesProcessor.java @@ -441,13 +441,13 @@ private boolean willResetIterationCounter(LensProjectionContext projectionContex } RefinedObjectClassDefinition oOcDef = projectionContext.getCompositeObjectClassDefinition(); for (RefinedAttributeDefinition identifierDef: oOcDef.getPrimaryIdentifiers()) { - ItemPath identifierPath = ItemPath.create(ShadowType.F_ATTRIBUTES, identifierDef.getName()); + ItemPath identifierPath = ItemPath.create(ShadowType.F_ATTRIBUTES, identifierDef.getItemName()); if (accountDelta.findPropertyDelta(identifierPath) != null) { return true; } } for (RefinedAttributeDefinition identifierDef: oOcDef.getSecondaryIdentifiers()) { - ItemPath identifierPath = ItemPath.create(ShadowType.F_ATTRIBUTES, identifierDef.getName()); + ItemPath identifierPath = ItemPath.create(ShadowType.F_ATTRIBUTES, identifierDef.getItemName()); if (accountDelta.findPropertyDelta(identifierPath) != null) { return true; } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java index 25c7b39028e..728430b201a 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ReconciliationProcessor.java @@ -308,7 +308,7 @@ private void reconcileMissingAuxiliaryObjectClassAttributes(LensProjectionContex for (QName deleteAuxOcName: deletedAuxObjectClassNames) { ObjectClassComplexTypeDefinition auxOcDef = refinedResourceSchema.findObjectClassDefinition(deleteAuxOcName); for (ResourceAttributeDefinition auxAttrDef: auxOcDef.getAttributeDefinitions()) { - QName auxAttrName = auxAttrDef.getName(); + QName auxAttrName = auxAttrDef.getItemName(); if (attributesToDelete.contains(auxAttrName)) { continue; } @@ -483,7 +483,7 @@ private void reconcileProjectionAttribute(QName attrName, // value. Skip it. // we cannot override it as it might have been legally // changed directly on the projection resource object - LOGGER.trace("Skipping reconciliation of value {} of the attribute {}: the mapping is not strong", shouldBeRealValue, attributeDefinition.getName().getLocalPart()); + LOGGER.trace("Skipping reconciliation of value {} of the attribute {}: the mapping is not strong", shouldBeRealValue, attributeDefinition.getItemName().getLocalPart()); continue; } if (!isInValues(valueMatcher, shouldBeRealValue, arePValues)) { @@ -781,7 +781,7 @@ private void decideIfTolerate(LensProjectionContext projCtx, for (PrismPropertyValue isPValue : arePValues) { if (matchPattern(attributeDefinition.getTolerantValuePattern(), isPValue, valueMatcher)){ - LOGGER.trace("Reconciliation: KEEPING value {} of the attribute {}: match with tolerant value pattern." , isPValue, attributeDefinition.getName().getLocalPart()); + LOGGER.trace("Reconciliation: KEEPING value {} of the attribute {}: match with tolerant value pattern." , isPValue, attributeDefinition.getItemName().getLocalPart()); continue; } @@ -911,14 +911,14 @@ private void recordDelta(ValueMatcher valueMatcher, LensProjectionContext ItemDelta existingDelta = null; if (projCtx.getSecondaryDelta() != null) { existingDelta = projCtx.getSecondaryDelta().findItemDelta( - ItemPath.create(parentPath, attrDef.getName())); + ItemPath.create(parentPath, attrDef.getItemName())); } if (LOGGER.isTraceEnabled()) { LOGGER.trace(" reconciliation will {} value of attribute {}: {} because {}", changeType, - PrettyPrinter.prettyPrint(attrDef.getName()), value, reason); + PrettyPrinter.prettyPrint(attrDef.getItemName()), value, reason); } - PropertyDelta attrDelta = prismContext.deltaFactory().property().create(parentPath, attrDef.getName(), attrDef); + PropertyDelta attrDelta = prismContext.deltaFactory().property().create(parentPath, attrDef.getItemName(), attrDef); PrismPropertyValue pValue = prismContext.itemFactory().createPropertyValue(value, OriginType.RECONCILIATION, originObject); if (changeType == ModificationType.ADD) { diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java index 255f5c9a2b3..634aa4e6c89 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ValueMatcher.java @@ -47,7 +47,7 @@ public static ValueMatcher createMatcher(RefinedAttributeDefinition rAttr try { matchingRule = matchingRuleRegistry.getMatchingRule(matchingRuleQName, rAttrDef.getTypeName()); } catch (SchemaException e) { - throw new SchemaException(e.getMessage()+", defined for attribute "+rAttrDef.getName(), e); + throw new SchemaException(e.getMessage()+", defined for attribute "+rAttrDef.getItemName(), e); } return new ValueMatcher<>(matchingRule); } diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java index 5929d6a39a7..ae5dbd60f0c 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/focus/InboundProcessor.java @@ -1252,7 +1252,7 @@ public void setOutputDefinition(ItemDefinition outputDefinition) { @Override public ValuePolicyType resolve() { - if (!outputDefinition.getName().equals(PasswordType.F_VALUE)) { + if (!outputDefinition.getItemName().equals(PasswordType.F_VALUE)) { return null; } ValuePolicyType passwordPolicy = credentialsProcessor.determinePasswordPolicy(context.getFocusContext(), task, result); diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java index 7e171dd3bc3..a869bb06dbf 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/util/DataModelUtil.java @@ -169,7 +169,7 @@ public static PathResolutionResult resolvePathForType(@NotNull Class resource, boolean expectSchema) { diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java index 9ff5934874b..4f875b7ce60 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestStrangeCases.java @@ -1411,9 +1411,9 @@ private void changeDefinition(QName piracyShip, QName piracyShipBroken) { PrismContainerDefinition extensionDefinition = userDef.getExtensionDefinition(); List extensionDefs = extensionDefinition.getComplexTypeDefinition().getDefinitions(); for (ItemDefinition itemDefinition : extensionDefs) { - if (itemDefinition.getName().equals(piracyShip)) { + if (itemDefinition.getItemName().equals(piracyShip)) { //iterator.remove(); // not possible as the collection is unmodifiable - itemDefinition.toMutable().setName(piracyShipBroken); + itemDefinition.toMutable().setItemName(piracyShipBroken); } } } diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java index 49292965d9f..12254a3dde4 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java index 8cc7fc1648e..8217a0530f3 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestMetaMeta.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2018 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java index 2e43dc8c110..b62314c08f6 100644 --- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java +++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2017 Evolveum + * Copyright (c) 2010-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java index 02254e4b20d..c8f7d3cc0cc 100644 --- a/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java +++ b/model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java @@ -1825,7 +1825,7 @@ protected ObjectQuery createAccountShadowQuery(String username, PrismObject uniqueAttributeDefs = getUniqueAttributesDefinitions(); LOGGER.trace("Checking uniqueness of attributes: {}", uniqueAttributeDefs); for (ResourceAttributeDefinition attrDef : uniqueAttributeDefs) { - PrismProperty attr = attributesContainer.findProperty(attrDef.getName()); + PrismProperty attr = attributesContainer.findProperty(attrDef.getItemName()); LOGGER.trace("Attempt to check uniqueness of {} (def {})", attr, attrDef); if (attr == null) { continue; @@ -204,7 +204,7 @@ private boolean checkAttributeUniqueness(PrismProperty identifier, RefinedObject //TODO: set matching rule instead of null ObjectQuery query = prismContext.queryFor(ShadowType.class) - .itemWithDef(identifier.getDefinition(), ShadowType.F_ATTRIBUTES, identifier.getDefinition().getName()) + .itemWithDef(identifier.getDefinition(), ShadowType.F_ATTRIBUTES, identifier.getDefinition().getItemName()) .eq(PrismValueCollectionsUtil.cloneCollection(identifierValues)) .and().item(ShadowType.F_OBJECT_CLASS).eq(accountDefinition.getObjectClassDefinition().getTypeName()) .and().item(ShadowType.F_RESOURCE_REF).ref(resourceType.getOid()) @@ -221,7 +221,7 @@ private boolean checkUniqueness(String oid, PrismProperty identifier, ObjectQuer RefinedObjectClassDefinition objectClassDefinition = provisioningContext.getObjectClassDefinition(); ResourceType resourceType = provisioningContext.getResource(); - if (useCache && Cache.isOk(resourceType.getOid(), oid, objectClassDefinition.getTypeName(), identifier.getDefinition().getName(), identifier.getValues(), cacheConfigurationManager)) { + if (useCache && Cache.isOk(resourceType.getOid(), oid, objectClassDefinition.getTypeName(), identifier.getDefinition().getItemName(), identifier.getValues(), cacheConfigurationManager)) { return true; } @@ -237,7 +237,7 @@ private boolean checkUniqueness(String oid, PrismProperty identifier, ObjectQuer } if (foundObjects.isEmpty()) { if (useCache) { - Cache.setOk(resourceType.getOid(), oid, objectClassDefinition.getTypeName(), identifier.getDefinition().getName(), identifier.getValues()); + Cache.setOk(resourceType.getOid(), oid, objectClassDefinition.getTypeName(), identifier.getDefinition().getItemName(), identifier.getValues()); } return true; } @@ -264,7 +264,7 @@ private boolean checkUniqueness(String oid, PrismProperty identifier, ObjectQuer // we do not cache "OK" here because the violation confirmer could depend on attributes/items that are not under our observations } else { if (useCache) { - Cache.setOk(resourceType.getOid(), oid, objectClassDefinition.getTypeName(), identifier.getDefinition().getName(), identifier.getValues()); + Cache.setOk(resourceType.getOid(), oid, objectClassDefinition.getTypeName(), identifier.getDefinition().getItemName(), identifier.getValues()); } return true; } @@ -325,11 +325,11 @@ public boolean canSkipChecking() return false; } else { for (RefinedAttributeDefinition definition : getUniqueAttributesDefinitions()) { - Object oldItem = shadowObjectOld.find(ItemPath.create(ShadowType.F_ATTRIBUTES, definition.getName())); - Object newItem = shadowObject.find(ItemPath.create(ShadowType.F_ATTRIBUTES, definition.getName())); + Object oldItem = shadowObjectOld.find(ItemPath.create(ShadowType.F_ATTRIBUTES, definition.getItemName())); + Object newItem = shadowObject.find(ItemPath.create(ShadowType.F_ATTRIBUTES, definition.getItemName())); if (!Objects.equals(oldItem, newItem)) { LOGGER.trace("Uniqueness check will not be skipped because identifier {} values do not match: old={}, new={}", - definition.getName(), oldItem, newItem); + definition.getItemName(), oldItem, newItem); return false; } } diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java index 57d3b57d724..f9954474c72 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java @@ -296,7 +296,7 @@ private ObjectQuery createQuery(RefinedAssociationDefinition assocDefTyp PrismPropertyValue normalized = prismContext.itemFactory().createPropertyValue(normalizedRealValue); LOGGER.trace("Converted entitlement filter value: {} ({}) def={}", normalized, normalized.getValue().getClass(), assocAttrDef); ObjectQuery query = prismContext.queryFor(ShadowType.class) - .item(ItemPath.create(ShadowType.F_ATTRIBUTES, assocAttrDef.getName()), assocAttrDef).eq(normalized) + .item(ItemPath.create(ShadowType.F_ATTRIBUTES, assocAttrDef.getItemName()), assocAttrDef).eq(normalized) .build(); query.setAllowPartialResults(true); return query; diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java index f80fa71dce9..603b6a9d0ca 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceObjectConverter.java @@ -155,7 +155,7 @@ public PrismObject locateResourceObject(ProvisioningContext ctx, RefinedAttributeDefinition secondaryIdentifierDef = secondaryIdentifierDefs.iterator().next(); ResourceAttribute secondaryIdentifier = null; for (ResourceAttribute identifier: identifiers) { - if (identifier.getElementName().equals(secondaryIdentifierDef.getName())) { + if (identifier.getElementName().equals(secondaryIdentifierDef.getItemName())) { secondaryIdentifier = identifier; } } @@ -175,7 +175,7 @@ public PrismObject locateResourceObject(ProvisioningContext ctx, secondaryIdentifierValue = null; } ObjectQuery query = prismContext.queryFor(ShadowType.class) - .itemWithDef(secondaryIdentifierDef, ShadowType.F_ATTRIBUTES, secondaryIdentifierDef.getName()).eq(secondaryIdentifierValue) + .itemWithDef(secondaryIdentifierDef, ShadowType.F_ATTRIBUTES, secondaryIdentifierDef.getItemName()).eq(secondaryIdentifierValue) .build(); final Holder> shadowHolder = new Holder<>(); ShadowResultHandler handler = new ShadowResultHandler() { @@ -209,7 +209,7 @@ private boolean hasAllIdentifiers(Collection> att for (RefinedAttributeDefinition identifierDef: identifierDefs) { boolean found = false; for(ResourceAttribute attribute: attributes) { - if (attribute.getElementName().equals(identifierDef.getName()) && !attribute.isEmpty()) { + if (attribute.getElementName().equals(identifierDef.getItemName()) && !attribute.isEmpty()) { found = true; } } diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java index c2c511077bf..2fd06c07597 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowCache.java @@ -1421,10 +1421,10 @@ private PrismObject refreshShadowAsyncStatus(ProvisioningContext ctx // If naming attribute is present in delta... ResourceAttributeDefinition namingAttribute = resourceAttrDefinition.getNamingAttribute(); if (namingAttribute != null) { - if (pendingDelta.hasItemDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, namingAttribute.getName()))) { + if (pendingDelta.hasItemDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, namingAttribute.getItemName()))) { // Retrieve a possible changed name per the defined naming attribute for the resource - ItemDelta namingAttributeDelta = pendingDelta.findItemDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, namingAttribute.getName())); + ItemDelta namingAttributeDelta = pendingDelta.findItemDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, namingAttribute.getItemName())); Collection valuesToReplace = namingAttributeDelta.getValuesToReplace(); Optional valueToReplace = valuesToReplace.stream().findFirst(); diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java index a8bd8f31174..9d9ea77d7f3 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ShadowManager.java @@ -580,7 +580,7 @@ private ObjectQuery createSearchShadowQuery(ProvisioningContext ctx, Collection< String normalizedIdentifierValue = (String) getNormalizedAttributeValue(identifierValue, rAttrDef); PrismPropertyDefinition def = (PrismPropertyDefinition) identifier.getDefinition(); - q = q.itemWithDef(def, ShadowType.F_ATTRIBUTES, def.getName()).eq(normalizedIdentifierValue).and(); + q = q.itemWithDef(def, ShadowType.F_ATTRIBUTES, def.getItemName()).eq(normalizedIdentifierValue).and(); } if (identifiers.size() < 1) { @@ -617,7 +617,7 @@ private ObjectQuery createSearchShadowQueryByPrimaryIdentifier(ProvisioningConte // TODO TODO TODO TODO: set matching rule instead of null PrismPropertyDefinition def = identifier.getDefinition(); return prismContext.queryFor(ShadowType.class) - .itemWithDef(def, ShadowType.F_ATTRIBUTES, def.getName()).eq(getNormalizedValue(identifier, ctx.getObjectClassDefinition())) + .itemWithDef(def, ShadowType.F_ATTRIBUTES, def.getItemName()).eq(getNormalizedValue(identifier, ctx.getObjectClassDefinition())) .and().item(ShadowType.F_OBJECT_CLASS).eq(resourceShadow.getPropertyRealValue(ShadowType.F_OBJECT_CLASS, QName.class)) .and().item(ShadowType.F_RESOURCE_REF).ref(ctx.getResourceOid()) .build(); @@ -1796,9 +1796,9 @@ private void computeUpdateShadowAttributeChanges(ProvisioningContext ctx, Collec RefinedObjectClassDefinition objectClassDefinition = ctx.getObjectClassDefinition(); CachingStategyType cachingStrategy = ProvisioningUtil.getCachingStrategy(ctx); for (RefinedAttributeDefinition attrDef: objectClassDefinition.getAttributeDefinitions()) { - if (ProvisioningUtil.shouldStoreAttributeInShadow(objectClassDefinition, attrDef.getName(), cachingStrategy)) { - ResourceAttribute resourceAttr = ShadowUtil.getAttribute(resourceShadow, attrDef.getName()); - PrismProperty repoAttr = repoShadow.findProperty(ItemPath.create(ShadowType.F_ATTRIBUTES, attrDef.getName())); + if (ProvisioningUtil.shouldStoreAttributeInShadow(objectClassDefinition, attrDef.getItemName(), cachingStrategy)) { + ResourceAttribute resourceAttr = ShadowUtil.getAttribute(resourceShadow, attrDef.getItemName()); + PrismProperty repoAttr = repoShadow.findProperty(ItemPath.create(ShadowType.F_ATTRIBUTES, attrDef.getItemName())); PropertyDelta attrDelta; if (resourceAttr == null && repoAttr == null) { continue; @@ -1806,7 +1806,7 @@ private void computeUpdateShadowAttributeChanges(ProvisioningContext ctx, Collec ResourceAttribute normalizedResourceAttribute = resourceAttr.clone(); normalizeAttribute(normalizedResourceAttribute, attrDef); if (repoAttr == null) { - attrDelta = attrDef.createEmptyDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, attrDef.getName())); + attrDelta = attrDef.createEmptyDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, attrDef.getItemName())); attrDelta.setValuesToReplace(PrismValueCollectionsUtil.cloneCollection(normalizedResourceAttribute.getValues())); } else { attrDelta = repoAttr.diff(normalizedResourceAttribute); @@ -1888,7 +1888,7 @@ private ObjectDelta computeShadowDelta(@NotNull ProvisioningContext if (attrDef == null) { throw new SchemaException("No definition of " + currentResourceAttrProperty.getElementName() + " in " + ocDef); } - if (ProvisioningUtil.shouldStoreAttributeInShadow(ocDef, attrDef.getName(), cachingStrategy)) { + if (ProvisioningUtil.shouldStoreAttributeInShadow(ocDef, attrDef.getItemName(), cachingStrategy)) { if (!currentResourceItem.isIncomplete()) { MatchingRule matchingRule = matchingRuleRegistry.getMatchingRule(attrDef.getMatchingRuleQName(), attrDef.getTypeName()); PrismProperty oldRepoAttributeProperty = oldRepoAttributesContainer.findProperty(currentResourceAttrProperty.getElementName()); @@ -1967,7 +1967,7 @@ private ObjectDelta computeShadowDelta(@NotNull ProvisioningContext RefinedAttributeDefinition attrDef = ocDef.findAttributeDefinition(oldRepoAttrProperty.getElementName()); PrismProperty currentAttribute = currentResourceAttributesContainer.findProperty(oldRepoAttrProperty.getElementName()); // note: incomplete attributes with no values are not here: they are found in currentResourceAttributesContainer - if (attrDef == null || !ProvisioningUtil.shouldStoreAttributeInShadow(ocDef, attrDef.getName(), cachingStrategy) || + if (attrDef == null || !ProvisioningUtil.shouldStoreAttributeInShadow(ocDef, attrDef.getItemName(), cachingStrategy) || currentAttribute == null) { // No definition for this property it should not be there or no current value: remove it from the shadow PropertyDelta oldRepoAttrPropDelta = oldRepoAttrProperty.createDelta(); diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java index 3a0feb18490..2ca14ec2146 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/util/ProvisioningUtil.java @@ -168,7 +168,7 @@ public static AttributesToReturn createAttributesToReturn(ProvisioningContext ct if (fetchStrategy == AttributeFetchStrategyType.EXPLICIT) { explicit.add(attributeDefinition); } else if (hasMinimal && (fetchStrategy != AttributeFetchStrategyType.MINIMAL || - SelectorOptions.hasToLoadPath(ctx.getPrismContext().toUniformPath(attributeDefinition.getName()), ctx.getGetOperationOptions(), false))) { + SelectorOptions.hasToLoadPath(ctx.getPrismContext().toUniformPath(attributeDefinition.getItemName()), ctx.getGetOperationOptions(), false))) { explicit.add(attributeDefinition); } } @@ -455,7 +455,7 @@ public static void cleanupShadowActivation(ActivationType a) { if (attributesDefinition == null) { throw new IllegalStateException("No definition for " + attributes); } - List identifiers = attributesDefinition.getAllIdentifiers().stream().map(ItemDefinition::getName).collect(Collectors.toList()); + List identifiers = attributesDefinition.getAllIdentifiers().stream().map(ItemDefinition::getItemName).collect(Collectors.toList()); List outstandingInRepo; PrismContainer repoAttributes = repoShadowBefore.findContainer(ShadowType.F_ATTRIBUTES); if (repoAttributes != null) { diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java index 27fa41d096f..749fb382542 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractBasicDummyTest.java @@ -1116,7 +1116,7 @@ public void test080TestAttributesToReturn() throws Exception { assertFalse("wrong isReturnDefaultAttributes", attributesToReturn.isReturnDefaultAttributes()); Collection attrs = new ArrayList<>(); for (ResourceAttributeDefinition attributeToReturnDef: attributesToReturn.getAttributesToReturn()) { - attrs.add(attributeToReturnDef.getName().getLocalPart()); + attrs.add(attributeToReturnDef.getItemName().getLocalPart()); } // No "memebers" attribute here PrismAsserts.assertSets("Wrong attribute to return", attrs, "uid", "name", "description", "cc"); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java index eac886a94b4..791f7ac5c3d 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/AbstractDummyTest.java @@ -272,7 +272,7 @@ protected void checkUniqueness(PrismObject object) throws LOGGER.info("item definition: {}", itemDef.debugDump()); //TODO: matching rule ObjectQuery query = prismContext.queryFor(ShadowType.class) - .itemWithDef(itemDef, ShadowType.F_ATTRIBUTES, itemDef.getName()).eq(getWillRepoIcfName()) + .itemWithDef(itemDef, ShadowType.F_ATTRIBUTES, itemDef.getItemName()).eq(getWillRepoIcfName()) .build(); System.out.println("Looking for shadows of \"" + getWillRepoIcfName() + "\" with filter " diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java index 83bc77e74ea..e0c4e9902c2 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummy.java @@ -2270,7 +2270,7 @@ private ObjectQuery createOnOffQuery() throws SchemaException { ObjectQuery query = prismContext.queryFor(ShadowType.class) .item(ShadowType.F_RESOURCE_REF).ref(RESOURCE_DUMMY_OID) .and().item(ShadowType.F_OBJECT_CLASS).eq(new QName(ResourceTypeUtil.getResourceNamespace(resourceType), SchemaConstants.ACCOUNT_OBJECT_CLASS_LOCAL_NAME)) - .and().itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getName()).eq("Sea Monkey") + .and().itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq("Sea Monkey") .and().item(ShadowType.F_DEAD).eq(true) .build(); display("Query", query); @@ -2289,7 +2289,7 @@ protected void testSeachIterativeSingleAttrFilter(final String TEST_NAME, QN ObjectClassComplexTypeDefinition objectClassDef = resourceSchema.findObjectClassDefinition(SchemaTestConstants.ACCOUNT_OBJECT_CLASS_LOCAL_NAME); ResourceAttributeDefinition attrDef = objectClassDef.findAttributeDefinition(attrQName); ObjectFilter filter = prismContext.queryFor(ShadowType.class) - .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getName()).eq(attrVal) + .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq(attrVal) .buildFilter(); testSeachIterative(TEST_NAME, filter, rootOptions, fullShadow, true, false, expectedAccountNames); } @@ -2302,8 +2302,8 @@ protected void testSeachIterativeAlternativeAttrFilter(final String TEST_NAM ResourceAttributeDefinition attr1Def = objectClassDef.findAttributeDefinition(attr1QName); ResourceAttributeDefinition attr2Def = objectClassDef.findAttributeDefinition(attr2QName); ObjectFilter filter = prismContext.queryFor(ShadowType.class) - .itemWithDef(attr1Def, ShadowType.F_ATTRIBUTES, attr1Def.getName()).eq(attr1Val) - .or().itemWithDef(attr2Def, ShadowType.F_ATTRIBUTES, attr2Def.getName()).eq(attr2Val) + .itemWithDef(attr1Def, ShadowType.F_ATTRIBUTES, attr1Def.getItemName()).eq(attr1Val) + .or().itemWithDef(attr2Def, ShadowType.F_ATTRIBUTES, attr2Def.getItemName()).eq(attr2Val) .buildFilter(); testSeachIterative(TEST_NAME, filter, rootOptions, fullShadow, false, true, expectedAccountNames); } @@ -4064,7 +4064,7 @@ public void test502ModifyProtectedAccountShadowAttributes() throws Exception { ResourceAttributeDefinition fullnameAttrDef = defaultAccountDefinition.findAttributeDefinition("fullname"); ResourceAttribute fullnameAttr = fullnameAttrDef.instantiate(); PropertyDelta fullnameDelta = fullnameAttr.createDelta(ItemPath.create(ShadowType.F_ATTRIBUTES, - fullnameAttrDef.getName())); + fullnameAttrDef.getItemName())); fullnameDelta.setRealValuesToReplace("Good Daemon"); ((Collection) modifications).add(fullnameDelta); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java index d57a7081a22..0c42a8f02ea 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyParallelism.java @@ -750,7 +750,7 @@ private ObjectQuery createGroupNameQuery(String groupName) throws SchemaExceptio ObjectClassComplexTypeDefinition objectClassDef = resourceSchema.findObjectClassDefinition(OBJECTCLAS_GROUP_LOCAL_NAME); ResourceAttributeDefinition attrDef = objectClassDef.findAttributeDefinition(SchemaConstants.ICFS_NAME); ObjectFilter nameFilter = prismContext.queryFor(ShadowType.class) - .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getName()).eq(groupName) + .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq(groupName) .buildFilter(); query.setFilter(ObjectQueryUtil.filterAnd(query.getFilter(), nameFilter, prismContext)); diff --git a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java index d1d3de21669..2ad4c9b6109 100644 --- a/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java +++ b/provisioning/provisioning-impl/src/test/java/com/evolveum/midpoint/provisioning/impl/dummy/TestDummyUuidNonUniqueName.java @@ -193,7 +193,7 @@ private void searchFettucini(int expectedNumberOfFettucinis) throws SchemaExcept ObjectQuery query = prismContext.queryFor(ShadowType.class) .item(ShadowType.F_RESOURCE_REF).ref(resource.getOid()) .and().item(ShadowType.F_OBJECT_CLASS).eq(new QName(dummyResourceCtl.getNamespace(), "AccountObjectClass")) - .and().itemWithDef(getIcfNameDefinition(), ShadowType.F_ATTRIBUTES, getIcfNameDefinition().getName()).eq(ACCOUNT_FETTUCINI_NAME) + .and().itemWithDef(getIcfNameDefinition(), ShadowType.F_ATTRIBUTES, getIcfNameDefinition().getItemName()).eq(ACCOUNT_FETTUCINI_NAME) .build(); // WHEN diff --git a/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java b/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java index 0516a8e8fa8..e2c97ad6c38 100644 --- a/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java +++ b/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java @@ -230,7 +230,7 @@ private ItemDefinition createPropertyDefinition(MutablePrismContainerDefiniti } } return configurationContainerDef.createPropertyDefinition( - new QName(configurationContainerDef.getName().getNamespaceURI(), propName), propType, minOccurs, maxOccurs); + new QName(configurationContainerDef.getItemName().getNamespaceURI(), propName), propType, minOccurs, maxOccurs); } @Override diff --git a/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java b/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java index 3e2633c103e..e98777baed8 100644 --- a/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java +++ b/provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/async/TransformationalAsyncUpdateMessageListener.java @@ -200,8 +200,8 @@ private Collection> getIdentifiers(UcfChangeType changeBean } else { throw new SchemaException("Change does not contain identifiers"); } - Set identifiers = ocDef.getAllIdentifiers().stream().map(ItemDefinition::getName).collect(Collectors.toSet()); - Set primaryIdentifiers = ocDef.getPrimaryIdentifiers().stream().map(ItemDefinition::getName).collect(Collectors.toSet()); + Set identifiers = ocDef.getAllIdentifiers().stream().map(ItemDefinition::getItemName).collect(Collectors.toSet()); + Set primaryIdentifiers = ocDef.getPrimaryIdentifiers().stream().map(ItemDefinition::getItemName).collect(Collectors.toSet()); Set primaryIdentifierRealValues = new HashSet<>(); for (Item attribute : attributesPcv.getItems()) { if (QNameUtil.matchAny(attribute.getElementName(), identifiers)) { diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java index 679dd90b126..fcdd5f45385 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdCapabilitiesAndSchemaParser.java @@ -508,7 +508,7 @@ private void parseResourceSchema(org.identityconnectors.framework.common.objects if (Name.NAME.equals(icfName)) { nameDefinition = attrDef; - if (uidDefinition != null && attrXsdName.equals(uidDefinition.getName())) { + if (uidDefinition != null && attrXsdName.equals(uidDefinition.getItemName())) { attrDef.setDisplayOrder(ConnectorFactoryConnIdImpl.ICFS_UID_DISPLAY_ORDER); uidDefinition = attrDef; hasUidDefinition = true; @@ -540,7 +540,7 @@ private void parseResourceSchema(org.identityconnectors.framework.common.objects } else { // Check conflict with UID definition - if (uidDefinition != null && attrXsdName.equals(uidDefinition.getName())) { + if (uidDefinition != null && attrXsdName.equals(uidDefinition.getItemName())) { attrDef.setDisplayOrder(ConnectorFactoryConnIdImpl.ICFS_UID_DISPLAY_ORDER); uidDefinition = attrDef; hasUidDefinition = true; @@ -615,8 +615,8 @@ private void parseResourceSchema(org.identityconnectors.framework.common.objects // Add schema annotations ocDef.toMutable().setNativeObjectClass(objectClassInfo.getType()); - ocDef.toMutable().setDisplayNameAttribute(nameDefinition.getName()); - ocDef.toMutable().setNamingAttribute(nameDefinition.getName()); + ocDef.toMutable().setDisplayNameAttribute(nameDefinition.getItemName()); + ocDef.toMutable().setNamingAttribute(nameDefinition.getItemName()); ocDef.toMutable().setAuxiliary(objectClassInfo.isAuxiliary()); LOGGER.trace(" ... converted object class {}: {}", objectClassInfo.getType(), ocDef); diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java index 87c08a97402..ffff7eeb1db 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdConvertor.java @@ -281,7 +281,7 @@ PrismObject convertToResourceObject(ConnectorObject co } if (caseIgnoreAttributeNames) { - qname = attributeDefinition.getName(); // normalized version + qname = attributeDefinition.getItemName(); // normalized version } ResourceAttribute resourceAttribute = attributeDefinition.instantiate(qname); @@ -330,7 +330,7 @@ PrismObject convertToResourceObject(ConnectorObject co throw new SchemaException("No definition for ConnId UID attribute found in definition " + ocDef); } - if (attributesContainer.getValue().findItem(uidDefinition.getName()) == null) { + if (attributesContainer.getValue().findItem(uidDefinition.getItemName()) == null) { ResourceAttribute uidRoa = uidDefinition.instantiate(); uidRoa.setRealValue(uid.getUidValue()); attributesContainer.getValue().add(uidRoa); diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdNameMapper.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdNameMapper.java index 90ba6732043..a635b87bc47 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdNameMapper.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnIdNameMapper.java @@ -119,7 +119,7 @@ public QName convertAttributeNameToQName(String icfAttrName, ObjectClassComplexT if (specialAttributeMapIcf.containsKey(icfAttrName)) { for (ResourceAttributeDefinition attributeDefinition: ocDef.getAttributeDefinitions()) { if (icfAttrName.equals(attributeDefinition.getFrameworkAttributeName())) { - return attributeDefinition.getName(); + return attributeDefinition.getItemName(); } } // fallback, compatibility @@ -133,12 +133,12 @@ public QName convertAttributeNameToQName(String icfAttrName, ObjectClassComplexT public QName convertAttributeNameToQName(String icfAttrName, ResourceAttributeDefinition attrDef) { if (specialAttributeMapIcf.containsKey(icfAttrName)) { if (icfAttrName.equals(attrDef.getFrameworkAttributeName())) { - return attrDef.getName(); + return attrDef.getItemName(); } // fallback, compatibility return specialAttributeMapIcf.get(icfAttrName); } - return attrDef.getName(); + return attrDef.getItemName(); } public String convertAttributeNameToConnId(PropertyDelta attributeDelta, ObjectClassComplexTypeDefinition ocDef) @@ -183,7 +183,7 @@ public String convertAttributeNameToConnId(ResourceAttributeDefinition attrDe return attrDef.getFrameworkAttributeName(); } - QName attrQName = attrDef.getName(); + QName attrQName = attrDef.getItemName(); if (specialAttributeMapMp.containsKey(attrQName)) { return specialAttributeMapMp.get(attrQName); } diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java index e2431b39b9c..b999ab1a153 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/ConnectorInstanceConnIdImpl.java @@ -1133,7 +1133,7 @@ private AsynchronousOperationReturnValue delta = prismContext.deltaFactory().property().create(ItemPath.create(ShadowType.F_ATTRIBUTES, - definition.getName()), definition); + definition.getItemName()), definition); if(attrDeltaSideEffect.getValuesToReplace() != null){ delta.setRealValuesToReplace(attrDeltaSideEffect.getValuesToReplace().get(0)); } else { @@ -1426,14 +1426,14 @@ private void replaceNameValue(ResourceObjectIdentification identification, Name } private PropertyDelta createNameDelta(Name name, ResourceAttributeDefinition nameDefinition) { - PropertyDelta uidDelta = prismContext.deltaFactory().property().create(ItemPath.create(ShadowType.F_ATTRIBUTES, nameDefinition.getName()), + PropertyDelta uidDelta = prismContext.deltaFactory().property().create(ItemPath.create(ShadowType.F_ATTRIBUTES, nameDefinition.getItemName()), nameDefinition); uidDelta.setRealValuesToReplace(name.getNameValue()); return uidDelta; } private PropertyDelta createUidDelta(Uid uid, ResourceAttributeDefinition uidDefinition) { - PropertyDelta uidDelta = prismContext.deltaFactory().property().create(ItemPath.create(ShadowType.F_ATTRIBUTES, uidDefinition.getName()), + PropertyDelta uidDelta = prismContext.deltaFactory().property().create(ItemPath.create(ShadowType.F_ATTRIBUTES, uidDefinition.getItemName()), uidDefinition); uidDelta.setRealValuesToReplace(uid.getUidValue()); return uidDelta; diff --git a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/query/ValueOperation.java b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/query/ValueOperation.java index c25c3aaa5d8..06ec524bc80 100644 --- a/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/query/ValueOperation.java +++ b/provisioning/ucf-impl-connid/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/query/ValueOperation.java @@ -58,7 +58,7 @@ public Filter interpret(ObjectFilter objectFilter, ConnIdNameMapper icfNameM } if (valueFilter.getParentPath().equivalent(ShadowType.F_ATTRIBUTES)) { try { - QName propName = valueFilter.getDefinition().getName(); + QName propName = valueFilter.getDefinition().getItemName(); String icfName = icfNameMapper.convertAttributeNameToConnId(propName, getInterpreter() .getObjectClassDefinition(), "(attribute in the filter)"); @@ -135,7 +135,7 @@ public Filter interpret(ObjectFilter objectFilter, ConnIdNameMapper icfNameM } else if (valueFilter.getParentPath().equivalent(ShadowType.F_ACTIVATION)) { if (objectFilter instanceof EqualFilter) { - QName propName = valueFilter.getDefinition().getName(); + QName propName = valueFilter.getDefinition().getItemName(); EqualFilter eq = (EqualFilter) objectFilter; List> values = eq.getValues(); if (values.size() != 1) { diff --git a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java index 12614bc54a5..457c483bd6e 100644 --- a/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java +++ b/provisioning/ucf-impl-connid/src/test/java/com/evolveum/midpoint/provisioning/ucf/impl/connid/TestUcfOpenDj.java @@ -568,7 +568,7 @@ public void test400FetchResourceSchema() throws Exception { // This is maybe not that important, but just for a sake of // completeness - assertNotEmpty("No name for " + rdef.getTypeName(), rdef.getName()); + assertNotEmpty("No name for " + rdef.getTypeName(), rdef.getItemName()); } } diff --git a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java index 55ff98eab6d..f6a153a8384 100644 --- a/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java +++ b/repo/repo-sql-impl-test/src/test/java/com/evolveum/midpoint/repo/sql/RAnyConverterStaticTest.java @@ -195,7 +195,7 @@ public void testExtensionEnum() throws Exception { AssertJUnit.assertNotNull(def); PrismProperty item = (PrismProperty) def.instantiate(); item.setRealValue(BeforeAfterType.AFTER); - def.toMutable().setName(valueName); + def.toMutable().setItemName(valueName); RAnyConverter converter = new RAnyConverter(prismContext, extItemDictionary); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java index e914598e794..71ed6f4c76f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RAnyConverter.java @@ -346,8 +346,8 @@ private static ValueType getValueType(QName qname) { */ public static String getAnySetType(ItemDefinition definition, PrismContext prismContext) throws SchemaException, QueryException { - if (!isIndexed(definition, definition.getName(), true, prismContext)) { - throw new QueryException("Can't query non-indexed value for '" + definition.getName() + if (!isIndexed(definition, definition.getItemName(), true, prismContext)) { + throw new QueryException("Can't query non-indexed value for '" + definition.getItemName() + "', definition " + definition); } QName typeName = definition.getTypeName(); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java index c6815f5e814..3fd957f5693 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/any/RExtItem.java @@ -143,7 +143,7 @@ public void setType(String type) { } public static RExtItem.Key createKeyFromDefinition(ItemDefinition definition) { - String name = RUtil.qnameToString(definition.getName()); + String name = RUtil.qnameToString(definition.getItemName()); String type = RUtil.qnameToString(definition.getTypeName()); RItemKind kind = RItemKind.getTypeFromItemDefinitionClass(definition.getClass()); return new Key(name, type, kind); diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java index 21685499be5..69c879acba5 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectDeltaUpdater.java @@ -513,7 +513,7 @@ private void handleExtensionDelta(ItemDelta delta, // todo consider simply returning with no action throw new IllegalStateException("Cannot process definition-less extension item: " + delta); } - RAnyConverter.ValueType valueType = RAnyConverter.getValueType(definition, definition.getName(), + RAnyConverter.ValueType valueType = RAnyConverter.getValueType(definition, definition.getItemName(), RAnyConverter.areDynamicsOfThisKindIndexed(objectExtensionType), prismContext); if (valueType == null) { return; diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java index f5587b577af..7bebad76c0f 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/helpers/ObjectRetriever.java @@ -628,7 +628,7 @@ private void loadIndexOnlyItemsIfNeeded(PrismObject pr RObject rObject = null; for (ItemDefinition itemDefinition : getIndexOnlyExtensionItems(prismObject)) { - if (SelectorOptions.hasToLoadPath(ItemPath.create(ObjectType.F_EXTENSION, itemDefinition.getName()), + if (SelectorOptions.hasToLoadPath(ItemPath.create(ObjectType.F_EXTENSION, itemDefinition.getItemName()), retrieveOptions, false)) { LOGGER.trace("We have to load index-only extension item {}", itemDefinition); if (rObject == null) { diff --git a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyItemLinkDefinition.java b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyItemLinkDefinition.java index 6dfa79dda1b..8754e18d5ac 100644 --- a/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyItemLinkDefinition.java +++ b/repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query2/definition/JpaAnyItemLinkDefinition.java @@ -31,7 +31,7 @@ public class JpaAnyItemLinkDefinition extends JpaLinkDefinition itemDefinition, String jpaName, CollectionSpecification collectionSpecification, RObjectExtensionType ownerType, JpaDataNodeDefinition targetDefinition) { - super(itemDefinition.getName(), jpaName, collectionSpecification, false, targetDefinition); + super(itemDefinition.getItemName(), jpaName, collectionSpecification, false, targetDefinition); this.ownerType = ownerType; this.itemDefinition = itemDefinition; } diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java index 02c8435bf96..f14f12e7320 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractHigherUnitTest.java @@ -300,8 +300,8 @@ public PolyString normalize(PolyString original) throws SchemaException { ObjectClassComplexTypeDefinition ocDef = rSchema.findObjectClassDefinition(objectClass); if (ocDef.getSecondaryIdentifiers().isEmpty()) { ResourceAttributeDefinition idDef = ocDef.getPrimaryIdentifiers().iterator().next(); - PrismProperty idProp = attributesContainer.findProperty(idDef.getName()); - assertNotNull("No primary identifier ("+idDef.getName()+") attribute in shadow for "+username, idProp); + PrismProperty idProp = attributesContainer.findProperty(idDef.getItemName()); + assertNotNull("No primary identifier ("+idDef.getItemName()+") attribute in shadow for "+username, idProp); if (nameMatchingRule == null) { assertEquals("Unexpected primary identifier in shadow for "+username, username, idProp.getRealValue()); } else { @@ -319,9 +319,9 @@ public PolyString normalize(PolyString original) throws SchemaException { } List wasValues = new ArrayList<>(); for (ResourceAttributeDefinition idSecDef: ocDef.getSecondaryIdentifiers()) { - PrismProperty idProp = attributesContainer.findProperty(idSecDef.getName()); + PrismProperty idProp = attributesContainer.findProperty(idSecDef.getItemName()); wasValues.addAll(idProp.getRealValues()); - assertNotNull("No secondary identifier ("+idSecDef.getName()+") attribute in shadow for "+username, idProp); + assertNotNull("No secondary identifier ("+idSecDef.getItemName()+") attribute in shadow for "+username, idProp); if (nameMatchingRule == null) { if (username.equals(idProp.getRealValue())) { found = true; @@ -350,8 +350,8 @@ protected void assertShadowSecondaryIdentifier(PrismObject shadow, S ObjectClassComplexTypeDefinition ocDef = rSchema.findObjectClassDefinition(shadow.asObjectable().getObjectClass()); ResourceAttributeDefinition idSecDef = ocDef.getSecondaryIdentifiers().iterator().next(); PrismContainer attributesContainer = shadow.findContainer(ShadowType.F_ATTRIBUTES); - PrismProperty idProp = attributesContainer.findProperty(idSecDef.getName()); - assertNotNull("No secondary identifier ("+idSecDef.getName()+") attribute in shadow for "+expectedIdentifier, idProp); + PrismProperty idProp = attributesContainer.findProperty(idSecDef.getItemName()); + assertNotNull("No secondary identifier ("+idSecDef.getItemName()+") attribute in shadow for "+expectedIdentifier, idProp); if (nameMatchingRule == null) { assertEquals("Unexpected secondary identifier in shadow for "+expectedIdentifier, expectedIdentifier, idProp.getRealValue()); } else { diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java index 451a16dcbd9..f69c1dfe8db 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.java @@ -819,8 +819,8 @@ public PolyString normalize(PolyString original) throws SchemaException { ObjectClassComplexTypeDefinition ocDef = rSchema.findObjectClassDefinition(objectClass); if (ocDef.getSecondaryIdentifiers().isEmpty()) { ResourceAttributeDefinition idDef = ocDef.getPrimaryIdentifiers().iterator().next(); - PrismProperty idProp = attributesContainer.findProperty(idDef.getName()); - assertNotNull("No primary identifier ("+idDef.getName()+") attribute in shadow for "+username, idProp); + PrismProperty idProp = attributesContainer.findProperty(idDef.getItemName()); + assertNotNull("No primary identifier ("+idDef.getItemName()+") attribute in shadow for "+username, idProp); if (nameMatchingRule == null) { assertEquals("Unexpected primary identifier in shadow for "+username, username, idProp.getRealValue()); } else { @@ -838,9 +838,9 @@ public PolyString normalize(PolyString original) throws SchemaException { } List wasValues = new ArrayList<>(); for (ResourceAttributeDefinition idSecDef: ocDef.getSecondaryIdentifiers()) { - PrismProperty idProp = attributesContainer.findProperty(idSecDef.getName()); + PrismProperty idProp = attributesContainer.findProperty(idSecDef.getItemName()); wasValues.addAll(idProp.getRealValues()); - assertNotNull("No secondary identifier ("+idSecDef.getName()+") attribute in shadow for "+username, idProp); + assertNotNull("No secondary identifier ("+idSecDef.getItemName()+") attribute in shadow for "+username, idProp); if (nameMatchingRule == null) { if (username.equals(idProp.getRealValue())) { found = true; @@ -869,8 +869,8 @@ protected void assertShadowSecondaryIdentifier(PrismObject shadow, S ObjectClassComplexTypeDefinition ocDef = rSchema.findObjectClassDefinition(shadow.asObjectable().getObjectClass()); ResourceAttributeDefinition idSecDef = ocDef.getSecondaryIdentifiers().iterator().next(); PrismContainer attributesContainer = shadow.findContainer(ShadowType.F_ATTRIBUTES); - PrismProperty idProp = attributesContainer.findProperty(idSecDef.getName()); - assertNotNull("No secondary identifier ("+idSecDef.getName()+") attribute in shadow for "+expectedIdentifier, idProp); + PrismProperty idProp = attributesContainer.findProperty(idSecDef.getItemName()); + assertNotNull("No secondary identifier ("+idSecDef.getItemName()+") attribute in shadow for "+expectedIdentifier, idProp); if (nameMatchingRule == null) { assertEquals("Unexpected secondary identifier in shadow for "+expectedIdentifier, expectedIdentifier, idProp.getRealValue()); } else { @@ -1127,7 +1127,7 @@ protected ObjectQuery createAccountShadowQuery(String identifier, PrismObject resource) throws SchemaException { ResourceAttributeDefinition attrDef = rAccount.findAttributeDefinition(attributeName); return prismContext.queryFor(ShadowType.class) - .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getName()).eq(attributeValue) + .itemWithDef(attrDef, ShadowType.F_ATTRIBUTES, attrDef.getItemName()).eq(attributeValue) .and().item(ShadowType.F_OBJECT_CLASS).eq(rAccount.getTypeName()) .and().item(ShadowType.F_RESOURCE_REF).ref(resource.getOid()) .build(); diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java index 1a989bde874..cb06f6b3763 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/IntegrationTestTools.java @@ -341,13 +341,13 @@ public static void assertProvisioningShadow(PrismObject account, Res assertNotNull("No object class definition in attributes definition", objectClassDef); assertEquals("Wrong object class in attributes definition", objectClass, objectClassDef.getTypeName()); ResourceAttributeDefinition primaryIdDef = objectClassDef.getPrimaryIdentifiers().iterator().next(); - ResourceAttribute primaryIdAttr = rAttributesContainer.findAttribute(primaryIdDef.getName()); - assertNotNull("No primary ID "+primaryIdDef.getName()+" in "+account, primaryIdAttr); + ResourceAttribute primaryIdAttr = rAttributesContainer.findAttribute(primaryIdDef.getItemName()); + assertNotNull("No primary ID "+primaryIdDef.getItemName()+" in "+account, primaryIdAttr); assertAttributeDefinition(primaryIdAttr, DOMUtil.XSD_STRING, 0, 1, true, false, false, expetcedAttributeDefinitionClass); ResourceAttributeDefinition secondaryIdDef = objectClassDef.getSecondaryIdentifiers().iterator().next(); - ResourceAttribute secondaryIdAttr = rAttributesContainer.findAttribute(secondaryIdDef.getName()); - assertNotNull("No secondary ID "+secondaryIdDef.getName()+" in "+account, secondaryIdAttr); + ResourceAttribute secondaryIdAttr = rAttributesContainer.findAttribute(secondaryIdDef.getItemName()); + assertNotNull("No secondary ID "+secondaryIdDef.getItemName()+" in "+account, secondaryIdAttr); assertAttributeDefinition(secondaryIdAttr, DOMUtil.XSD_STRING, 1, 1, true, true, true, expetcedAttributeDefinitionClass); } @@ -690,8 +690,8 @@ public static void checkShadow(ShadowType shadowType, ResourceType resourceType, Collection identifierDefs = objectClassDef.getPrimaryIdentifiers(); assertFalse("No identifiers for "+objectClassDef, identifierDefs == null || identifierDefs.isEmpty()); for (ResourceAttributeDefinition idDef: identifierDefs) { - String id = ShadowUtil.getSingleStringAttributeValue(shadowType, idDef.getName()); - assertNotNull("No identifier "+idDef.getName()+" in "+shadowType, id); + String id = ShadowUtil.getSingleStringAttributeValue(shadowType, idDef.getItemName()); + assertNotNull("No identifier "+idDef.getItemName()+" in "+shadowType, id); } } @@ -756,7 +756,7 @@ private static void checkShadowUniqueness(ShadowType resourceShadow, ObjectClass private static ObjectQuery createShadowQuery(ShadowType resourceShadow, ObjectClassComplexTypeDefinition objectClassDef, MatchingRule uidMatchingRule, PrismContext prismContext) throws SchemaException { PrismContainer attributesContainer = resourceShadow.asPrismObject().findContainer(ShadowType.F_ATTRIBUTES); - QName identifierName = objectClassDef.getPrimaryIdentifiers().iterator().next().getName(); + QName identifierName = objectClassDef.getPrimaryIdentifiers().iterator().next().getItemName(); PrismProperty identifier = attributesContainer.findProperty(ItemName.fromQName(identifierName)); if (identifier == null) { throw new SchemaException("No identifier in "+resourceShadow); @@ -769,7 +769,7 @@ private static ObjectQuery createShadowQuery(ShadowType resourceShadow, ObjectCl PrismPropertyDefinition identifierDef = identifier.getDefinition(); return prismContext.queryFor(ShadowType.class) .item(ShadowType.F_RESOURCE_REF).ref(ShadowUtil.getResourceOid(resourceShadow)) - .and().item(ItemPath.create(ShadowType.F_ATTRIBUTES, identifierDef.getName()), identifierDef).eq(identifierValue) + .and().item(ItemPath.create(ShadowType.F_ATTRIBUTES, identifierDef.getItemName()), identifierDef).eq(identifierValue) .build(); } diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismPropertyDefinitionAsserter.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismPropertyDefinitionAsserter.java index 1849e5eeff9..c94e2c55e18 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismPropertyDefinitionAsserter.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/prism/PrismPropertyDefinitionAsserter.java @@ -72,7 +72,7 @@ public PrismPropertyDefinition getDefinition() { } protected String desc() { - return descWithDetails("property definition " + PrettyPrinter.prettyPrint(getDefinition().getName())); + return descWithDetails("property definition " + PrettyPrinter.prettyPrint(getDefinition().getItemName())); } public PrismPropertyDefinitionAsserter display() { diff --git a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/refinedschema/ResourceAttributeDefinitionAsserter.java b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/refinedschema/ResourceAttributeDefinitionAsserter.java index c5a0179fdca..ae2b2ff8a9a 100644 --- a/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/refinedschema/ResourceAttributeDefinitionAsserter.java +++ b/repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/asserter/refinedschema/ResourceAttributeDefinitionAsserter.java @@ -115,7 +115,7 @@ public ResourceAttributeDefinitionAsserter assertNotSecondaryIdentifier() } protected String desc() { - return descWithDetails("resource attribute definition " + PrettyPrinter.prettyPrint(getDefinition().getName())); + return descWithDetails("resource attribute definition " + PrettyPrinter.prettyPrint(getDefinition().getItemName())); } public ResourceAttributeDefinitionAsserter display() { diff --git a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java index 8f1f994e908..07c488d9fb3 100644 --- a/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java +++ b/testing/conntest/src/test/java/com/evolveum/midpoint/testing/conntest/AbstractLdapTest.java @@ -494,7 +494,7 @@ protected void assertCapability(List capabili protected ObjectFilter createAttributeFilter(String attrName, T attrVal) throws SchemaException { ResourceAttributeDefinition ldapAttrDef = accountObjectClassDefinition.findAttributeDefinition(attrName); return prismContext.queryFor(ShadowType.class) - .itemWithDef(ldapAttrDef, ShadowType.F_ATTRIBUTES, ldapAttrDef.getName()).eq(attrVal) + .itemWithDef(ldapAttrDef, ShadowType.F_ATTRIBUTES, ldapAttrDef.getItemName()).eq(attrVal) .buildFilter(); } diff --git a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java index 41756b597ee..5620c978681 100644 --- a/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java +++ b/testing/sanity/src/test/java/com/evolveum/midpoint/testing/sanity/TestSanity.java @@ -2423,7 +2423,7 @@ public void test105ModifyAccount() throws Exception { ItemPath employeeTypePath = ItemPath.create(ShadowType.F_ATTRIBUTES, employeeTypeQName); PrismProperty item = shadow.findProperty(employeeTypePath); - PropertyDelta deleteDelta = prismContext.deltaFactory().property().create(ShadowType.F_ATTRIBUTES, item.getDefinition().getName(), item.getDefinition()); + PropertyDelta deleteDelta = prismContext.deltaFactory().property().create(ShadowType.F_ATTRIBUTES, item.getDefinition().getItemName(), item.getDefinition()); // PropertyDelta deleteDelta = PropertyDelta.createDelta(employeeTypePath, shadow.getDefinition()); // PrismPropertyValue valToDelte = new PrismPropertyValue("A"); // valToDelte.setParent(deleteDelta);