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

updates for R5 StructureMap syntax

This commit is contained in:
Grahame Grieve 2024-02-25 19:20:52 +11:00
parent cec8a36d35
commit e63a2ad16f
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
View File

@ -143,11 +143,11 @@ public class StructureMapUtilities {
public static String render(StructureMap map) {
StringBuilder b = new StringBuilder();
b.append("map \"");
b.append(map.getUrl());
b.append("\" = \"");
b.append(Utilities.escapeJson(map.getName()));
b.append("\"\r\n\r\n");
b.append("/// url = \""+map.getUrl()+"\"\r\n");
b.append("/// name = \""+map.getName()+"\"\r\n");
b.append("/// title = \""+map.getTitle()+"\"\r\n");
b.append("/// status = \""+map.getStatus().toCode()+"\"\r\n");
b.append("\r\n");
if (map.getDescription() != null) {
renderMultilineDoco(b, map.getDescription(), 0);
b.append("\r\n");
@ -385,7 +385,7 @@ public class StructureMapUtilities {
for (int i = 0; i < indent; i++)
b.append(' ');
b.append("}");
} else {
} else if (!canBeAbbreviated) {
if (r.hasDependent()) {
b.append(" then ");
boolean first = true;
@ -450,7 +450,7 @@ public class StructureMapUtilities {
return
(r.getSource().size() == 1 && r.getSourceFirstRep().hasElement() && r.getSourceFirstRep().hasVariable()) &&
(r.getTarget().size() == 1 && r.getTargetFirstRep().hasVariable() && (r.getTargetFirstRep().getTransform() == null || r.getTargetFirstRep().getTransform() == StructureMapTransform.CREATE) && r.getTargetFirstRep().getParameter().size() == 0) &&
(r.getDependent().size() == 0) && (r.getRule().size() == 0);
(r.getDependent().size() == 0 || (r.getDependent().size() == 1 && StructureMapUtilities.DEF_GROUP_NAME.equals(r.getDependentFirstRep().getName()))) && (r.getRule().size() == 0);
}
public static String sourceToString(StructureMapGroupRuleSourceComponent r) {
@ -655,6 +655,9 @@ public class StructureMapUtilities {
case "title" :
result.setTitle(lexer.readConstant("title"));
break;
case "description" :
result.setTitle(lexer.readConstant("description"));
break;
case "status" :
result.setStatus(PublicationStatus.fromCode(lexer.readConstant("status")));
break;

2
org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/StructureMapUtilitiesTest.java
View File

@ -59,7 +59,7 @@ public class StructureMapUtilitiesTest implements ITransformerServices {
private void assertSerializeDeserialize(StructureMap structureMap) {
Assertions.assertEquals("syntax", structureMap.getName());
Assertions.assertEquals("Title of this map\r\nAuthor", structureMap.getDescription());
Assertions.assertEquals("description", structureMap.getDescription());
Assertions.assertEquals("http://github.com/FHIR/fhir-test-cases/r5/fml/syntax", structureMap.getUrl());
Assertions.assertEquals("Patient", structureMap.getStructure().get(0).getAlias());
Assertions.assertEquals("http://hl7.org/fhir/StructureDefinition/Patient", structureMap.getStructure().get(0).getUrl());