From 52fae6d2859a5cd81f4ca672373e6cfd8226ba31 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 15 Dec 2020 14:30:44 +1100 Subject: [PATCH 1/4] #399: fix bad error message in german --- .../src/main/resources/Messages_de.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties b/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties index 6da396bfe..a8f2fe28b 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages_de.properties @@ -205,7 +205,7 @@ Validation_VAL_Content_Unknown=Unerkannter Inhalt {0} Validation_VAL_NoType=Unbekannter Typ {0} Validation_VAL_Profile_MatchMultiple=Profil {0}, Element stimmt mit mehr als einem Slice überein - {1}, {2} Validation_VAL_Profile_Maximum={0}: maximal erlaubt = {1}, aber gefunden {2} -Validation_VAL_Profile_Minimum={0}: mindestens erforderlich = {1}, aber nur gefunden {2} +Validation_VAL_Profile_Minimum={2}: mindestens erforderlich = {6}, aber nur gefunden {7} Validation_VAL_Profile_MultipleMatches=Es wurden mehrere passende Profile unter den Auswahlmöglichkeiten gefunden: {0} Validation_VAL_Profile_NoCheckMax={0}: Kann die maximal zulässige Anzahl ({1}) aufgrund fehlender Slicing-Validierung nicht überprüfen. Validation_VAL_Profile_NoCheckMin={0}": Kann das erforderliche Minimum ({1}) aufgrund fehlender Slicing-Validierung nicht überprüfen From 97838733ecd145307e2400d15df98bd3532876f2 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 15 Dec 2020 14:34:19 +1100 Subject: [PATCH 2/4] * fix bad eror message in german messages (issue 399) --- RELEASE_NOTES.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index e69de29bb..1890d2f40 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -0,0 +1,8 @@ +Validator: +* fix bad eror message in german messages (issue 399) +* better error messages when FHIRPath discriminators are invalid + +Other code changes: +* remove unnecessary (& problem causing) Fragment-Host from OSGi manifest +* move structuremap utilities to a package + From f5c54d0d6d12fd67bfad9d9a091495dc96d3e75c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 15 Dec 2020 16:11:32 +1100 Subject: [PATCH 3/4] fix terminology warning problem --- .../org/hl7/fhir/validation/instance/InstanceValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index d77065810..1327345f5 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -772,7 +772,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat return true; if (s.isOk()) { if (s.getMessage() != null) - throw new Error("Internal error: ok, but has error message '"+s.getMessage()+"'"); + txWarning(errors, s.getTxLink(), IssueType.CODEINVALID, element.line(), element.col(), path, s == null, I18nConstants.TERMINOLOGY_PASSTHROUGH_TX_MESSAGE, s.getMessage(), system, code); return true; } if (s.getErrorClass() != null && s.getErrorClass().isInfrastructure()) From 9d57bc906924ef236e72742c7e8a80040c888caa Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 15 Dec 2020 16:33:03 +1100 Subject: [PATCH 4/4] ping build --- RELEASE_NOTES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 1890d2f40..f3639cce6 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,6 +1,7 @@ Validator: * fix bad eror message in german messages (issue 399) * better error messages when FHIRPath discriminators are invalid +* clean up error messages Other code changes: * remove unnecessary (& problem causing) Fragment-Host from OSGi manifest