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

Merge pull request #763 from hapifhir/R4B-fixes 

R4 b fixes
This commit is contained in:
Grahame Grieve 2022-03-15 06:13:13 +11:00 committed by GitHub
parent d7eb9c70ee 335800c932
commit fa75f7d79a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 93 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/resources40_50/Enumerations40_50.java
View File

@ -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;

4
org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/analysis/Analyser.java
View File

@ -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());
}

4
org.hl7.fhir.core.generator/src/org/hl7/fhir/core/generator/codegen/JavaBaseGenerator.java
View File

@ -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());
}

148
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java
View File

@ -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<FHIRVersion>(this, FHIRVersion._0_01);
if ("0.05".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_05);
if ("0.06".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_06);
if ("0.11".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_11);
if ("0.0.80".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_80);
if ("0.0.81".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_81);
if ("0.0.82".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_82);
if ("0.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4_0);
if ("0.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5_0);
if ("1.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_0);
if ("1.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_1);
if ("1.0.2".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_2);
if ("1.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1_0);
if ("1.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4_0);
if ("1.6.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6_0);
if ("1.8.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8_0);
if ("3.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_0);
if ("3.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_1);
if ("3.0.2".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_2);
if ("3.3.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3_0);
if ("3.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5_0);
if ("4.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0);
if ("4.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1);
if ("4.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0);
if ("4.2.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0);
if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1);
if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD);
if ("4.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4_0);
if ("4.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5_0);
if ("4.6.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6_0);
if ("5.0.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1);
if ("5.0.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD);
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
if ("0.01".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_01);
if ("0.05".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_05);
if ("0.06".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_06);
if ("0.11".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_11);
if ("0.0.80".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_80);
if ("0.0.81".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_81);
if ("0.0.82".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_82);
if ("0.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4_0);
if ("0.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5_0);
if ("1.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_0);
if ("1.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_1);
if ("1.0.2".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_2);
if ("1.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1_0);
if ("1.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4_0);
if ("1.6.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6_0);
if ("1.8.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8_0);
if ("3.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_0);
if ("3.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_1);
if ("3.0.2".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_2);
if ("3.3.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3_0);
if ("3.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5_0);
if ("4.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0);
if ("4.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1);
if ("4.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0);
if ("4.2.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0);
if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1);
if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD);
if ("4.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4_0);
if ("4.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5_0);
if ("4.6.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6_0);
if ("5.0.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1);
if ("5.0.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD);
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
}
public String toCode(FHIRVersion code) {
if (code == FHIRVersion._0_01)

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

@ -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

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/type/StructureDefinitionValidator.java
View File

@ -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")) {