Merge 7a203fa into ffefb79

hapifhir · Dec 3, 2016 · 5fb8e7e · 5fb8e7e
2 parents ffefb79 + 7a203fa
commit 5fb8e7e
Show file tree

Hide file tree

Showing 3 changed files with 358 additions and 322 deletions.
diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/XmlParser.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/XmlParser.java
@@ -3,6 +3,9 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -289,7 +292,16 @@ private void parseChildren(String path, org.w3c.dom.Element node, Element contex
   }
 
   private Property getElementProp(List<Property> properties, String nodeName) {
-  	for (Property p : properties)
+		List<Property> propsSortedByLongestFirst = new ArrayList<Property>(properties);
+		// sort properties according to their name longest first, so .requestOrganizationReference comes first before .request[x]
+		// and therefore the longer property names get evaluated first
+		Collections.sort(propsSortedByLongestFirst, new Comparator<Property>() {
+			@Override
+			public int compare(Property o1, Property o2) {
+				return o2.getName().length() - o1.getName().length();
+			}
+		});
+  	for (Property p : propsSortedByLongestFirst)
   		if (!p.getDefinition().hasRepresentation(PropertyRepresentation.XMLATTR) && !p.getDefinition().hasRepresentation(PropertyRepresentation.XMLTEXT)) {
   		  if (p.getName().equals(nodeName)) 
 				  return p;