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

Minor correction to align with FHIR R5 RDF changes

This commit is contained in:
dksharma 2023-02-26 21:44:07 -06:00
parent e64461e940
commit 5fde3a2106
2 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ShExGenerator.java
View File

@ -113,7 +113,7 @@ public class ShExGenerator {
);
private List<String> shortIdException = Arrays.asList(
"Element", "Resource", "Extension", "base64Binary", "boolean",
"base64Binary", "boolean",
"date", "dateTime", "decimal", "instant", "integer64",
"integer", "string", "time", "uri"
);
@ -174,7 +174,7 @@ public class ShExGenerator {
private static String SIMPLE_ELEMENT_DEFN_TEMPLATE = "@<$typ$>$vsdef$";
// Value Set Element
private static String VALUESET_DEFN_TEMPLATE = " AND\n\t{fhir:value @$vsn$}";
private static String VALUESET_DEFN_TEMPLATE = " AND\n\t{fhir:v @$vsn$}";
// Fixed Value Template
private static String FIXED_VALUE_TEMPLATE = " AND\n\t{fhir:value [\"$val$\"]}";
@ -442,9 +442,6 @@ public class ShExGenerator {
"This might not be an issue, if this resource is normative base or a meta resource");
shapeDefinitions.append("<" + sd.getName() + "> CLOSED {\n}");
}
if (!imports.isEmpty())
imports.removeIf(s -> s.contains(sd.getName()));
}
shapeDefinitions.append(emitInnerTypes());
@ -502,6 +499,10 @@ public class ShExGenerator {
StringBuffer allImports = new StringBuffer("");
if (!imports.isEmpty()) {
uniq_structures.forEach((StructureDefinition sdstruct) -> {
imports.removeIf(s -> s.contains(sdstruct.getName()));
});
imports.sort(Comparator.comparingInt(String::length));
imports.forEach((String imp) -> {
ST import_def = tmplt(IMPORT_TEMPLATE);
@ -553,7 +554,8 @@ public class ShExGenerator {
private String getExtendedType(ElementDefinition ed){
String bd = getBaseTypeName(ed);
if (bd != null && !baseDataTypes.contains(bd)) {
//if (bd != null && !baseDataTypes.contains(bd)) {
if (bd!=null) {
addImport("<" + bd + ">");
bd = "> EXTENDS @<" + bd;
}
@ -590,8 +592,11 @@ public class ShExGenerator {
shape_defn.add("resourceDecl", tmplt(ROOT_TEMPLATE).render());
else {
String rootTmpl = tmplt(ROOT_TEMPLATE).render();
if (baseDataTypes.contains(getBaseTypeName(sd)))
rootTmpl = "";
String btn = getBaseTypeName(sd);
if ((baseDataTypes.contains(btn))||
(shortIdException.contains(btn)))
rootTmpl = "\n";
ST resource_decl = tmplt(RESOURCE_DECL_TEMPLATE).
add("id", sd.getId()).
add("root", rootTmpl);
@ -646,9 +651,7 @@ public class ShExGenerator {
String[] els = cstype.split("/");
cstype = els[els.length - 1];
}
// Implement here if SD type == constraint source OR SD type is Primitive or DataType then add constraint to SD otherwise skip it.
//if ((sdType.equals(cstype)) || baseDataTypes.contains(sdType) || baseDataTypes.contains(bd)) {
//if ((sdType.equals(cstype)) || baseDataTypes.contains(sdType)) {
String id = ed.hasBase() ? ed.getBase().getPath() : ed.getPath();
String shortId = id.substring(id.lastIndexOf(".") + 1);
if ((ed.hasContentReference() && (!ed.hasType())) || (id.equals(sd.getName() + "." + shortId))) {
@ -1305,12 +1308,16 @@ public class ShExGenerator {
innerTypes.add(new ImmutablePair<StructureDefinition, ElementDefinition>(sd, ed));
}
if ("BackboneElement".equals(typ))
typ = id;
defn = simpleElement(sd, ed, typ);
String refChoices = "";
if (id.endsWith("[x]")) {
defn = " (" + genChoiceTypes(sd, ed, shortId) + ") ";
//defn = " (" + genChoiceTypes(sd, ed, shortId) + ")";
defn = " " + genChoiceTypes(sd, ed, shortId) + " ";
//defn += " AND { rdf:type IRI } ";
} else {
if (ed.getType().size() == 1) {
@ -1371,7 +1378,7 @@ public class ShExGenerator {
} else {
if (!refChoices.isEmpty()) {
defn += " AND {fhir:link \n\t\t\t@<" +
refChoices.replaceAll("_OR_", "> OR \n\t\t\t@<") + "> }";
refChoices.replaceAll("_OR_", "> OR \n\t\t\t@<") + "> ? }";
}
}
@ -1384,7 +1391,7 @@ public class ShExGenerator {
}
private boolean changeShortName(StructureDefinition sd, ElementDefinition ed){
return !shortIdException.contains(sd.getName());
return shortIdException.contains(sd.getName());
}
private void addImport(String typeDefn) {
@ -1803,7 +1810,7 @@ public class ShExGenerator {
for(ValueSet.ValueSetExpansionContainsComponent vsec : vse.getValueset().getExpansion().getContains())
valid_codes.add("\"" + vsec.getCode() + "\"");
}
return vsd.add("val_list", valid_codes.size() > 0? " [" + StringUtils.join(valid_codes, " ") + ']' : " EXTERNAL").render();
return vsd.add("val_list", valid_codes.size() > 0? " [" + StringUtils.join(valid_codes, " ") + ']' : " xsd:string #EXTERNAL").render();
}

7
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/ShexGeneratorTests.java
View File

@ -58,6 +58,11 @@ public class ShexGeneratorTests {
doTest("uri", ShexGeneratorTestUtils.RESOURCE_CATEGORY.STRUCTURE_DEFINITION);
}
@Test
public void testPatient() throws FHIRException, IOException, UcumException {
doTest("Patient", ShexGeneratorTestUtils.RESOURCE_CATEGORY.STRUCTURE_DEFINITION);
}
@Test
public void testObservation() throws FHIRException, IOException, UcumException {
doTest("Observation", ShexGeneratorTestUtils.RESOURCE_CATEGORY.STRUCTURE_DEFINITION);
@ -277,7 +282,6 @@ public class ShexGeneratorTests {
doTestBatchSD(sds, useSelectedExtensions, policy, true, true, false);
}
System.out.println("************************ END PROCESSING ******************************");
System.out.println("************************************************************************");
@ -330,6 +334,7 @@ public class ShexGeneratorTests {
Schema sch = validator.schema();
Assert.assertNotNull(sch);
System.out.println("VALIDATION PASSED for ShEx Schema " + sd.getName() + " (Kind:" + cat + ")");
} catch (Exception e) {
System.out.println("VALIDATION FAILED for ShEx Schema " + sd.getName() + " (Kind:" + cat + ")");