Add tests for InputParameterResolver

cqframework · Sep 3, 2024 · a9a65a8 · a9a65a8
1 parent 3ebf962
commit a9a65a8
Show file tree

Hide file tree

Showing 10 changed files with 209 additions and 65 deletions.
diff --git a/...-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/BaseInputParameterResolver.java b/...-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/BaseInputParameterResolver.java
@@ -2,7 +2,7 @@
 
 import ca.uhn.fhir.context.FhirContext;
 import java.util.List;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
@@ -53,12 +53,12 @@ protected FhirContext fhirContext() {
 
     protected <R extends IBaseResource> R readRepository(Class<R> resourceType, IIdType id) {
         try {
-            return repository.read(resourceType, id, null);
+            return repository.read(resourceType, id);
         } catch (Exception e) {
             return null;
         }
     }
 
     protected abstract IBaseParameters resolveParameters(
-            IBaseParameters parameters, List<IBaseBackboneElement> context, List<IBaseExtension<?, ?>> launchContext);
+            IBaseParameters parameters, List<IBase> context, List<IBaseExtension<?, ?>> launchContext);
 }
diff --git a/...hir-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/IInputParameterResolver.java b/...hir-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/IInputParameterResolver.java
@@ -3,7 +3,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import java.util.List;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
@@ -37,7 +37,7 @@ public static <T extends IInputParameterResolver> T createResolver(
             IBaseParameters parameters,
             boolean useServerData,
             IBaseBundle data,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             List<IBaseExtension<?, ?>> launchContext) {
         checkNotNull(repository, "expected non-null value for repository");
         var fhirVersion = repository.fhirContext().getVersion().getVersion();

diff --git a/...r/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/dstu3/InputParameterResolver.java b/...r/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/dstu3/InputParameterResolver.java
@@ -14,7 +14,7 @@
 import org.hl7.fhir.dstu3.model.Practitioner;
 import org.hl7.fhir.dstu3.model.Resource;
 import org.hl7.fhir.dstu3.model.ValueSet;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
@@ -43,17 +43,15 @@ public InputParameterResolver(
             IBaseParameters parameters,
             boolean useServerData,
             IBaseBundle data,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             List<IBaseExtension<?, ?>> launchContext) {
         super(repository, subjectId, encounterId, practitionerId, parameters, useServerData, data);
         this.parameters = resolveParameters(parameters, context, launchContext);
     }
 
     @Override
     protected final Parameters resolveParameters(
-            IBaseParameters baseParameters,
-            List<IBaseBackboneElement> context,
-            List<IBaseExtension<?, ?>> launchContext) {
+            IBaseParameters baseParameters, List<IBase> context, List<IBaseExtension<?, ?>> launchContext) {
         var params = parameters();
         if (baseParameters != null) {
             params.getParameter().addAll(((Parameters) baseParameters).getParameter());

diff --git a/...r-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r4/InputParameterResolver.java b/...r-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r4/InputParameterResolver.java
@@ -8,7 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
@@ -52,17 +52,15 @@ public InputParameterResolver(
             IBaseParameters parameters,
             boolean useServerData,
             IBaseBundle data,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             List<IBaseExtension<?, ?>> launchContext) {
         super(repository, subjectId, encounterId, practitionerId, parameters, useServerData, data);
         this.parameters = resolveParameters(parameters, context, launchContext);
     }
 
     @Override
     protected final Parameters resolveParameters(
-            IBaseParameters baseParameters,
-            List<IBaseBackboneElement> context,
-            List<IBaseExtension<?, ?>> launchContext) {
+            IBaseParameters baseParameters, List<IBase> context, List<IBaseExtension<?, ?>> launchContext) {
         var params = parameters();
         if (baseParameters != null) {
             params.getParameter().addAll(((Parameters) baseParameters).getParameter());
@@ -111,7 +109,7 @@ protected boolean validateContext(String name, String type) {
     }
 
     protected void resolveLaunchContext(
-            Parameters params, List<IBaseBackboneElement> contexts, List<IBaseExtension<?, ?>> launchContexts) {
+            Parameters params, List<IBase> contexts, List<IBaseExtension<?, ?>> launchContexts) {
         final List<String> validContexts = Arrays.asList("patient", "encounter", "location", "user", "study");
         if (launchContexts != null && !launchContexts.isEmpty()) {
             launchContexts.stream().map(e -> (Extension) e).forEach(launchContext -> {
@@ -146,6 +144,7 @@ protected void resolveLaunchContext(
                         .map(p -> readRepository(
                                 fhirContext().getResourceDefinition(type).getImplementingClass(),
                                 ((Reference) p.getValue()).getReferenceElement()))
+                        .filter(p -> p != null)
                         .collect(Collectors.toList());
                 if (!value.isEmpty()) {
                     var resource =
@@ -155,6 +154,9 @@ protected void resolveLaunchContext(
                                 ((Bundle) resource).addEntry(new BundleEntryComponent().setResource((Resource) v)));
                     }
                     params.addParameter(part("%" + name, resource));
+                } else {
+                    throw new IllegalArgumentException(
+                            String.format("Unable to retrieve resource for context: %s", name));
                 }
             });
         }

diff --git a/...r-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r5/InputParameterResolver.java b/...r-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r5/InputParameterResolver.java
@@ -8,7 +8,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
@@ -52,17 +52,15 @@ public InputParameterResolver(
             IBaseParameters parameters,
             boolean useServerData,
             IBaseBundle data,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             List<IBaseExtension<?, ?>> launchContext) {
         super(repository, subjectId, encounterId, practitionerId, parameters, useServerData, data);
         this.parameters = resolveParameters(parameters, context, launchContext);
     }
 
     @Override
     protected final Parameters resolveParameters(
-            IBaseParameters baseParameters,
-            List<IBaseBackboneElement> context,
-            List<IBaseExtension<?, ?>> launchContext) {
+            IBaseParameters baseParameters, List<IBase> context, List<IBaseExtension<?, ?>> launchContext) {
         var params = parameters();
         if (baseParameters != null) {
             params.getParameter().addAll(((Parameters) baseParameters).getParameter());
@@ -111,7 +109,7 @@ protected boolean validateContext(String name, String type) {
     }
 
     protected void resolveLaunchContext(
-            Parameters params, List<IBaseBackboneElement> contexts, List<IBaseExtension<?, ?>> launchContexts) {
+            Parameters params, List<IBase> contexts, List<IBaseExtension<?, ?>> launchContexts) {
         final List<String> validContexts = Arrays.asList("patient", "encounter", "location", "user", "study");
         if (launchContexts != null && !launchContexts.isEmpty()) {
             launchContexts.stream().map(e -> (Extension) e).forEach(launchContext -> {

diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/QuestionnaireProcessor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/QuestionnaireProcessor.java
@@ -9,7 +9,7 @@
 import ca.uhn.fhir.context.FhirVersionEnum;
 import java.util.List;
 import org.apache.commons.lang3.StringUtils;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
@@ -204,7 +204,7 @@ public PopulateRequest buildPopulateRequest(
             String operationName,
             IBaseResource questionnaire,
             String subjectId,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             IBaseExtension<?, ?> launchContext,
             IBaseParameters parameters,
             IBaseBundle data,
@@ -229,7 +229,7 @@ public PopulateRequest buildPopulateRequest(
     public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource populate(
             Either3<C, IIdType, R> questionnaire,
             String subjectId,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             IBaseExtension<?, ?> launchContext,
             IBaseParameters parameters,
             IBaseBundle data,
@@ -253,7 +253,7 @@ public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource
     public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource populate(
             Either3<C, IIdType, R> questionnaire,
             String subjectId,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             IBaseExtension<?, ?> launchContext,
             IBaseParameters parameters,
             IBaseBundle data,
@@ -276,7 +276,7 @@ public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource
     public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource populate(
             Either3<C, IIdType, R> questionnaire,
             String subjectId,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             IBaseExtension<?, ?> launchContext,
             IBaseParameters parameters,
             IBaseBundle data,
@@ -296,7 +296,7 @@ public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource
     public IBaseResource populate(
             IBaseResource questionnaire,
             String subjectId,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             IBaseExtension<?, ?> launchContext,
             IBaseParameters parameters,
             IBaseBundle data,

diff --git a/...fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/populate/PopulateRequest.java b/...fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/populate/PopulateRequest.java
@@ -5,7 +5,7 @@
 import ca.uhn.fhir.context.FhirVersionEnum;
 import java.util.List;
 import org.hl7.fhir.dstu3.model.Reference;
-import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
 import org.hl7.fhir.instance.model.api.IBaseOperationOutcome;
@@ -23,7 +23,7 @@ public class PopulateRequest implements IQuestionnaireRequest {
     private final String operationName;
     private final IBaseResource questionnaire;
     private final IIdType subjectId;
-    private final List<IBaseBackboneElement> context;
+    private final List<IBase> context;
     private final List<IBaseExtension<?, ?>> launchContext;
     private final IBaseParameters parameters;
     private final IBaseBundle data;
@@ -39,7 +39,7 @@ public PopulateRequest(
             String operationName,
             IBaseResource questionnaire,
             IIdType subjectId,
-            List<IBaseBackboneElement> context,
+            List<IBase> context,
             IBaseExtension<?, ?> launchContext,
             IBaseParameters parameters,
             IBaseBundle data,
@@ -149,7 +149,7 @@ protected final String resolveDefaultLibraryUrl() {
                         : ((IPrimitiveType<String>) libraryExt.getValue()).getValue();
     }
 
-    public List<IBaseBackboneElement> getContext() {
+    public List<IBase> getContext() {
         return context;
     }