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

allow getting children in a profile on a diff

This commit is contained in:
Grahame Grieve 2019-03-05 14:25:28 +11:00
parent 0477bf174e
commit adf972be25
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,13 +307,18 @@ public class ProfileUtilities extends TranslatingUtilities {
* @return A List containing the element children (all of them are Elements) * @return A List containing the element children (all of them are Elements)
*/ */
public static List<ElementDefinition> getChildList(StructureDefinition profile, String path, String id) { public static List<ElementDefinition> getChildList(StructureDefinition profile, String path, String id) {
return getChildList(profile, path, id, false);
}
public static List<ElementDefinition> getChildList(StructureDefinition profile, String path, String id, boolean diff) {
List<ElementDefinition> res = new ArrayList<ElementDefinition>(); List<ElementDefinition> res = new ArrayList<ElementDefinition>();
boolean capturing = id==null; boolean capturing = id==null;
if (id==null && !path.contains(".")) if (id==null && !path.contains("."))
capturing = true; capturing = true;
for (ElementDefinition e : profile.getSnapshot().getElement()) { List<ElementDefinition> list = diff ? profile.getDifferential().getElement() : profile.getSnapshot().getElement();
for (ElementDefinition e : list) {
if (e == null) if (e == null)
throw new Error("element = null: "+profile.getUrl()); throw new Error("element = null: "+profile.getUrl());
if (e.getId() == null) if (e.getId() == null)
@ -332,9 +337,9 @@ public class ProfileUtilities extends TranslatingUtilities {
if (!Utilities.noString(e.getContentReference()) && path.startsWith(p)) { if (!Utilities.noString(e.getContentReference()) && path.startsWith(p)) {
if (path.length() > p.length()) if (path.length() > p.length())
return getChildList(profile, e.getContentReference()+"."+path.substring(p.length()+1), null); return getChildList(profile, e.getContentReference()+"."+path.substring(p.length()+1), null, diff);
else else
return getChildList(profile, e.getContentReference(), null); return getChildList(profile, e.getContentReference(), null, diff);
} else if (p.startsWith(path+".") && !p.equals(path)) { } else if (p.startsWith(path+".") && !p.equals(path)) {
String tail = p.substring(path.length()+1); String tail = p.substring(path.length()+1);
@ -348,9 +353,12 @@ public class ProfileUtilities extends TranslatingUtilities {
return res; return res;
} }
public static List<ElementDefinition> getChildList(StructureDefinition structure, ElementDefinition element, boolean diff) {
return getChildList(structure, element.getPath(), element.getId(), diff);
}
public static List<ElementDefinition> getChildList(StructureDefinition structure, ElementDefinition element) { public static List<ElementDefinition> getChildList(StructureDefinition structure, ElementDefinition element) {
return getChildList(structure, element.getPath(), element.getId()); return getChildList(structure, element.getPath(), element.getId(), false);
} }
public void updateMaps(StructureDefinition base, StructureDefinition derived) throws DefinitionException { public void updateMaps(StructureDefinition base, StructureDefinition derived) throws DefinitionException {

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

@ -26,6 +26,7 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;