From 1aeb54e94ed5c302d2fcbf14079d3806a7f5d38a Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Sat, 30 Mar 2019 21:02:24 +0100 Subject: [PATCH] added all fetchValueSet Implementations --- examples/src/main/java/example/ValidatorExamples.java | 6 ++++++ .../ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java | 6 ++++++ .../java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java | 6 ++++++ .../fhir/igpacks/parser/IgPackValidationSupportDstu3.java | 5 +++++ .../uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java | 8 ++++++++ .../ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java | 5 +++++ .../ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java | 6 ++++++ .../java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/examples/src/main/java/example/ValidatorExamples.java b/examples/src/main/java/example/ValidatorExamples.java index 79c5f428799..7f853a7f13f 100644 --- a/examples/src/main/java/example/ValidatorExamples.java +++ b/examples/src/main/java/example/ValidatorExamples.java @@ -234,6 +234,12 @@ public class ValidatorExamples { return null; } + @Override + public ValueSet fetchValueSet(FhirContext theContext, String theSystem) { + // TODO: implement + return null; + } + @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { // TODO: implement diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java index 6f562364e37..2ae169af895 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportDstu3.java @@ -27,6 +27,7 @@ import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; import org.hl7.fhir.dstu3.hapi.ctx.IValidationSupport; import org.hl7.fhir.dstu3.model.CodeSystem; import org.hl7.fhir.dstu3.model.StructureDefinition; +import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.dstu3.model.ValueSet.ConceptSetComponent; import org.hl7.fhir.dstu3.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.api.IBaseResource; @@ -56,6 +57,11 @@ public class LoadingValidationSupportDstu3 implements IValidationSupport { return null; } + @Override + public ValueSet fetchValueSet(FhirContext theContext, String theSystem) { + return null; + } + @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { String resName = myCtx.getResourceDefinition(theClass).getName(); diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java index 4df8b05ec71..d50537cd0f8 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java +++ b/hapi-fhir-cli/hapi-fhir-cli-api/src/main/java/ca/uhn/fhir/cli/LoadingValidationSupportR4.java @@ -27,6 +27,7 @@ import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.r4.model.CodeSystem; import org.hl7.fhir.r4.model.StructureDefinition; +import org.hl7.fhir.r4.model.ValueSet; import org.hl7.fhir.r4.model.ValueSet.ConceptSetComponent; import org.hl7.fhir.r4.terminologies.ValueSetExpander; @@ -58,6 +59,11 @@ public class LoadingValidationSupportR4 implements org.hl7.fhir.r4.hapi.ctx.IVal return null; } + @Override + public ValueSet fetchValueSet(FhirContext theContext, String theSystem) { + return null; + } + @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { String resName = myCtx.getResourceDefinition(theClass).getName(); diff --git a/hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackValidationSupportDstu3.java b/hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackValidationSupportDstu3.java index 44d71df9722..b2aebea2720 100644 --- a/hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackValidationSupportDstu3.java +++ b/hapi-fhir-igpacks/src/main/java/ca/uhn/fhir/igpacks/parser/IgPackValidationSupportDstu3.java @@ -67,6 +67,11 @@ public class IgPackValidationSupportDstu3 implements IValidationSupport { return fetchResource(theContext, CodeSystem.class, theSystem); } + @Override + public ValueSet fetchValueSet(FhirContext theContext, String theSystem) { + return fetchResource(theContext, ValueSet.class, theSystem); + } + @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { for (Map.Entry next : myIgResources.entrySet()) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java index fe92f4aebee..3d607db71c8 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/dstu3/JpaValidationSupportDstu3.java @@ -89,6 +89,14 @@ public class JpaValidationSupportDstu3 implements IJpaValidationSupportDstu3, Ap return fetchResource(theCtx, CodeSystem.class, theSystem); } + @Override + public ValueSet fetchValueSet(FhirContext theCtx, String theSystem) { + if (isBlank(theSystem)) { + return null; + } + return fetchResource(theCtx, ValueSet.class, theSystem); + } + @SuppressWarnings("unchecked") @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java index 4c8ecf24b49..6a04443b1f1 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/r4/JpaValidationSupportR4.java @@ -86,6 +86,11 @@ public class JpaValidationSupportR4 implements IJpaValidationSupportR4, Applicat return fetchResource(theCtx, CodeSystem.class, theSystem); } + @Override + public ValueSet fetchValueSet(FhirContext theCtx, String theSystem) { + return fetchResource(theCtx, ValueSet.class, theSystem); + } + @SuppressWarnings("unchecked") @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java index 92a5a1dddd8..083e22a3ae3 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcDstu3.java @@ -204,6 +204,12 @@ public class HapiTerminologySvcDstu3 extends BaseHapiTerminologySvcImpl implemen return null; } + @CoverageIgnore + @Override + public ValueSet fetchValueSet(FhirContext theContext, String theSystem) { + return null; + } + @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { return null; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java index d400a0e715f..719faab06dd 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/HapiTerminologySvcR4.java @@ -155,6 +155,12 @@ public class HapiTerminologySvcR4 extends BaseHapiTerminologySvcImpl implements return null; } + @CoverageIgnore + @Override + public ValueSet fetchValueSet(FhirContext theContext, String theSystem) { + return null; + } + @Override public T fetchResource(FhirContext theContext, Class theClass, String theUri) { return null;