XWIKI-22702: Provide parentType information in EntityReference

* Minor improvment
xwiki · Dec 3, 2024 · a5f4f86 · a5f4f86
1 parent c5b9c60
commit a5f4f86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/...del/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java b/...del/xwiki-platform-model-api/src/main/java/org/xwiki/model/reference/EntityReference.java
@@ -25,6 +25,7 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TreeMap;
 
@@ -325,7 +326,7 @@ private void setParentTypeParameter(Serializable value)
             if (value instanceof EntityType entityType) {
                 parentType = entityType;
             } else {
-                parentType = EntityType.valueOf(value.toString());
+                parentType = EntityType.valueOf(value.toString().toUpperCase(Locale.ROOT));
             }
             if (getType().getAllowedParents().contains(parentType)) {
                 this.parameters.put(PARENT_TYPE_PARAMETER, parentType);

diff --git a/...xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java b/...xwiki-platform-model-api/src/test/java/org/xwiki/model/reference/EntityReferenceTest.java
@@ -673,5 +673,10 @@ void getParentType()
         exception = assertThrows(IllegalArgumentException.class, () ->
             new EntityReference(SPACE_NAME, EntityType.SPACE, parametersMap2));
         assertEquals("No enum constant org.xwiki.model.EntityType.42", exception.getMessage());
+
+        // custom type lowercase
+        spaceReference = new EntityReference(SPACE_NAME, EntityType.SPACE,
+            Map.of(EntityReference.PARENT_TYPE_PARAMETER, "space"));
+        assertEquals(EntityType.SPACE, spaceReference.getParentType());
     }
 }