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 #800 from hapifhir/gg-202204-xver 

fix problem with non-new data types on xver extensions
This commit is contained in:
Grahame Grieve 2022-04-28 10:35:30 +10:00 committed by GitHub
parent c4676c5dc9 3712804353
commit f8d869172c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java
View File

@ -146,25 +146,27 @@ public class XVerExtensionManager {
public void populateTypes(JsonObject path, ElementDefinition val, String verSource, String verTarget) { public void populateTypes(JsonObject path, ElementDefinition val, String verSource, String verTarget) {
for (JsonElement i : path.getAsJsonArray("types")) { for (JsonElement i : path.getAsJsonArray("types")) {
String s = i.getAsString(); String s = i.getAsString();
if (s.contains("(")) { if (!s.startsWith("!")) {
String t = s.substring(0, s.indexOf("(")); if (s.contains("(")) {
TypeRefComponent tr = val.addType().setCode(translateDataType(verTarget, t)); String t = s.substring(0, s.indexOf("("));
if (hasTargets(tr.getCode()) ) { TypeRefComponent tr = val.addType().setCode(translateDataType(verTarget, t));
s = s.substring(t.length()+1); if (hasTargets(tr.getCode()) ) {
for (String p : s.substring(0, s.length()-1).split("\\|")) { s = s.substring(t.length()+1);
if ("Any".equals(p)) { for (String p : s.substring(0, s.length()-1).split("\\|")) {
tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/Resource"); if ("Any".equals(p)) {
} else if (p.contains(",")) { tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/Resource");
for (String pp : p.split("\\,")) { } else if (p.contains(",")) {
tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+pp); for (String pp : p.split("\\,")) {
tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+pp);
}
} else {
tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+p);
} }
} else {
tr.addTargetProfile("http://hl7.org/fhir/StructureDefinition/"+p);
} }
} }
} else {
val.addType().setCode(translateDataType(verTarget, s));
} }
} else {
val.addType().setCode(translateDataType(verTarget, s));
} }
} }
} }