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

fix decimal validation + fix profile slicing validation

This commit is contained in:
Grahame Grieve 2019-07-30 16:22:54 +10:00
parent f9a06ae2b8
commit fe219985b4
30 changed files with 683 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/misc/ArgonautConverter.java
View File

@ -959,7 +959,7 @@ public class ArgonautConverter extends ConverterBase {
obs.setStatus(ObservationStatus.FINAL); obs.setStatus(ObservationStatus.FINAL);
obs.setEffective(convert.makeDateTimeFromTS(cda.getChild(o, "effectiveTime"))); obs.setEffective(convert.makeDateTimeFromTS(cda.getChild(o, "effectiveTime")));
String v = cda.getChild(o, "value").getAttribute("value"); String v = cda.getChild(o, "value").getAttribute("value");
if (!Utilities.isDecimal(v)) { if (!Utilities.isDecimal(v, true)) {
obs.setDataAbsentReason(inspectCode(new CodeableConcept().setText(v), null)); obs.setDataAbsentReason(inspectCode(new CodeableConcept().setText(v), null));
} else } else
obs.setValue(convert.makeQuantityFromPQ(cda.getChild(o, "value"))); obs.setValue(convert.makeQuantityFromPQ(cda.getChild(o, "value")));
@ -1059,7 +1059,7 @@ public class ArgonautConverter extends ConverterBase {
} else if ("PQ".equals(type)) { } else if ("PQ".equals(type)) {
obs.setUserData("profile", "http://hl7.org/fhir/StructureDefinition/observation-daf-results-dafresultobsquantity"); obs.setUserData("profile", "http://hl7.org/fhir/StructureDefinition/observation-daf-results-dafresultobsquantity");
String va = cda.getChild(o, "value").getAttribute("value"); String va = cda.getChild(o, "value").getAttribute("value");
if (!Utilities.isDecimal(va)) { if (!Utilities.isDecimal(va, true)) {
obs.setDataAbsentReason(inspectCode(new CodeableConcept().setText(va), null)); obs.setDataAbsentReason(inspectCode(new CodeableConcept().setText(va), null));
} else } else
obs.setValue(convert.makeQuantityFromPQ(cda.getChild(o, "value"), null)); obs.setValue(convert.makeQuantityFromPQ(cda.getChild(o, "value"), null));

6
org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/FHIRPathEngine.java
View File

@ -945,7 +945,7 @@ public class FHIRPathEngine {
return null; return null;
} else if (Utilities.isInteger(constant)) { } else if (Utilities.isInteger(constant)) {
return new IntegerType(constant); return new IntegerType(constant);
} else if (Utilities.isDecimal(constant)) { } else if (Utilities.isDecimal(constant, false)) {
return new DecimalType(constant); return new DecimalType(constant);
} else if (constant.startsWith("\'")) { } else if (constant.startsWith("\'")) {
return new StringType(processConstantString(constant)); return new StringType(processConstantString(constant));
@ -1663,7 +1663,7 @@ public class FHIRPathEngine {
return "boolean"; return "boolean";
else if (Utilities.isInteger(constant)) else if (Utilities.isInteger(constant))
return "integer"; return "integer";
else if (Utilities.isDecimal(constant)) else if (Utilities.isDecimal(constant, false))
return "decimal"; return "decimal";
else if (constant.startsWith("%")) else if (constant.startsWith("%"))
return resolveConstantType(context, constant); return resolveConstantType(context, constant);
@ -2134,7 +2134,7 @@ public class FHIRPathEngine {
private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) { private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
String s = convertToString(focus); String s = convertToString(focus);
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, true))
result.add(new DecimalType(s)); result.add(new DecimalType(s));
return result; return result;
} }

6
org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/FHIRPathEngine.java
View File

@ -918,7 +918,7 @@ public class FHIRPathEngine {
return null; return null;
} else if (Utilities.isInteger(constant)) { } else if (Utilities.isInteger(constant)) {
return new IntegerType(constant); return new IntegerType(constant);
} else if (Utilities.isDecimal(constant)) { } else if (Utilities.isDecimal(constant, false)) {
return new DecimalType(constant); return new DecimalType(constant);
} else if (constant.startsWith("\'")) { } else if (constant.startsWith("\'")) {
return new StringType(processConstantString(constant)); return new StringType(processConstantString(constant));
@ -1633,7 +1633,7 @@ public class FHIRPathEngine {
return "boolean"; return "boolean";
else if (Utilities.isInteger(constant)) else if (Utilities.isInteger(constant))
return "integer"; return "integer";
else if (Utilities.isDecimal(constant)) else if (Utilities.isDecimal(constant, false))
return "decimal"; return "decimal";
else if (constant.startsWith("%")) else if (constant.startsWith("%"))
return resolveConstantType(context, constant); return resolveConstantType(context, constant);
@ -2100,7 +2100,7 @@ public class FHIRPathEngine {
private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) { private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
String s = convertToString(focus); String s = convertToString(focus);
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, true))
result.add(new DecimalType(s)); result.add(new DecimalType(s));
return result; return result;
} }

2
org.hl7.fhir.dstu2016may/src/main/java/org/hl7/fhir/dstu2016may/utils/StructureMapUtilities.java
View File

@ -654,7 +654,7 @@ public class StructureMapUtilities {
private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException { private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException {
if (Utilities.isInteger(s)) if (Utilities.isInteger(s))
return new IntegerType(s); return new IntegerType(s);
else if (Utilities.isDecimal(s)) else if (Utilities.isDecimal(s, false))
return new DecimalType(s); return new DecimalType(s);
else if (Utilities.existsInList(s, "true", "false")) else if (Utilities.existsInList(s, "true", "false"))
return new BooleanType(s.equals("true")); return new BooleanType(s.equals("true"));

6
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java
View File

@ -1006,7 +1006,7 @@ public class FHIRPathEngine {
return null; return null;
} else if (Utilities.isInteger(constant)) { } else if (Utilities.isInteger(constant)) {
return new IntegerType(constant); return new IntegerType(constant);
} else if (Utilities.isDecimal(constant)) { } else if (Utilities.isDecimal(constant, false)) {
return new DecimalType(constant); return new DecimalType(constant);
} else if (constant.startsWith("\'")) { } else if (constant.startsWith("\'")) {
return new StringType(processConstantString(constant)); return new StringType(processConstantString(constant));
@ -1725,7 +1725,7 @@ public class FHIRPathEngine {
return new TypeDetails(CollectionStatus.SINGLETON, "boolean"); return new TypeDetails(CollectionStatus.SINGLETON, "boolean");
else if (Utilities.isInteger(constant)) else if (Utilities.isInteger(constant))
return new TypeDetails(CollectionStatus.SINGLETON, "integer"); return new TypeDetails(CollectionStatus.SINGLETON, "integer");
else if (Utilities.isDecimal(constant)) else if (Utilities.isDecimal(constant, false))
return new TypeDetails(CollectionStatus.SINGLETON, "decimal"); return new TypeDetails(CollectionStatus.SINGLETON, "decimal");
else if (constant.startsWith("%")) else if (constant.startsWith("%"))
return resolveConstantType(context, constant); return resolveConstantType(context, constant);
@ -2266,7 +2266,7 @@ public class FHIRPathEngine {
private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) { private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
String s = convertToString(focus); String s = convertToString(focus);
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, true))
result.add(new DecimalType(s)); result.add(new DecimalType(s));
return result; return result;
} }

2
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/StructureMapUtilities.java
View File

@ -1078,7 +1078,7 @@ public class StructureMapUtilities {
private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException { private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException {
if (Utilities.isInteger(s)) if (Utilities.isInteger(s))
return new IntegerType(s); return new IntegerType(s);
else if (Utilities.isDecimal(s)) else if (Utilities.isDecimal(s, false))
return new DecimalType(s); return new DecimalType(s);
else if (Utilities.existsInList(s, "true", "false")) else if (Utilities.existsInList(s, "true", "false"))
return new BooleanType(s.equals("true")); return new BooleanType(s.equals("true"));

2
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/formats/Turtle.java
View File

@ -1176,7 +1176,7 @@ public class Turtle {
int sl = lexer.startLine; int sl = lexer.startLine;
int sc = lexer.startCol; int sc = lexer.startCol;
String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null; String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null;
if (Utilities.isDecimal(pfx) && !lexer.peek(LexerTokenType.TOKEN, ":")) { if (Utilities.isDecimal(pfx, true) && !lexer.peek(LexerTokenType.TOKEN, ":")) {
TTLLiteral u = new TTLLiteral(sl, sc); TTLLiteral u = new TTLLiteral(sl, sc);
u.value = pfx; u.value = pfx;
result.addPredicate(uri, u); result.addPredicate(uri, u);

12
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/FHIRPathEngine.java
View File

@ -995,7 +995,7 @@ public class FHIRPathEngine {
return new StringType(processConstantString(lexer.take(), lexer)).noExtensions(); return new StringType(processConstantString(lexer.take(), lexer)).noExtensions();
} else if (Utilities.isInteger(lexer.getCurrent())) { } else if (Utilities.isInteger(lexer.getCurrent())) {
return new IntegerType(lexer.take()).noExtensions(); return new IntegerType(lexer.take()).noExtensions();
} else if (Utilities.isDecimal(lexer.getCurrent())) { } else if (Utilities.isDecimal(lexer.getCurrent(), false)) {
return new DecimalType(lexer.take()).noExtensions(); return new DecimalType(lexer.take()).noExtensions();
} else if (Utilities.existsInList(lexer.getCurrent(), "true", "false")) { } else if (Utilities.existsInList(lexer.getCurrent(), "true", "false")) {
return new BooleanType(lexer.take()).noExtensions(); return new BooleanType(lexer.take()).noExtensions();
@ -2980,7 +2980,7 @@ public class FHIRPathEngine {
private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) { private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
String s = convertToString(focus); String s = convertToString(focus);
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, true))
result.add(new DecimalType(s).noExtensions()); result.add(new DecimalType(s).noExtensions());
if ("true".equals(s)) if ("true".equals(s))
result.add(new DecimalType(1).noExtensions()); result.add(new DecimalType(1).noExtensions());
@ -3716,7 +3716,7 @@ public class FHIRPathEngine {
if (s.contains(" ")) { if (s.contains(" ")) {
String v = s.substring(0, s.indexOf(" ")).trim(); String v = s.substring(0, s.indexOf(" ")).trim();
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
if (!Utilities.isDecimal(v)) if (!Utilities.isDecimal(v, false))
return null; return null;
if (s.startsWith("'") && s.endsWith("'")) if (s.startsWith("'") && s.endsWith("'"))
return Quantity.fromUcum(v, s.substring(1, s.length()-1)); return Quantity.fromUcum(v, s.substring(1, s.length()-1));
@ -3739,7 +3739,7 @@ public class FHIRPathEngine {
else else
return null; return null;
} else { } else {
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, false))
return new Quantity().setValue(new BigDecimal(s)).setSystem("http://unitsofmeasure.org").setCode("1"); return new Quantity().setValue(new BigDecimal(s)).setSystem("http://unitsofmeasure.org").setCode("1");
else else
return null; return null;
@ -3758,7 +3758,7 @@ public class FHIRPathEngine {
else if (focus.get(0) instanceof DecimalType) else if (focus.get(0) instanceof DecimalType)
result.add(new BooleanType(true).noExtensions()); result.add(new BooleanType(true).noExtensions());
else if (focus.get(0) instanceof StringType) else if (focus.get(0) instanceof StringType)
result.add(new BooleanType(Utilities.isDecimal(convertToString(focus.get(0)))).noExtensions()); result.add(new BooleanType(Utilities.isDecimal(convertToString(focus.get(0)), true)).noExtensions());
else else
result.add(new BooleanType(false).noExtensions()); result.add(new BooleanType(false).noExtensions());
return result; return result;
@ -4241,7 +4241,7 @@ public class FHIRPathEngine {
return Equality.False; return Equality.False;
else if (Utilities.isInteger(item.primitiveValue())) else if (Utilities.isInteger(item.primitiveValue()))
return asBoolFromInt(item.primitiveValue()); return asBoolFromInt(item.primitiveValue());
else if (Utilities.isDecimal(item.primitiveValue())) else if (Utilities.isDecimal(item.primitiveValue(), false))
return asBoolFromDec(item.primitiveValue()); return asBoolFromDec(item.primitiveValue());
else else
return Equality.Null; return Equality.Null;

2
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/StructureMapUtilities.java
View File

@ -1194,7 +1194,7 @@ public class StructureMapUtilities {
private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException { private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException {
if (Utilities.isInteger(s)) if (Utilities.isInteger(s))
return new IntegerType(s); return new IntegerType(s);
else if (Utilities.isDecimal(s)) else if (Utilities.isDecimal(s, true))
return new DecimalType(s); return new DecimalType(s);
else if (Utilities.existsInList(s, "true", "false")) else if (Utilities.existsInList(s, "true", "false"))
return new BooleanType(s.equals("true")); return new BooleanType(s.equals("true"));

2
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/formats/Turtle.java
View File

@ -1176,7 +1176,7 @@ public class Turtle {
int sl = lexer.startLine; int sl = lexer.startLine;
int sc = lexer.startCol; int sc = lexer.startCol;
String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null; String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null;
if (Utilities.isDecimal(pfx) && !lexer.peek(LexerTokenType.TOKEN, ":")) { if (Utilities.isDecimal(pfx, true) && !lexer.peek(LexerTokenType.TOKEN, ":")) {
TTLLiteral u = new TTLLiteral(sl, sc); TTLLiteral u = new TTLLiteral(sl, sc);
u.value = pfx; u.value = pfx;
result.addPredicate(uri, u); result.addPredicate(uri, u);

144
org.hl7.fhir.r5/.classpath
View File

@ -1,58 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<classpath> <classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java">
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> <attributes>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/> <attribute name="test" value="true"/>
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> <attribute name="optional" value="true"/>
<classpathentry kind="output" path="target/classes"/> <attribute name="maven.pomderived" value="true"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" sourcepath="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar"/> </attributes>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> </classpathentry>
<classpathentry kind="var" path="M2_REPO/ca/uhn/hapi/fhir/org.hl7.fhir.utilities/3.8.12-SNAPSHOT/org.hl7.fhir.utilities-3.8.12-SNAPSHOT.jar" sourcepath="M2_REPO/ca/uhn/hapi/fhir/org.hl7.fhir.utilities/3.8.12-SNAPSHOT/org.hl7.fhir.utilities-3.8.12-SNAPSHOT-sources.jar"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<classpathentry kind="var" path="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/4.0.0-SNAPSHOT/hapi-fhir-base-4.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/4.0.0-SNAPSHOT/hapi-fhir-base-4.0.0-SNAPSHOT-sources.jar"/> <attributes>
<classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar"/> <attribute name="test" value="true"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar"/> <attribute name="maven.pomderived" value="true"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-text/1.6/commons-text-1.6.jar" sourcepath="M2_REPO/org/apache/commons/commons-text/1.6/commons-text-1.6-sources.jar"/> </attributes>
<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11-sources.jar"/> </classpathentry>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6.jar" sourcepath="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6-sources.jar"/> <classpathentry kind="src" output="target/classes" path="src/main/java">
<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/25.0-jre/guava-25.0-jre.jar" sourcepath="M2_REPO/com/google/guava/guava/25.0-jre/guava-25.0-jre-sources.jar"/> <attributes>
<classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/> <attribute name="optional" value="true"/>
<classpathentry kind="var" path="M2_REPO/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" sourcepath="M2_REPO/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0-sources.jar"/> <attribute name="maven.pomderived" value="true"/>
<classpathentry kind="var" path="M2_REPO/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" sourcepath="M2_REPO/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3-sources.jar"/> </attributes>
<classpathentry kind="var" path="M2_REPO/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" sourcepath="M2_REPO/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1-sources.jar"/> </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" sourcepath="M2_REPO/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14-sources.jar"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/9.4.14.v20181114/jetty-server-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/9.4.14.v20181114/jetty-server-9.4.14.v20181114-sources.jar"/> <attributes>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.4.14.v20181114/jetty-http-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.4.14.v20181114/jetty-http-9.4.14.v20181114-sources.jar"/> <attribute name="maven.pomderived" value="true"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.4.14.v20181114/jetty-util-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/9.4.14.v20181114/jetty-util-9.4.14.v20181114-sources.jar"/> </attributes>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.4.14.v20181114/jetty-io-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/9.4.14.v20181114/jetty-io-9.4.14.v20181114-sources.jar"/> </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar"/> <classpathentry kind="var" path="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" sourcepath="M2_REPO/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry kind="var" path="M2_REPO/org/fhir/ucum/1.0.2/ucum-1.0.2.jar" sourcepath="M2_REPO/org/fhir/ucum/1.0.2/ucum-1.0.2-sources.jar"/> <attributes>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" sourcepath="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar"/> <attribute name="maven.pomderived" value="true"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c.jar" sourcepath="M2_REPO/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c-sources.jar"/> </attributes>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.12/junit-4.12.jar" sourcepath="M2_REPO/junit/junit/4.12/junit-4.12-sources.jar"/> </classpathentry>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/4.0.1/poi-4.0.1.jar" sourcepath="M2_REPO/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/4.0.0-SNAPSHOT/hapi-fhir-base-4.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/4.0.0-SNAPSHOT/hapi-fhir-base-4.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.8.5/gson-2.8.5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.8.1/commons-lang3-3.8.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" sourcepath="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-text/1.6/commons-text-1.6.jar" sourcepath="M2_REPO/org/apache/commons/commons-text/1.6/commons-text-1.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml-schemas/4.0.1/poi-ooxml-schemas-4.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.11/commons-codec-1.11-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2.jar" sourcepath="M2_REPO/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6.jar" sourcepath="M2_REPO/commons-io/commons-io/2.6/commons-io-2.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" sourcepath="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/25.0-jre/guava-25.0-jre.jar" sourcepath="M2_REPO/com/google/guava/guava/25.0-jre/guava-25.0-jre-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar" sourcepath="M2_REPO/com/github/virtuald/curvesapi/1.05/curvesapi-1.05-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/ooxml-schemas/1.4/ooxml-schemas-1.4.jar" sourcepath="M2_REPO/org/apache/poi/ooxml-schemas/1.4/ooxml-schemas-1.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0.jar" sourcepath="M2_REPO/org/checkerframework/checker-compat-qual/2.0.0/checker-compat-qual-2.0.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/ST4/4.1/ST4-4.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3.jar" sourcepath="M2_REPO/com/google/errorprone/error_prone_annotations/2.1.3/error_prone_annotations-2.1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" sourcepath="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.jar" sourcepath="M2_REPO/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar" sourcepath="M2_REPO/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/9.4.14.v20181114/jetty-server-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/9.4.14.v20181114/jetty-server-9.4.14.v20181114-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/9.4.14.v20181114/jetty-http-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/9.4.14.v20181114/jetty-http-9.4.14.v20181114-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/9.4.14.v20181114/jetty-util-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/9.4.14.v20181114/jetty-util-9.4.14.v20181114-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/9.4.14.v20181114/jetty-io-9.4.14.v20181114.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/9.4.14.v20181114/jetty-io-9.4.14.v20181114-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sf/saxon/Saxon-HE/9.5.1-5/Saxon-HE-9.5.1-5.jar" sourcepath="M2_REPO/net/sf/saxon/Saxon-HE/9.5.1-5/Saxon-HE-9.5.1-5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.25/jcl-over-slf4j-1.7.25-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/fhir/ucum/1.0.2/ucum-1.0.2.jar" sourcepath="M2_REPO/org/fhir/ucum/1.0.2/ucum-1.0.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar" sourcepath="M2_REPO/xpp3/xpp3/1.1.4c/xpp3-1.1.4c-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0.jar" sourcepath="M2_REPO/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c.jar" sourcepath="M2_REPO/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar" sourcepath="M2_REPO/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.12/junit-4.12.jar" sourcepath="M2_REPO/junit/junit/4.12/junit-4.12-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3.jar" sourcepath="M2_REPO/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi/4.0.1/poi-4.0.1.jar" sourcepath="M2_REPO/org/apache/poi/poi/4.0.1/poi-4.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/bytebuddy/byte-buddy-agent/1.9.3/byte-buddy-agent-1.9.3.jar" sourcepath="M2_REPO/net/bytebuddy/byte-buddy-agent/1.9.3/byte-buddy-agent-1.9.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-collections4/4.1/commons-collections4-4.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/2.6/objenesis-2.6.jar" sourcepath="M2_REPO/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1-sources.jar"/>
</classpath> <classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1.jar" sourcepath="M2_REPO/org/apache/poi/poi-ooxml/4.0.1/poi-ooxml-4.0.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/poi-ooxml-schemas/4.0.1/poi-ooxml-schemas-4.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2.jar" sourcepath="M2_REPO/org/apache/xmlbeans/xmlbeans/3.0.2/xmlbeans-3.0.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar" sourcepath="M2_REPO/org/apache/commons/commons-compress/1.18/commons-compress-1.18-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar" sourcepath="M2_REPO/com/github/virtuald/curvesapi/1.05/curvesapi-1.05-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/poi/ooxml-schemas/1.4/ooxml-schemas-1.4.jar" sourcepath="M2_REPO/org/apache/poi/ooxml-schemas/1.4/ooxml-schemas-1.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/ST4/4.1/ST4-4.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" sourcepath="M2_REPO/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.5.3/httpclient-4.5.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.4.6/httpcore-4.4.6-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.2/commons-logging-1.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-databind/2.9.7/jackson-databind-2.9.7-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-annotations/2.9.7/jackson-annotations-2.9.7-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7.jar" sourcepath="M2_REPO/com/fasterxml/jackson/core/jackson-core/2.9.7/jackson-core-2.9.7-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/sf/saxon/Saxon-HE/9.5.1-5/Saxon-HE-9.5.1-5.jar" sourcepath="M2_REPO/net/sf/saxon/Saxon-HE/9.5.1-5/Saxon-HE-9.5.1-5-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-classic/1.2.3/logback-classic-1.2.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3.jar" sourcepath="M2_REPO/ch/qos/logback/logback-core/1.2.3/logback-core-1.2.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0.jar" sourcepath="M2_REPO/org/hamcrest/java-hamcrest/2.0.0.0/java-hamcrest-2.0.0.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar" sourcepath="M2_REPO/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3.jar" sourcepath="M2_REPO/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/net/bytebuddy/byte-buddy-agent/1.9.3/byte-buddy-agent-1.9.3.jar" sourcepath="M2_REPO/net/bytebuddy/byte-buddy-agent/1.9.3/byte-buddy-agent-1.9.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/2.6/objenesis-2.6.jar" sourcepath="M2_REPO/org/objenesis/objenesis/2.6/objenesis-2.6-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>

33
org.hl7.fhir.r5/.project
View File

@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>org.hl7.fhir.r5</name> <name>org.hl7.fhir.r5</name>
<comment>An open-source implementation of the FHIR specification in Java. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> <comment>An open-source implementation of the FHIR specification in Java. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/> <projects>
<buildSpec> </projects>
<buildCommand> <buildSpec>
<name>org.eclipse.jdt.core.javabuilder</name> <buildCommand>
</buildCommand> <name>org.eclipse.jdt.core.javabuilder</name>
</buildSpec> <arguments>
<natures> </arguments>
<nature>org.eclipse.jdt.core.javanature</nature> </buildCommand>
</natures> <buildCommand>
</projectDescription> <name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
View File

@ -1876,7 +1876,7 @@ public class ProfileUtilities extends TranslatingUtilities {
if (tt == null && td.getCodeElement().hasExtension(ToolingExtensions.EXT_JSON_TYPE)) if (tt == null && td.getCodeElement().hasExtension(ToolingExtensions.EXT_JSON_TYPE))
tt = "*"; // tt = "*"; //
b.append(tt); b.append(tt);
if (td.hasCode() && (t.equals(tt) || "Extension".equals(tt) || if (td.hasCode() && (tt.equals(t) || "Extension".equals(tt) ||
"Element".equals(tt) || "*".equals(tt) || "Element".equals(tt) || "*".equals(tt) ||
(("Resource".equals(tt) || ("DomainResource".equals(tt)) && pkp.isResource(t))))) (("Resource".equals(tt) || ("DomainResource".equals(tt)) && pkp.isResource(t)))))
ok = true; ok = true;

17
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
View File

@ -1002,7 +1002,7 @@ public class FHIRPathEngine {
return new StringType(processConstantString(lexer.take(), lexer)).noExtensions(); return new StringType(processConstantString(lexer.take(), lexer)).noExtensions();
} else if (Utilities.isInteger(lexer.getCurrent())) { } else if (Utilities.isInteger(lexer.getCurrent())) {
return new IntegerType(lexer.take()).noExtensions(); return new IntegerType(lexer.take()).noExtensions();
} else if (Utilities.isDecimal(lexer.getCurrent())) { } else if (Utilities.isDecimal(lexer.getCurrent(), false)) {
return new DecimalType(lexer.take()).noExtensions(); return new DecimalType(lexer.take()).noExtensions();
} else if (Utilities.existsInList(lexer.getCurrent(), "true", "false")) { } else if (Utilities.existsInList(lexer.getCurrent(), "true", "false")) {
return new BooleanType(lexer.take()).noExtensions(); return new BooleanType(lexer.take()).noExtensions();
@ -2993,7 +2993,7 @@ public class FHIRPathEngine {
private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) { private List<Base> funcToDecimal(ExecutionContext context, List<Base> focus, ExpressionNode exp) {
String s = convertToString(focus); String s = convertToString(focus);
List<Base> result = new ArrayList<Base>(); List<Base> result = new ArrayList<Base>();
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, true))
result.add(new DecimalType(s).noExtensions()); result.add(new DecimalType(s).noExtensions());
if ("true".equals(s)) if ("true".equals(s))
result.add(new DecimalType(1).noExtensions()); result.add(new DecimalType(1).noExtensions());
@ -3739,7 +3739,7 @@ public class FHIRPathEngine {
if (s.contains(" ")) { if (s.contains(" ")) {
String v = s.substring(0, s.indexOf(" ")).trim(); String v = s.substring(0, s.indexOf(" ")).trim();
s = s.substring(s.indexOf(" ")).trim(); s = s.substring(s.indexOf(" ")).trim();
if (!Utilities.isDecimal(v)) if (!Utilities.isDecimal(v, false))
return null; return null;
if (s.startsWith("'") && s.endsWith("'")) if (s.startsWith("'") && s.endsWith("'"))
return Quantity.fromUcum(v, s.substring(1, s.length()-1)); return Quantity.fromUcum(v, s.substring(1, s.length()-1));
@ -3762,7 +3762,7 @@ public class FHIRPathEngine {
else else
return null; return null;
} else { } else {
if (Utilities.isDecimal(s)) if (Utilities.isDecimal(s, true))
return new Quantity().setValue(new BigDecimal(s)).setSystem("http://unitsofmeasure.org").setCode("1"); return new Quantity().setValue(new BigDecimal(s)).setSystem("http://unitsofmeasure.org").setCode("1");
else else
return null; return null;
@ -3781,7 +3781,7 @@ public class FHIRPathEngine {
else if (focus.get(0) instanceof DecimalType) else if (focus.get(0) instanceof DecimalType)
result.add(new BooleanType(true).noExtensions()); result.add(new BooleanType(true).noExtensions());
else if (focus.get(0) instanceof StringType) else if (focus.get(0) instanceof StringType)
result.add(new BooleanType(Utilities.isDecimal(convertToString(focus.get(0)))).noExtensions()); result.add(new BooleanType(Utilities.isDecimal(convertToString(focus.get(0)), true)).noExtensions());
else else
result.add(new BooleanType(false).noExtensions()); result.add(new BooleanType(false).noExtensions());
return result; return result;
@ -4182,7 +4182,7 @@ public class FHIRPathEngine {
} }
if (focus == null) if (focus == null)
throw new DefinitionException("Unable to resolve discriminator: "+expr.toString()); throw new DefinitionException("Unable to resolve discriminator in definitions: "+expr.toString());
else if (expr.getInner() == null) else if (expr.getInner() == null)
return focus; return focus;
else { else {
@ -4222,7 +4222,8 @@ public class FHIRPathEngine {
return true; return true;
else if (t.getType().size() == 1 && t.getType().get(0).getCode() != null && t.getPath() != null && t.getPath().toUpperCase().endsWith(t.getType().get(0).getCode().toUpperCase())) else if (t.getType().size() == 1 && t.getType().get(0).getCode() != null && t.getPath() != null && t.getPath().toUpperCase().endsWith(t.getType().get(0).getCode().toUpperCase()))
return tail.startsWith(d); return tail.startsWith(d);
else if (t.getPath().endsWith("[x]") && tail.startsWith(d))
return true;
return false; return false;
} }
@ -4287,7 +4288,7 @@ public class FHIRPathEngine {
return Equality.False; return Equality.False;
else if (Utilities.isInteger(item.primitiveValue())) else if (Utilities.isInteger(item.primitiveValue()))
return asBoolFromInt(item.primitiveValue()); return asBoolFromInt(item.primitiveValue());
else if (Utilities.isDecimal(item.primitiveValue())) else if (Utilities.isDecimal(item.primitiveValue(), true))
return asBoolFromDec(item.primitiveValue()); return asBoolFromDec(item.primitiveValue());
else else
return Equality.Null; return Equality.Null;

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/StructureMapUtilities.java
View File

@ -1202,7 +1202,7 @@ public class StructureMapUtilities {
private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException { private Type readConstant(String s, FHIRLexer lexer) throws FHIRLexerException {
if (Utilities.isInteger(s)) if (Utilities.isInteger(s))
return new IntegerType(s); return new IntegerType(s);
else if (Utilities.isDecimal(s)) else if (Utilities.isDecimal(s, false))
return new DecimalType(s); return new DecimalType(s);
else if (Utilities.existsInList(s, "true", "false")) else if (Utilities.existsInList(s, "true", "false"))
return new BooleanType(s.equals("true")); return new BooleanType(s.equals("true"));

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/formats/Turtle.java
View File

@ -1176,7 +1176,7 @@ public class Turtle {
int sl = lexer.startLine; int sl = lexer.startLine;
int sc = lexer.startCol; int sc = lexer.startCol;
String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null; String pfx = lexer.peekType() == LexerTokenType.WORD ? lexer.word() : null;
if (Utilities.isDecimal(pfx) && !lexer.peek(LexerTokenType.TOKEN, ":")) { if (Utilities.isDecimal(pfx, true) && !lexer.peek(LexerTokenType.TOKEN, ":")) {
TTLLiteral u = new TTLLiteral(sl, sc); TTLLiteral u = new TTLLiteral(sl, sc);
u.value = pfx; u.value = pfx;
result.addPredicate(uri, u); result.addPredicate(uri, u);

83
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/Utilities.java
View File

@ -123,13 +123,22 @@ public class Utilities {
if (isBlank(string)) { if (isBlank(string)) {
return false; return false;
} }
if (string.startsWith("-")) String value = string.startsWith("-") ? string.substring(1) : string;
string = string.substring(1); for (char next : value.toCharArray()) {
for (char next : string.toCharArray()) {
if (!Character.isDigit(next)) { if (!Character.isDigit(next)) {
return false; return false;
} }
} }
// check bounds -2,147,483,648..2,147,483,647
if (value.length() > 10)
return false;
if (string.startsWith("-")) {
if (value.length() == 10 && string.compareTo("2147483648") > 0)
return false;
} else {
if (value.length() == 10 && string.compareTo("2147483647") > 0)
return false;
}
return true; return true;
} }
@ -142,25 +151,71 @@ public class Utilities {
} }
} }
public static boolean isDecimal(String string) { public enum DecimalStatus {
if (isBlank(string)) { BLANK, SYNTAX, RANGE, OK
return false; }
public static boolean isDecimal(String value, boolean exponent) {
DecimalStatus ds = checkDecimal(value, exponent);
return ds == DecimalStatus.OK || ds == DecimalStatus.RANGE;
}
public static DecimalStatus checkDecimal(String value, boolean exponent) {
if (isBlank(value)) {
return DecimalStatus.BLANK;
} }
if (string.startsWith("-"))
string = string.substring(1);
boolean havePeriod = false; boolean havePeriod = false;
for (char next : string.toCharArray()) { boolean haveExponent = false;
boolean haveMinus = false;
boolean haveDigits = false;
int preDecLength = 0;
int postDecLength = 0;
int exponentLength = 0;
int length = 0;
for (char next : value.toCharArray()) {
if (next == '.') { if (next == '.') {
if (havePeriod) { if (!haveDigits || havePeriod || haveExponent)
return false; return DecimalStatus.SYNTAX;
}
havePeriod = true; havePeriod = true;
preDecLength = length;
length = 0;
} else if (next == '-') {
if (haveDigits || haveMinus)
return DecimalStatus.SYNTAX;
haveMinus = true;
} else if (next == 'e') {
if (!haveDigits || haveExponent || !exponent)
return DecimalStatus.SYNTAX;
haveExponent = true;
haveMinus = false;
haveDigits = false;
if (havePeriod)
postDecLength = length;
else
preDecLength = length;
length = 0;
} else if (!Character.isDigit(next)) { } else if (!Character.isDigit(next)) {
return false; return DecimalStatus.SYNTAX;
} else {
haveDigits = true;
length++;
} }
} }
return true; if (haveExponent)
exponentLength = length;
else if (havePeriod)
postDecLength = length;
else
preDecLength = length;
// now, bounds checking - these are arbitrary
if (exponentLength > 4)
return DecimalStatus.RANGE;
if (preDecLength + postDecLength > 18)
return DecimalStatus.RANGE;
return DecimalStatus.OK;
} }
public static String camelCase(String value) { public static String camelCase(String value) {

2
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r4/validation/InstanceValidator.java
View File

@ -1562,7 +1562,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} }
if (type.equals("decimal")) { if (type.equals("decimal")) {
if (e.primitiveValue() != null) { if (e.primitiveValue() != null) {
rule(errors, IssueType.INVALID, e.line(), e.col(), path, Utilities.isDecimal(e.primitiveValue()), "The value '" + e.primitiveValue() + "' is not a valid decimal"); rule(errors, IssueType.INVALID, e.line(), e.col(), path, Utilities.isDecimal(e.primitiveValue(), true), "The value '" + e.primitiveValue() + "' is not a valid decimal");
if (e.primitiveValue().contains(".")) { if (e.primitiveValue().contains(".")) {
String head = e.primitiveValue().substring(0, e.primitiveValue().indexOf(".")); String head = e.primitiveValue().substring(0, e.primitiveValue().indexOf("."));
if (head.startsWith("-")) if (head.startsWith("-"))

24
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -135,6 +135,7 @@ import org.hl7.fhir.r5.utils.Version;
import org.hl7.fhir.r5.validation.EnableWhenEvaluator.QStack; import org.hl7.fhir.r5.validation.EnableWhenEvaluator.QStack;
import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;
import org.hl7.fhir.utilities.Utilities; import org.hl7.fhir.utilities.Utilities;
import org.hl7.fhir.utilities.Utilities.DecimalStatus;
import org.hl7.fhir.utilities.validation.ValidationMessage; import org.hl7.fhir.utilities.validation.ValidationMessage;
import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueSeverity;
import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType; import org.hl7.fhir.utilities.validation.ValidationMessage.IssueType;
@ -251,6 +252,10 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
boolean ok = true; boolean ok = true;
for (ValidationMessage v : valerrors) for (ValidationMessage v : valerrors)
ok = ok && !v.getLevel().isError(); ok = ok && !v.getLevel().isError();
if(item instanceof Element) {
Element e = (Element) item;
System.out.println("Conforms to: resource "+(e.getIdBase() != null ? item.getIdBase() : e.getChildValue("id"))+", url = "+url+", outcome = "+Boolean.toString(ok));
}
return ok; return ok;
} }
@ -332,7 +337,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
public ResourceProfiles(Element resource, NodeStack stack) { public ResourceProfiles(Element resource, NodeStack stack) {
this.resource = resource; this.resource = resource;
if (this.resource.getName().equals("contained")) if (this.resource.getName().equals("contained") && stack.parent != null)
this.owner = stack.parent.element; this.owner = stack.parent.element;
else else
this.owner = resource; this.owner = resource;
@ -794,7 +799,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} }
private boolean check(String v1, String v2) { private boolean check(String v1, String v2) {
return v1 == null ? Utilities.noString(v1) : v1.equals(v2); return v1 == null ? Utilities.noString(v2) : v1.equals(v2);
} }
private void checkAddress(List<ValidationMessage> errors, String path, Element focus, Address fixed) { private void checkAddress(List<ValidationMessage> errors, String path, Element focus, Address fixed) {
@ -1379,6 +1384,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
else if (fixed instanceof org.hl7.fhir.r5.model.InstantType) else if (fixed instanceof org.hl7.fhir.r5.model.InstantType)
rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.InstantType) fixed).getValue().toString(), value), rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.InstantType) fixed).getValue().toString(), value),
"Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.InstantType) fixed).asStringValue() + "'"); "Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.InstantType) fixed).asStringValue() + "'");
else if (fixed instanceof org.hl7.fhir.r5.model.CodeType)
rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.CodeType) fixed).getValue(), value),
"Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.CodeType) fixed).getValue() + "'");
else if (fixed instanceof org.hl7.fhir.r5.model.StringType) else if (fixed instanceof org.hl7.fhir.r5.model.StringType)
rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.StringType) fixed).getValue(), value), rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.StringType) fixed).getValue(), value),
"Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.StringType) fixed).getValue() + "'"); "Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.StringType) fixed).getValue() + "'");
@ -1397,9 +1405,6 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
else if (fixed instanceof org.hl7.fhir.r5.model.UuidType) else if (fixed instanceof org.hl7.fhir.r5.model.UuidType)
rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.UuidType) fixed).getValue(), value), rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.UuidType) fixed).getValue(), value),
"Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.UuidType) fixed).getValue() + "'"); "Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.UuidType) fixed).getValue() + "'");
else if (fixed instanceof org.hl7.fhir.r5.model.CodeType)
rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.CodeType) fixed).getValue(), value),
"Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.CodeType) fixed).getValue() + "'");
else if (fixed instanceof org.hl7.fhir.r5.model.IdType) else if (fixed instanceof org.hl7.fhir.r5.model.IdType)
rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.IdType) fixed).getValue(), value), rule(errors, IssueType.VALUE, focus.line(), focus.col(), path, check(((org.hl7.fhir.r5.model.IdType) fixed).getValue(), value),
"Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.IdType) fixed).getValue() + "'"); "Value is '" + value + "' but must be '" + ((org.hl7.fhir.r5.model.IdType) fixed).getValue() + "'");
@ -1633,7 +1638,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
} }
if (type.equals("decimal")) { if (type.equals("decimal")) {
if (e.primitiveValue() != null) { if (e.primitiveValue() != null) {
rule(errors, IssueType.INVALID, e.line(), e.col(), path, Utilities.isDecimal(e.primitiveValue()), "The value '" + e.primitiveValue() + "' is not a valid decimal"); DecimalStatus ds = Utilities.checkDecimal(e.primitiveValue(), true);
if (rule(errors, IssueType.INVALID, e.line(), e.col(), path, ds == DecimalStatus.OK || ds == DecimalStatus.RANGE, "The value '" + e.primitiveValue() + "' is not a valid decimal"))
warning(errors, IssueType.VALUE, e.line(), e.col(), path, ds != DecimalStatus.RANGE, "The value '" + e.primitiveValue() + "' is outside the range of commonly/reasonably supported decimals");
if (e.primitiveValue().contains(".")) { if (e.primitiveValue().contains(".")) {
String head = e.primitiveValue().substring(0, e.primitiveValue().indexOf(".")); String head = e.primitiveValue().substring(0, e.primitiveValue().indexOf("."));
if (head.startsWith("-")) if (head.startsWith("-"))
@ -4207,9 +4214,10 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
Element resource, Element element, NodeStack stack) throws FHIRException { Element resource, Element element, NodeStack stack) throws FHIRException {
if (resource.getName().equals("contained")) { if (resource.getName().equals("contained")) {
NodeStack ancestor = stack; NodeStack ancestor = stack;
while (!ancestor.element.isResource() || ancestor.element.getName().equals("contained")) while (ancestor != null && ancestor.element != null && (!ancestor.element.isResource() || "contained".equals(ancestor.element.getName())))
ancestor = ancestor.parent; ancestor = ancestor.parent;
checkInvariants(hostContext, errors, stack.getLiteralPath(), profile, definition, null, null, ancestor.element, element); if (ancestor != null && ancestor.element != null)
checkInvariants(hostContext, errors, stack.getLiteralPath(), profile, definition, null, null, ancestor.element, element);
} else } else
checkInvariants(hostContext, errors, stack.getLiteralPath(), profile, definition, null, null, resource, element); checkInvariants(hostContext, errors, stack.getLiteralPath(), profile, definition, null, null, resource, element);
if (definition.getFixed()!=null) if (definition.getFixed()!=null)

22
org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
View File

@ -806,7 +806,27 @@
"source": "azatadha/param-profile.xml", "source": "azatadha/param-profile.xml",
"errorCount": 0 "errorCount": 0
} }
} },
"profile-slicing-ok-1.xml": {
"errorCount": 0,
"profiles": [
"profile-slicing-profile-1.xml", "profile-slicing-profile-2.xml", "profile-slicing-profile-3.xml"
],
"profile": {
"source": "profile-slicing-profile-open.xml",
"errorCount": 0
}
},
"profile-slicing-bad-1.xml": {
"errorCount": 0,
"profiles": [
"profile-slicing-profile-1.xml", "profile-slicing-profile-2.xml", "profile-slicing-profile-3.xml"
],
"profile": {
"source": "profile-slicing-profile-open.xml",
"errorCount": 1
}
}
} }
} }
} }

8
org.hl7.fhir.validation/src/test/resources/validation-examples/primitive-bad.xml
View File

@ -27,14 +27,6 @@
<name value="paramDecimal0"/> <name value="paramDecimal0"/>
<valueDecimal value="00.1"/> <valueDecimal value="00.1"/>
</parameter> </parameter>
<parameter> <!-- 8 -->
<name value="paramDecimal1"/>
<valueDecimal value="1e09"/>
</parameter>
<parameter> <!-- 9 -->
<name value="paramDecimal2"/>
<valueDecimal value="0.12e3"/>
</parameter>
<parameter> <!-- 10 --> <parameter> <!-- 10 -->
<name value="paramBase64Binary"/> <name value="paramBase64Binary"/>
<valueBase64Binary value="YXNhcs2Rhc2Q="/> <valueBase64Binary value="YXNhcs2Rhc2Q="/>

20
org.hl7.fhir.validation/src/test/resources/validation-examples/primitive-good.xml
View File

@ -31,6 +31,26 @@
<name value="paramDecimal3"/> <name value="paramDecimal3"/>
<valueDecimal value="121233786234234234234234.12323"/> <valueDecimal value="121233786234234234234234.12323"/>
</parameter> </parameter>
<parameter>
<name value="paramDecimal4"/>
<valueDecimal value="1e1"/>
</parameter>
<parameter>
<name value="paramDecimal5"/>
<valueDecimal value="1.0e-1"/>
</parameter>
<parameter>
<name value="paramDecimal6"/>
<valueDecimal value="0.1e11"/>
</parameter>
<parameter>
<name value="paramDecimal7"/>
<valueDecimal value="1e09"/>
</parameter>
<parameter>
<name value="paramDecimal8"/>
<valueDecimal value="0.12e3"/>
</parameter>
<parameter> <parameter>
<name value="paramBase64Binary"/> <name value="paramBase64Binary"/>
<valueBase64Binary value="YXNhc2Rhc2Q="/> <valueBase64Binary value="YXNhc2Rhc2Q="/>

68
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-bad-1.xml Normal file
View File

@ -0,0 +1,68 @@
<List xmlns="http://hl7.org/fhir">
<contained>
<Basic>
<id value="i1"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile2"/>
</coding>
</code>
</Basic>
</contained>
<contained>
<Basic>
<id value="i2"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile2"/>
</coding>
</code>
</Basic>
</contained>
<contained>
<Basic>
<id value="i3"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile2"/>
</coding>
</code>
</Basic>
</contained>
<contained>
<Basic>
<id value="i4"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile3"/>
</coding>
</code>
</Basic>
</contained>
<status value="current"/>
<mode value="working"/>
<entry>
<item>
<reference value="#i1"/>
</item>
</entry>
<entry>
<item>
<reference value="#i2"/>
</item>
</entry>
<entry>
<item>
<reference value="#i3"/>
</item>
</entry>
<entry>
<item>
<reference value="#i4"/>
</item>
</entry>
</List>

68
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-ok-1.xml Normal file
View File

@ -0,0 +1,68 @@
<List xmlns="http://hl7.org/fhir">
<contained>
<Basic>
<id value="i1"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile1"/>
</coding>
</code>
</Basic>
</contained>
<contained>
<Basic>
<id value="i2"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile2"/>
</coding>
</code>
</Basic>
</contained>
<contained>
<Basic>
<id value="i3"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile2"/>
</coding>
</code>
</Basic>
</contained>
<contained>
<Basic>
<id value="i4"/>
<code>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile3"/>
</coding>
</code>
</Basic>
</contained>
<status value="current"/>
<mode value="working"/>
<entry>
<item>
<reference value="#i1"/>
</item>
</entry>
<entry>
<item>
<reference value="#i2"/>
</item>
</entry>
<entry>
<item>
<reference value="#i3"/>
</item>
</entry>
<entry>
<item>
<reference value="#i4"/>
</item>
</entry>
</List>

27
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-profile-1.xml Normal file
View File

@ -0,0 +1,27 @@
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-slicing-profile-1"/>
<url value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-1"/>
<version value="0.1.0"/>
<name value="TestProfile1"/>
<title value="Test Profile #1"/>
<status value="draft"/>
<date value="2017-09-06T06:30:54+00:00"/>
<publisher value="HL7"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="Basic"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Basic"/>
<derivation value="constraint"/>
<differential>
<element id="Basic.code">
<path value="Basic.code"/>
<fixedCodeableConcept>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile1"/>
</coding>
</fixedCodeableConcept>
</element>
</differential>
</StructureDefinition>

27
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-profile-2.xml Normal file
View File

@ -0,0 +1,27 @@
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-slicing-profile-2"/>
<url value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-2"/>
<version value="0.1.0"/>
<name value="TestProfile2"/>
<title value="Test Profile #2"/>
<status value="draft"/>
<date value="2017-09-06T06:30:54+00:00"/>
<publisher value="HL7"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="Basic"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Basic"/>
<derivation value="constraint"/>
<differential>
<element id="Basic.code">
<path value="Basic.code"/>
<fixedCodeableConcept>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile2"/>
</coding>
</fixedCodeableConcept>
</element>
</differential>
</StructureDefinition>

27
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-profile-3.xml Normal file
View File

@ -0,0 +1,27 @@
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-slicing-profile-3"/>
<url value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-3"/>
<version value="0.1.0"/>
<name value="TestProfile3"/>
<title value="Test Profile #3"/>
<status value="draft"/>
<date value="3017-09-06T06:30:54+00:00"/>
<publisher value="HL7"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="Basic"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Basic"/>
<derivation value="constraint"/>
<differential>
<element id="Basic.code">
<path value="Basic.code"/>
<fixedCodeableConcept>
<coding>
<system value="http://hl7.org/fhir/test/CodeSystem/profile-slicing-codes"/>
<code value="profile3"/>
</coding>
</fixedCodeableConcept>
</element>
</differential>
</StructureDefinition>

66
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-profile-closed.xml Normal file
View File

@ -0,0 +1,66 @@
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-slicing-profile-list"/>
<url value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-list"/>
<version value="0.1.0"/>
<name value="TestProfileList"/>
<title value="Test Profile List"/>
<status value="draft"/>
<date value="3017-09-06T06:30:54+00:00"/>
<publisher value="HL7"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="List"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/List"/>
<derivation value="constraint"/>
<differential>
<element id="List.entry">
<path value="List.entry"/>
<slicing>
<discriminator>
<type value="profile"/>
<path value="item.resolve()"/>
</discriminator>
<ordered vale="false"/>
<rules value="closed"/>
</slicing>
</element>
<element id="List.entry:slice1">
<path value="List.entry"/>
<sliceName value="slice1"/>
<min value="1"/>
</element>
<element id="List.entry:slice1.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-1"/>
</type>
</element>
<element id="List.entry:slice2">
<path value="List.entry"/>
<sliceName value="slice2"/>
<min value="1"/>
<max value="3"/>
</element>
<element id="List.entry:slice2.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-2"/>
</type>
</element>
<element id="List.entry:slice3">
<path value="List.entry"/>
<sliceName value="slice3"/>
<max value="1"/>
</element>
<element id="List.entry:slice3.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-3"/>
</type>
</element>
</differential>
</StructureDefinition>

66
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-profile-open.xml Normal file
View File

@ -0,0 +1,66 @@
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-slicing-profile-list"/>
<url value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-list"/>
<version value="0.1.0"/>
<name value="TestProfileList"/>
<title value="Test Profile List"/>
<status value="draft"/>
<date value="3017-09-06T06:30:54+00:00"/>
<publisher value="HL7"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="List"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/List"/>
<derivation value="constraint"/>
<differential>
<element id="List.entry">
<path value="List.entry"/>
<slicing>
<discriminator>
<type value="profile"/>
<path value="item.resolve()"/>
</discriminator>
<ordered vale="false"/>
<rules value="open"/>
</slicing>
</element>
<element id="List.entry:slice1">
<path value="List.entry"/>
<sliceName value="slice1"/>
<min value="1"/>
</element>
<element id="List.entry:slice1.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-1"/>
</type>
</element>
<element id="List.entry:slice2">
<path value="List.entry"/>
<sliceName value="slice2"/>
<min value="1"/>
<max value="3"/>
</element>
<element id="List.entry:slice2.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-2"/>
</type>
</element>
<element id="List.entry:slice3">
<path value="List.entry"/>
<sliceName value="slice3"/>
<max value="1"/>
</element>
<element id="List.entry:slice3.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-3"/>
</type>
</element>
</differential>
</StructureDefinition>

66
org.hl7.fhir.validation/src/test/resources/validation-examples/profile-slicing-profile-ordered.xml Normal file
View File

@ -0,0 +1,66 @@
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-slicing-profile-list"/>
<url value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-list"/>
<version value="0.1.0"/>
<name value="TestProfileList"/>
<title value="Test Profile List"/>
<status value="draft"/>
<date value="3017-09-06T06:30:54+00:00"/>
<publisher value="HL7"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="List"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/List"/>
<derivation value="constraint"/>
<differential>
<element id="List.entry">
<path value="List.entry"/>
<slicing>
<discriminator>
<type value="profile"/>
<path value="item.resolve()"/>
</discriminator>
<ordered vale="true"/>
<rules value="open"/>
</slicing>
</element>
<element id="List.entry:slice1">
<path value="List.entry"/>
<sliceName value="slice1"/>
<min value="1"/>
</element>
<element id="List.entry:slice1.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-1"/>
</type>
</element>
<element id="List.entry:slice2">
<path value="List.entry"/>
<sliceName value="slice2"/>
<min value="1"/>
<max value="3"/>
</element>
<element id="List.entry:slice2.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-2"/>
</type>
</element>
<element id="List.entry:slice3">
<path value="List.entry"/>
<sliceName value="slice3"/>
<max value="1"/>
</element>
<element id="List.entry:slice3.item">
<path value="List.entry.item"/>
<type>
<code value="Reference"/>
<targetProfile value="http://hl7.org/fhir/test/StructureDefinition/profile-slicing-profile-3"/>
</type>
</element>
</differential>
</StructureDefinition>