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 for issue #188 + fix for transition of ConceptMap enumeration

This commit is contained in:
Grahame Grieve 2020-05-02 06:56:29 +10:00
parent fc766a648f
commit d5bb555151
3 changed files with 9 additions and 2 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/model/Enumerations.java
View File

@ -1888,8 +1888,12 @@ public class Enumerations {
return ConceptMapRelationship.EQUIVALENT; return ConceptMapRelationship.EQUIVALENT;
if ("source-is-narrower-than-target".equals(codeString)) if ("source-is-narrower-than-target".equals(codeString))
return ConceptMapRelationship.SOURCENARROWERTARGET; return ConceptMapRelationship.SOURCENARROWERTARGET;
if ("broader".equals(codeString))
return ConceptMapRelationship.SOURCENARROWERTARGET;
if ("source-is-broader-than-target".equals(codeString)) if ("source-is-broader-than-target".equals(codeString))
return ConceptMapRelationship.SOURCEBROADERTARGET; return ConceptMapRelationship.SOURCEBROADERTARGET;
if ("narrower".equals(codeString))
return ConceptMapRelationship.SOURCEBROADERTARGET;
if ("not-related-to".equals(codeString)) if ("not-related-to".equals(codeString))
return ConceptMapRelationship.NOTRELATEDTO; return ConceptMapRelationship.NOTRELATEDTO;
throw new IllegalArgumentException("Unknown ConceptMapRelationship code '"+codeString+"'"); throw new IllegalArgumentException("Unknown ConceptMapRelationship code '"+codeString+"'");

5
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/cache/NpmPackage.java vendored
View File

@ -631,7 +631,10 @@ public class NpmPackage {
} }
} }
if (npm.has("fhirVersions")) { if (npm.has("fhirVersions")) {
return npm.getAsJsonArray("fhirVersions").get(0).getAsString(); JsonElement e = npm.get("fhirVersions");
if (e.isJsonArray() && e.getAsJsonArray().size() > 0) {
return npm.getAsJsonArray("fhirVersions").get(0).getAsString();
}
} }
if (dep != null) { if (dep != null) {
// legacy simplifier support: // legacy simplifier support:

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.10-SNAPSHOT</validator_test_case_version> <validator_test_case_version>1.1.11-SNAPSHOT</validator_test_case_version>
<junit_jupiter_version>5.6.2</junit_jupiter_version> <junit_jupiter_version>5.6.2</junit_jupiter_version>
<maven_surefire_version>3.0.0-M4</maven_surefire_version> <maven_surefire_version>3.0.0-M4</maven_surefire_version>
</properties> </properties>