Reducing accidental use of "object" element name.

Evolveum · Jul 16, 2014 · 58b31d9 · 58b31d9
1 parent 0be2653
commit 58b31d9
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/XNodeProcessor.java
@@ -69,7 +69,9 @@
 
 public class XNodeProcessor {
 
-	private PrismContext prismContext;
+    public static final String ARTIFICIAL_OBJECT_NAME = "anObject";
+
+    private PrismContext prismContext;
 
 	public XNodeProcessor() { }
 
@@ -135,7 +137,13 @@ public <O extends Objectable> PrismObject<O> parseObject(MapXNode xmap) throws S
 	}
 
 	private <O extends Objectable> PrismObject<O> parseObject(MapXNode xnode, PrismObjectDefinition<O> objectDefinition) throws SchemaException {
-		return parseObject(xnode, new QName(null, "object"), objectDefinition);
+		QName elementName;
+        if (objectDefinition != null) {
+            elementName = objectDefinition.getName();
+        } else {
+            elementName = new QName(null, ARTIFICIAL_OBJECT_NAME);
+        }
+        return parseObject(xnode, elementName, objectDefinition);
 	}
 
     private <O extends Objectable> PrismObject<O> parseObject(XNode xnode, QName elementName, PrismObjectDefinition<O> objectDefinition) throws SchemaException {
@@ -978,7 +986,7 @@ private QName getElementName(XNode node, ItemDefinition itemDefinition) {
         } else if (itemDefinition != null) {
             return itemDefinition.getName();
         } else {
-            return new QName(null, "object");
+            throw new IllegalStateException("Couldn't determine element name - neither from XNode nor from itemDefinition");
         }
     }