diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2bc5d2e2c..76aa36c23 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,12 +1,7 @@ ## Validator Changes -* fix handling of xver extensions with choice sub-extensions -* validate consistency of extension modifier flag with extension use in a profile +* no changes ## Other code changes -* more presenting extensions when rendering. -* Get package id from 'package' field when 'npm-package' unavailable -* Ignore META-INF contents from other dependencies while building Validator jar -* Fix to r5 TestingUtilities to allow NarrativeGenerationTests to pass. -* fix handling to xver extensions generating snapshots \ No newline at end of file +* Fix for FHIRPathEngine.funcReplaceMatches() incorrectly returning Boolean in DSTU2 & DSTU3 diff --git a/org.hl7.fhir.convertors/pom.xml b/org.hl7.fhir.convertors/pom.xml index 4a8f14076..237b75e5c 100644 --- a/org.hl7.fhir.convertors/pom.xml +++ b/org.hl7.fhir.convertors/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java index 002f80841..eb3430632 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java @@ -227,6 +227,12 @@ public class Enumerations40_50 { case _4_1_0: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_1_0); break; + case _4_3_0_CIBUILD: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0CIBUILD); + break; + case _4_3_0_SNAPSHOT1: + tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0SNAPSHOT1); + break; default: tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL); break; @@ -312,6 +318,12 @@ public class Enumerations40_50 { case _4_1_0: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_1_0); break; + case _4_3_0CIBUILD: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_CIBUILD); + break; + case _4_3_0SNAPSHOT1: + tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0_SNAPSHOT1); + break; default: tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL); break; diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/analysis/Analyser.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/analysis/Analyser.java index 732f9ed8a..37a64b79a 100644 --- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/analysis/Analyser.java +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/analysis/Analyser.java @@ -249,8 +249,8 @@ public class Analyser { } protected String getTypename(TypeRefComponent type) throws Exception { - if (type.hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")) { - return type.getExtensionString("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type"); + if (type.hasExtension(ToolingExtensions.EXT_FHIR_TYPE)) { + return type.getExtensionString(ToolingExtensions.EXT_FHIR_TYPE); } else { return getTypeName(type.getCode()); } diff --git a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java index e81bbb029..6ce0560dc 100644 --- a/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java +++ b/org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java @@ -172,8 +172,8 @@ public class JavaBaseGenerator extends OutputStreamWriter { } protected String getTypename(TypeRefComponent type) throws Exception { - if (type.hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")) { - return type.getExtensionString("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type"); + if (type.hasExtension(ToolingExtensions.EXT_FHIR_TYPE)) { + return type.getExtensionString(ToolingExtensions.EXT_FHIR_TYPE); } else { return getTypeName(type.getCode()); } diff --git a/org.hl7.fhir.dstu2/pom.xml b/org.hl7.fhir.dstu2/pom.xml index e31fd4a19..1effe69dd 100644 --- a/org.hl7.fhir.dstu2/pom.xml +++ b/org.hl7.fhir.dstu2/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/FHIRPathEngine.java b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/FHIRPathEngine.java index 7875be585..5fe9080c5 100644 --- a/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/FHIRPathEngine.java +++ b/org.hl7.fhir.dstu2/src/main/java/org/hl7/fhir/dstu2/utils/FHIRPathEngine.java @@ -1,33 +1,33 @@ package org.hl7.fhir.dstu2.utils; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - */ +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + */ @@ -2112,13 +2112,15 @@ public class FHIRPathEngine { private List funcReplaceMatches(ExecutionContext context, List focus, ExpressionNode exp) throws PathEngineException { List result = new ArrayList(); - String sw = convertToString(execute(context, focus, exp.getParameters().get(0), true)); + String regex = convertToString(execute(context, focus, exp.getParameters().get(0), true)); + String repl = convertToString(execute(context, focus, exp.getParameters().get(1), true)); - if (focus.size() == 1 && !Utilities.noString(sw)) - result.add(new BooleanType(convertToString(focus.get(0)).contains(sw))); - else - result.add(new BooleanType(false)); - return result; + if (focus.size() == 1 && !Utilities.noString(regex)) { + result.add(new StringType(convertToString(focus.get(0)).replaceAll(regex, repl))); + } else { + result.add(new StringType(convertToString(focus.get(0)))); + } + return result; } diff --git a/org.hl7.fhir.dstu2016may/pom.xml b/org.hl7.fhir.dstu2016may/pom.xml index 7bb4e757d..7d94a2118 100644 --- a/org.hl7.fhir.dstu2016may/pom.xml +++ b/org.hl7.fhir.dstu2016may/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/pom.xml b/org.hl7.fhir.dstu3/pom.xml index f2da5a89d..042320848 100644 --- a/org.hl7.fhir.dstu3/pom.xml +++ b/org.hl7.fhir.dstu3/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java index 54191747f..0e50f7b6f 100644 --- a/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java +++ b/org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/utils/FHIRPathEngine.java @@ -1,33 +1,33 @@ package org.hl7.fhir.dstu3.utils; -/* - Copyright (c) 2011+, HL7, Inc. - All rights reserved. - - Redistribution and use in source and binary forms, with or without modification, - are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - * Neither the name of HL7 nor the names of its contributors may be used to - endorse or promote products derived from this software without specific - prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - - */ +/* + Copyright (c) 2011+, HL7, Inc. + All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + * Neither the name of HL7 nor the names of its contributors may be used to + endorse or promote products derived from this software without specific + prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + */ @@ -2244,12 +2244,14 @@ public class FHIRPathEngine { private List funcReplaceMatches(ExecutionContext context, List focus, ExpressionNode exp) throws FHIRException { List result = new ArrayList(); - String sw = convertToString(execute(context, focus, exp.getParameters().get(0), true)); + String regex = convertToString(execute(context, focus, exp.getParameters().get(0), true)); + String repl = convertToString(execute(context, focus, exp.getParameters().get(1), true)); - if (focus.size() == 1 && !Utilities.noString(sw)) - result.add(new BooleanType(convertToString(focus.get(0)).contains(sw))); - else - result.add(new BooleanType(false)); + if (focus.size() == 1 && !Utilities.noString(regex)) { + result.add(new StringType(convertToString(focus.get(0)).replaceAll(regex, repl))); + } else { + result.add(new StringType(convertToString(focus.get(0)))); + } return result; } diff --git a/org.hl7.fhir.r4/pom.xml b/org.hl7.fhir.r4/pom.xml index b5a55706f..94908fa80 100644 --- a/org.hl7.fhir.r4/pom.xml +++ b/org.hl7.fhir.r4/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r4b/pom.xml b/org.hl7.fhir.r4b/pom.xml index 5ed3f9ff0..381750fea 100644 --- a/org.hl7.fhir.r4b/pom.xml +++ b/org.hl7.fhir.r4b/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/pom.xml b/org.hl7.fhir.r5/pom.xml index 34bd8e422..598874c46 100644 --- a/org.hl7.fhir.r5/pom.xml +++ b/org.hl7.fhir.r5/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java index b45099c66..6dd2229df 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java @@ -6924,9 +6924,9 @@ The primary difference between a medicationusage and a medicationadministration return _4_1_0; if ("4.2.0".equals(codeString)) return _4_2_0; - if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) + if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) return _4_3_0SNAPSHOT1; - if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) + if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return _4_3_0CIBUILD; if ("4.4.0".equals(codeString)) return _4_4_0; @@ -6934,9 +6934,9 @@ The primary difference between a medicationusage and a medicationadministration return _4_5_0; if ("4.6.0".equals(codeString)) return _4_6_0; - if ("5.0.0-snapshot1".equalsIgnoreCase(codeString)) + if ("5.0.0-snapshot1".equalsIgnoreCase(codeString)) return _5_0_0SNAPSHOT1; - if ("5.0.0-cibuild".equalsIgnoreCase(codeString)) + if ("5.0.0-cibuild".equalsIgnoreCase(codeString)) return _5_0_0CIBUILD; throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } @@ -7158,7 +7158,7 @@ public String toCode(int len) { public boolean isR4B() { - return toCode().startsWith("4.1") ||toCode().startsWith("4.3"); + return toCode().startsWith("4.1") || toCode().startsWith("4.3"); } // end addition @@ -7219,9 +7219,9 @@ public String toCode(int len) { return FHIRVersion._4_1_0; if ("4.2.0".equals(codeString)) return FHIRVersion._4_2_0; - if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) + if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0SNAPSHOT1; - if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) + if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) return FHIRVersion._4_3_0CIBUILD; if ("4.4.0".equals(codeString)) return FHIRVersion._4_4_0; @@ -7229,9 +7229,9 @@ public String toCode(int len) { return FHIRVersion._4_5_0; if ("4.6.0".equals(codeString)) return FHIRVersion._4_6_0; - if ("5.0.0-snapshot1".equalsIgnoreCase(codeString)) + if ("5.0.0-snapshot1".equalsIgnoreCase(codeString)) return FHIRVersion._5_0_0SNAPSHOT1; - if ("5.0.0-cibuild".equalsIgnoreCase(codeString)) + if ("5.0.0-cibuild".equalsIgnoreCase(codeString)) return FHIRVersion._5_0_0CIBUILD; throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); } @@ -7243,71 +7243,71 @@ public String toCode(int len) { String codeString = ((PrimitiveType) code).asStringValue(); if (codeString == null || "".equals(codeString)) return null; - if ("0.01".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_01); - if ("0.05".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_05); - if ("0.06".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_06); - if ("0.11".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_11); - if ("0.0.80".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_0_80); - if ("0.0.81".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_0_81); - if ("0.0.82".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_0_82); - if ("0.4.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_4_0); - if ("0.5.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._0_5_0); - if ("1.0.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_0_0); - if ("1.0.1".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_0_1); - if ("1.0.2".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_0_2); - if ("1.1.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_1_0); - if ("1.4.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_4_0); - if ("1.6.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_6_0); - if ("1.8.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._1_8_0); - if ("3.0.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._3_0_0); - if ("3.0.1".equals(codeString)) - return new Enumeration(this, FHIRVersion._3_0_1); - if ("3.0.2".equals(codeString)) - return new Enumeration(this, FHIRVersion._3_0_2); - if ("3.3.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._3_3_0); - if ("3.5.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._3_5_0); - if ("4.0.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_0_0); - if ("4.0.1".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_0_1); - if ("4.1.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_1_0); - if ("4.2.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_2_0); - if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) - return new Enumeration(this, FHIRVersion._4_3_0SNAPSHOT1); - if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) - return new Enumeration(this, FHIRVersion._4_3_0CIBUILD); - if ("4.4.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_4_0); - if ("4.5.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_5_0); - if ("4.6.0".equals(codeString)) - return new Enumeration(this, FHIRVersion._4_6_0); - if ("5.0.0-snapshot1".equalsIgnoreCase(codeString)) - return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT1); - if ("5.0.0-cibuild".equalsIgnoreCase(codeString)) - return new Enumeration(this, FHIRVersion._5_0_0CIBUILD); - throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); + if ("0.01".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_01); + if ("0.05".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_05); + if ("0.06".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_06); + if ("0.11".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_11); + if ("0.0.80".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_0_80); + if ("0.0.81".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_0_81); + if ("0.0.82".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_0_82); + if ("0.4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_4_0); + if ("0.5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._0_5_0); + if ("1.0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_0_0); + if ("1.0.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_0_1); + if ("1.0.2".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_0_2); + if ("1.1.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_1_0); + if ("1.4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_4_0); + if ("1.6.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_6_0); + if ("1.8.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._1_8_0); + if ("3.0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_0_0); + if ("3.0.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_0_1); + if ("3.0.2".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_0_2); + if ("3.3.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_3_0); + if ("3.5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._3_5_0); + if ("4.0.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_0_0); + if ("4.0.1".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_0_1); + if ("4.1.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_1_0); + if ("4.2.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_2_0); + if ("4.3.0-snapshot1".equalsIgnoreCase(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0SNAPSHOT1); + if ("4.3.0-cibuild".equalsIgnoreCase(codeString)) + return new Enumeration(this, FHIRVersion._4_3_0CIBUILD); + if ("4.4.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_4_0); + if ("4.5.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_5_0); + if ("4.6.0".equals(codeString)) + return new Enumeration(this, FHIRVersion._4_6_0); + if ("5.0.0-snapshot1".equalsIgnoreCase(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0SNAPSHOT1); + if ("5.0.0-cibuild".equalsIgnoreCase(codeString)) + return new Enumeration(this, FHIRVersion._5_0_0CIBUILD); + throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); } public String toCode(FHIRVersion code) { if (code == FHIRVersion._0_01) diff --git a/org.hl7.fhir.report/pom.xml b/org.hl7.fhir.report/pom.xml index 0de887735..57713cfae 100644 --- a/org.hl7.fhir.report/pom.xml +++ b/org.hl7.fhir.report/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.utilities/pom.xml b/org.hl7.fhir.utilities/pom.xml index 11840b91e..1d4a14155 100644 --- a/org.hl7.fhir.utilities/pom.xml +++ b/org.hl7.fhir.utilities/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation.cli/pom.xml b/org.hl7.fhir.validation.cli/pom.xml index 1899d4578..27d7a0274 100644 --- a/org.hl7.fhir.validation.cli/pom.xml +++ b/org.hl7.fhir.validation.cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/pom.xml b/org.hl7.fhir.validation/pom.xml index ba7b4fbde..ee3099531 100644 --- a/org.hl7.fhir.validation/pom.xml +++ b/org.hl7.fhir.validation/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT ../pom.xml diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index 54c748c7a..3e94b0f9d 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -1871,7 +1871,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat for (StructureDefinitionContextComponent ctxt : list) { res.add(ctxt.copy()); } - if ("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type".equals(extUrl)) { + if (ToolingExtensions.EXT_FHIR_TYPE.equals(extUrl)) { list.get(0).setExpression("ElementDefinition.type"); } // the history of this is a mess - see https://jira.hl7.org/browse/FHIR-13328 diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java index 0bbd1792a..a69ecaa9b 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java @@ -133,8 +133,8 @@ public class StructureDefinitionValidator extends BaseValidator { typeMustSupport = true; } String tc = type.getChildValue("code"); - if (type.hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")) { - tc = type.getExtensionValue("http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type").primitiveValue(); + if (type.hasExtension(ToolingExtensions.EXT_FHIR_TYPE)) { + tc = type.getExtensionValue(ToolingExtensions.EXT_FHIR_TYPE).primitiveValue(); } if (Utilities.noString(tc) && type.hasChild("code")) { if (type.getNamedChild("code").hasExtension("http://hl7.org/fhir/StructureDefinition/structuredefinition-json-type")) { diff --git a/pom.xml b/pom.xml index 9680bb679..fa721fe1d 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ HAPI FHIR --> org.hl7.fhir.core - 5.6.37-SNAPSHOT + 5.6.38-SNAPSHOT pom