honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jamesagnew/hapi-fhir

This commit is contained in:
James 2016-12-11 18:13:24 -05:00
parent e678908087 2bca44eb1e
commit aa0485206d
3 changed files with 357 additions and 322 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/elementmodel/XmlParser.java
View File

@ -3,6 +3,9 @@ package org.hl7.fhir.dstu3.elementmodel;
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;
@ -290,7 +293,16 @@ public class XmlParser extends ParserBase {
}
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;

23
hapi-fhir-structures-dstu3/src/test/java/org/hl7/fhir/dstu3/hapi/validation/ResourceValidatorDstu3Test.java
View File

@ -249,4 +249,27 @@ public class ResourceValidatorDstu3Test {
assertThat(messageString, not(containsString("valueResource")));
}
@Test
public void testValidateDifferentPropertyButSameStartsWithPath() throws Exception {
EnrollmentResponse fhirObj = new EnrollmentResponse();
Organization org = new Organization();
org.setId("1");
fhirObj.setRequestOrganization(new Reference(org));
String input = ourCtx.newXmlParser().encodeResourceToString(fhirObj);
FhirValidator validator = ourCtx.newValidator();
validator.registerValidatorModule(new FhirInstanceValidator());
ValidationResult result = validator.validateWithResult(input);
assertEquals(3, result.getMessages().size());
fhirObj = new EnrollmentResponse();
Identifier ident = new Identifier().setSystem("a").setValue("b");
fhirObj.setRequest(ident);
input = ourCtx.newXmlParser().encodeResourceToString(fhirObj);
result = validator.validateWithResult(input);
assertEquals(2, result.getMessages().size());
}
}