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

fix SD loading order problem in main build

This commit is contained in:
Grahame Grieve 2019-08-06 14:49:22 +10:00
parent 2dc71f33ff
commit a81701ab27
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1206,6 +1206,8 @@ public class ProfileUtilities extends TranslatingUtilities {
} else if (!ed.hasSliceName() && !s.equals("[x]")) { } else if (!ed.hasSliceName() && !s.equals("[x]")) {
if (isDataType(s)) if (isDataType(s))
typeList.add(new TypeSlice(ed, s)); typeList.add(new TypeSlice(ed, s));
else if (isConstrainedDataType(s))
typeList.add(new TypeSlice(ed, baseType(s)));
else if (isPrimitive(Utilities.uncapitalize(s))) else if (isPrimitive(Utilities.uncapitalize(s)))
typeList.add(new TypeSlice(ed, Utilities.uncapitalize(s))); typeList.add(new TypeSlice(ed, Utilities.uncapitalize(s)));
} else if (!ed.hasSliceName() && s.equals("[x]")) } else if (!ed.hasSliceName() && s.equals("[x]"))
@ -3446,13 +3448,37 @@ public class ProfileUtilities extends TranslatingUtilities {
private boolean isDataType(String value) { private boolean isDataType(String value) {
StructureDefinition sd = context.fetchTypeDefinition(value); StructureDefinition sd = context.fetchTypeDefinition(value);
return sd != null && sd.getKind() == StructureDefinitionKind.COMPLEXTYPE; if (sd == null) // might be running before all SDs are available
return Utilities.existsInList(value, "Address", "Age", "Annotation", "Attachment", "CodeableConcept", "Coding", "ContactPoint", "Count", "Distance", "Duration", "HumanName", "Identifier", "Money", "Period", "Quantity", "Range", "Ratio", "Reference", "SampledData", "Signature", "Timing",
"ContactDetail", "Contributor", "DataRequirement", "Expression", "ParameterDefinition", "RelatedArtifact", "TriggerDefinition", "UsageContext");
else
return sd.getKind() == StructureDefinitionKind.COMPLEXTYPE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION;
}
private boolean isConstrainedDataType(String value) {
StructureDefinition sd = context.fetchTypeDefinition(value);
if (sd == null) // might be running before all SDs are available
return Utilities.existsInList(value, "SimpleQuantity", "MoneyQuantity");
else
return sd.getKind() == StructureDefinitionKind.COMPLEXTYPE && sd.getDerivation() == TypeDerivationRule.CONSTRAINT;
}
private String baseType(String value) {
StructureDefinition sd = context.fetchTypeDefinition(value);
if (sd != null) // might be running before all SDs are available
return sd.getType();
if (Utilities.existsInList(value, "SimpleQuantity", "MoneyQuantity"))
return "Quantity";
throw new Error("Internal error - type not known "+value);
} }
public boolean isPrimitive(String value) { public boolean isPrimitive(String value) {
StructureDefinition sd = context.fetchTypeDefinition(value); StructureDefinition sd = context.fetchTypeDefinition(value);
return sd != null && sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE; if (sd == null) // might be running before all SDs are available
return Utilities.existsInList(value, "base64Binary", "boolean", "canonical", "code", "date", "dateTime", "decimal", "id", "instant", "integer", "markdown", "oid", "positiveInt", "string", "time", "unsignedInt", "uri", "url", "uuid");
else
return sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE;
} }
// private static String listStructures(StructureDefinition p) { // private static String listStructures(StructureDefinition p) {