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 internal exception with missing type in R3 + add missing short definitions from differential format

This commit is contained in:
Grahame Grieve 2020-03-28 06:17:01 +11:00
parent 9a55346de5
commit 60cba0c52c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3354,7 +3354,7 @@ public class ProfileUtilities extends TranslatingUtilities {
if (extDefn == null) { if (extDefn == null) {
genCardinality(gen, element, row, hasDef, used, null); genCardinality(gen, element, row, hasDef, used, null);
row.getCells().add(gen.new Cell(null, null, "?? "+element.getType().get(0).getProfile(), null, null)); row.getCells().add(gen.new Cell(null, null, "?? "+element.getType().get(0).getProfile(), null, null));
generateDescription(gen, row, element, null, used.used, profile.getUrl(), eurl, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot); generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, profile.getUrl(), eurl, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot);
} else { } else {
String name = urltail(eurl); String name = urltail(eurl);
left.getPieces().get(0).setText(name); left.getPieces().get(0).setText(name);
@ -3375,7 +3375,7 @@ public class ProfileUtilities extends TranslatingUtilities {
row.getCells().add(gen.new Cell()); row.getCells().add(gen.new Cell());
else else
genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root); genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root);
generateDescription(gen, row, element, null, used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot); generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot);
} }
} else { } else {
genCardinality(gen, element, row, hasDef, used, null); genCardinality(gen, element, row, hasDef, used, null);
@ -3385,7 +3385,7 @@ public class ProfileUtilities extends TranslatingUtilities {
genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root); genTypes(gen, row, element, profileBaseFileName, profile, corePath, imagePath, root);
else else
row.getCells().add(gen.new Cell()); row.getCells().add(gen.new Cell());
generateDescription(gen, row, element, null, used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot); generateDescription(gen, row, element, (ElementDefinition) element.getUserData(DERIVATION_POINTER), used.used, null, null, profile, corePath, imagePath, root, logicalModel, allInvariants, snapshot);
} }
if (element.hasSlicing()) { if (element.hasSlicing()) {
if (standardExtensionSlicing(element)) { if (standardExtensionSlicing(element)) {
@ -3738,7 +3738,7 @@ public class ProfileUtilities extends TranslatingUtilities {
c.addPiece(checkForNoChange(definition.getShortElement(), gen.new Piece(null, gt(definition.getShortElement()), null))); c.addPiece(checkForNoChange(definition.getShortElement(), gen.new Piece(null, gt(definition.getShortElement()), null)));
} else if (fallback != null && fallback.hasShort()) { } else if (fallback != null && fallback.hasShort()) {
if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br")); if (!c.getPieces().isEmpty()) c.addPiece(gen.new Piece("br"));
c.addPiece(checkForNoChange(fallback.getShortElement(), gen.new Piece(null, gt(fallback.getShortElement()), null))); c.addPiece(gen.new Piece(null, gt(fallback.getShortElement()), null).addStyle("opacity: 0.5"));
} }
if (url != null) { if (url != null) {
if (!c.getPieces().isEmpty()) if (!c.getPieces().isEmpty())
@ -4588,7 +4588,7 @@ public class ProfileUtilities extends TranslatingUtilities {
ElementDefinition ed = cmp.snapshot.get(child.getBaseIndex()); ElementDefinition ed = cmp.snapshot.get(child.getBaseIndex());
ElementDefinitionComparer ccmp; ElementDefinitionComparer ccmp;
if (ed.getType().isEmpty() || isAbstract(ed.getType().get(0).getWorkingCode()) || ed.getType().get(0).getWorkingCode().equals(ed.getPath())) { if (ed.getType().isEmpty() || isAbstract(ed.getType().get(0).getWorkingCode()) || ed.getType().get(0).getWorkingCode().equals(ed.getPath())) {
if (ed.hasType() && "Resource".equals(ed.getType().get(0).getWorkingCode()) && child.getSelf().getType().get(0).hasProfile()) { if (ed.hasType() && "Resource".equals(ed.getType().get(0).getWorkingCode()) && (child.getSelf().hasType() && child.getSelf().getType().get(0).hasProfile())) {
if (child.getSelf().getType().get(0).getProfile().size() > 1) { if (child.getSelf().getType().get(0).getProfile().size() > 1) {
throw new FHIRException(context.formatMessage(I18nConstants.UNHANDLED_SITUATION_RESOURCE_IS_PROFILED_TO_MORE_THAN_ONE_OPTION__CANNOT_SORT_PROFILE)); throw new FHIRException(context.formatMessage(I18nConstants.UNHANDLED_SITUATION_RESOURCE_IS_PROFILED_TO_MORE_THAN_ONE_OPTION__CANNOT_SORT_PROFILE));
} }

2
pom.xml
View File

@ -17,7 +17,7 @@
<properties> <properties>
<hapi_fhir_version>4.2.0</hapi_fhir_version> <hapi_fhir_version>4.2.0</hapi_fhir_version>
<validator_test_case_version>1.1.1-SNAPSHOT</validator_test_case_version> <validator_test_case_version>1.1.2-SNAPSHOT</validator_test_case_version>
</properties> </properties>
<artifactId>org.hl7.fhir.core</artifactId> <artifactId>org.hl7.fhir.core</artifactId>