honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-03-09 14:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix run time test

Browse Source
This commit is contained in:
Grahame Grieve 2023-03-12 23:02:46 +11:00
parent 7f68418cc6
commit 96f265653e
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/FmlParser.java
View File

@ -84,10 +84,10 @@ public class FmlParser extends ParserBase {
result.makeElement("status").setValue("draft");
}
if (!result.hasChild("id") && result.hasChild("name")) {
result.makeElement("id").setValue(result.getChildValue("name"));
result.makeElement("id").setValue(Utilities.makeId(result.getChildValue("name")));
}
if (!result.hasChild("description") && result.hasChild("title")) {
result.makeElement("description").setValue(result.getChildValue("title"));
result.makeElement("description").setValue(Utilities.makeId(result.getChildValue("title")));
}
while (lexer.hasToken("conceptmap"))

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

@ -664,7 +664,9 @@ public class StructureMapUtilities {
}
}
}
result.setId(result.getName());
if (!result.hasId() && result.hasName()) {
result.setId(Utilities.makeId(result.getName()));
}
if (!result.hasStatus()) {
result.setStatus(PublicationStatus.DRAFT);
}

4
org.hl7.fhir.utilities/src/main/resources/Messages.properties
View File

@ -130,8 +130,8 @@ Reference_REF_NotFound_Bundle = Bundled or contained reference not found within
Reference_REF_ResourceType = Matching reference for reference {0} has resourceType {1}
Reference_REF_WrongTarget = The type ''{0}'' is not a valid Target for this element (must be one of {1})
REFERENCE_REF_WRONGTARGET_LOAD = The type ''{2}'' is not a valid Target for the element {0} (must be {1})
Resource_RES_ID_Malformed_Length = Invalid Resource id: Too long
Resource_RES_ID_Malformed_Chars = Invalid Resource id: Invalid Characters
Resource_RES_ID_Malformed_Length = Invalid Resource id: Too long ({0} chars)
Resource_RES_ID_Malformed_Chars = Invalid Resource id: Invalid Characters (''{0}'')
Resource_RES_ID_Missing = Resource requires an id, but none is present
Resource_RES_ID_Prohibited = Resource has an id, but none is allowed
Terminology_PassThrough_TX_Message = {0} for ''{1}#{2}''

4
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java
View File

@ -6222,9 +6222,9 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
if (eid.getProperty() != null && eid.getProperty().getDefinition() != null && eid.getProperty().getDefinition().getBase().getPath().equals("Resource.id")) {
NodeStack ns = stack.push(eid, -1, eid.getProperty().getDefinition(), null);
if (eid.primitiveValue() != null && eid.primitiveValue().length() > 64) {
ok = rule(errors, NO_RULE_DATE, IssueType.INVALID, eid.line(), eid.col(), ns.getLiteralPath(), false, I18nConstants.RESOURCE_RES_ID_MALFORMED_LENGTH) && ok;
ok = rule(errors, NO_RULE_DATE, IssueType.INVALID, eid.line(), eid.col(), ns.getLiteralPath(), false, I18nConstants.RESOURCE_RES_ID_MALFORMED_LENGTH, eid.primitiveValue().length()) && ok;
} else {
ok = rule(errors, NO_RULE_DATE, IssueType.INVALID, eid.line(), eid.col(), ns.getLiteralPath(), FormatUtilities.isValidId(eid.primitiveValue()), I18nConstants.RESOURCE_RES_ID_MALFORMED_CHARS) && ok;
ok = rule(errors, NO_RULE_DATE, IssueType.INVALID, eid.line(), eid.col(), ns.getLiteralPath(), FormatUtilities.isValidId(eid.primitiveValue()), I18nConstants.RESOURCE_RES_ID_MALFORMED_CHARS, eid.primitiveValue()) && ok;
}
}
}