From 94c7fc49fd156ae179315ec8a38eb092d2b0df0e Mon Sep 17 00:00:00 2001 From: Diederik Muylwyk Date: Tue, 27 Aug 2019 13:46:42 -0400 Subject: [PATCH] Making LOINC filenames configurable; fix implicit ValueSet URL for loinc-all. --- .../java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java | 2 +- .../ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java index a36e326381b..f719c98b37d 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcImpl.java @@ -579,7 +579,7 @@ public class TerminologyLoaderSvcImpl implements IHapiTerminologyLoaderSvc { ValueSet retVal = new ValueSet(); retVal.setId("loinc-all"); - retVal.setUrl("http://loinc.org/fhir/ValueSet/loinc-all"); + retVal.setUrl("http://loinc.org/vs"); retVal.setVersion("1.0.0"); retVal.setName("All LOINC codes"); retVal.setStatus(Enumerations.PublicationStatus.ACTIVE); diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java index c49dfed2fd9..a6ca90547bc 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/term/TerminologyLoaderSvcLoincTest.java @@ -259,7 +259,7 @@ public class TerminologyLoaderSvcLoincTest extends BaseLoaderTest { // All LOINC codes assertTrue(valueSets.containsKey("loinc-all")); vs = valueSets.get("loinc-all"); - assertEquals("http://loinc.org/fhir/ValueSet/loinc-all", vs.getUrl()); + assertEquals("http://loinc.org/vs", vs.getUrl()); assertEquals("1.0.0", vs.getVersion()); assertEquals("All LOINC codes", vs.getName()); assertEquals(Enumerations.PublicationStatus.ACTIVE, vs.getStatus());