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

Add support for R6 to R4 version enumeration

This commit is contained in:
Grahame Grieve 2024-09-23 09:11:46 -04:00
parent be8944ab94
commit f868576840
3 changed files with 957 additions and 1199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,12 +230,6 @@ public class Enumerations40_50 {
case _4_3_0: case _4_3_0:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._4_3_0);
break; 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;
case _5_0_0: case _5_0_0:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0);
break; break;
@ -254,6 +248,15 @@ public class Enumerations40_50 {
case _5_0_0DRAFTFINAL: case _5_0_0DRAFTFINAL:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0DRAFTFINAL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._5_0_0DRAFTFINAL);
break; break;
case _6_0_0:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._6_0_0);
break;
case _6_0_0_BALLOT1:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._6_0_0_BALLOT1);
break;
case _6_0_0_BALLOT2:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion._6_0_0_BALLOT2);
break;
default: default:
tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL); tgt.setValue(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.NULL);
break; break;
@ -342,12 +345,6 @@ public class Enumerations40_50 {
case _4_3_0: case _4_3_0:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._4_3_0);
break; 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;
case _5_0_0: case _5_0_0:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0);
break; break;
@ -366,6 +363,15 @@ public class Enumerations40_50 {
case _5_0_0DRAFTFINAL: case _5_0_0DRAFTFINAL:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0DRAFTFINAL); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._5_0_0DRAFTFINAL);
break; break;
case _6_0_0:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._6_0_0);
break;
case _6_0_0_BALLOT1:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._6_0_0_BALLOT1);
break;
case _6_0_0_BALLOT2:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion._6_0_0_BALLOT2);
break;
default: default:
tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL); tgt.setValue(org.hl7.fhir.r4.model.Enumerations.FHIRVersion.NULL);

2117
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/model/Enumerations.java
View File

File diff suppressed because it is too large Load Diff

9
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/formats/XmlLocationAnnotator.java
View File

@ -80,6 +80,15 @@ public class XmlLocationAnnotator extends XMLFilterImpl {
} }
} }
@Override
public Object getProperty(String name) throws SAXNotRecognizedException, SAXNotSupportedException {
if (!name.equals("http://javax.xml.xmlconstants/property/accessExternalDTD")) {
return null;
} else {
return super.getProperty(name);
}
}
@Override @Override
public void setDocumentLocator(Locator locator) { public void setDocumentLocator(Locator locator) {
super.setDocumentLocator(locator); super.setDocumentLocator(locator);