Merge branch 'master' into dqm-make-methods-accessible

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/plandefinition/apply/ApplyRequest.java

@@ -166,8 +166,7 @@ public org.opencds.cqf.fhir.cr.activitydefinition.apply.ApplyRequest toActivityR
     }
 
     public GenerateRequest toGenerateRequest(IBaseResource profile) {
-        return new GenerateRequest(
-                        profile, false, true, subjectId, parameters, useServerData, data, libraryEngine, modelResolver)
+        return new GenerateRequest(profile, false, true, modelResolver)
                 .setDefaultLibraryUrl(defaultLibraryUrl)
                 .setQuestionnaire(questionnaire);
     }

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/QuestionnaireProcessor.java

@@ -97,31 +97,20 @@ public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource
 
     public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource generateQuestionnaire(
             Either3<C, IIdType, R> profile, boolean supportedOnly, boolean requiredOnly) {
-        return generateQuestionnaire(
-                profile, supportedOnly, requiredOnly, null, null, null, true, (IBaseResource) null, null, null, null);
+        return generateQuestionnaire(profile, supportedOnly, requiredOnly, (IBaseResource) null, null, null);
     }
 
     public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource generateQuestionnaire(
             Either3<C, IIdType, R> profile,
             boolean supportedOnly,
             boolean requiredOnly,
-            String subjectId,
-            IBaseParameters parameters,
-            IBaseBundle data,
-            boolean useServerData,
-            IBaseResource dataEndpoint,
             IBaseResource contentEndpoint,
             IBaseResource terminologyEndpoint,
             String id) {
         return generateQuestionnaire(
                 profile,
                 supportedOnly,
                 requiredOnly,
-                subjectId,
-                parameters,
-                data,
-                useServerData,
-                createRestRepository(repository.fhirContext(), dataEndpoint),
                 createRestRepository(repository.fhirContext(), contentEndpoint),
                 createRestRepository(repository.fhirContext(), terminologyEndpoint),
                 id);
@@ -131,47 +120,17 @@ public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource
             Either3<C, IIdType, R> profile,
             boolean supportedOnly,
             boolean requiredOnly,
-            String subjectId,
-            IBaseParameters parameters,
-            IBaseBundle data,
-            boolean useServerData,
-            Repository dataRepository,
             Repository contentRepository,
             Repository terminologyRepository,
             String id) {
-        repository = proxy(repository, useServerData, dataRepository, contentRepository, terminologyRepository);
-        return generateQuestionnaire(
-                profile,
-                supportedOnly,
-                requiredOnly,
-                subjectId,
-                parameters,
-                data,
-                useServerData,
-                new LibraryEngine(repository, evaluationSettings),
-                id);
+        repository = proxy(repository, true, null, contentRepository, terminologyRepository);
+        return generateQuestionnaire(profile, supportedOnly, requiredOnly, id);
     }
 
     public <C extends IPrimitiveType<String>, R extends IBaseResource> IBaseResource generateQuestionnaire(
-            Either3<C, IIdType, R> profile,
-            boolean supportedOnly,
-            boolean requiredOnly,
-            String subjectId,
-            IBaseParameters parameters,
-            IBaseBundle data,
-            boolean useServerData,
-            LibraryEngine libraryEngine,
-            String id) {
-        var request = new GenerateRequest(
-                resolveStructureDefinition(profile),
-                supportedOnly,
-                requiredOnly,
-                subjectId == null ? null : Ids.newId(fhirVersion, Ids.ensureIdType(subjectId, SUBJECT_TYPE)),
-                parameters,
-                useServerData,
-                data,
-                libraryEngine == null ? new LibraryEngine(repository, evaluationSettings) : libraryEngine,
-                modelResolver);
+            Either3<C, IIdType, R> profile, boolean supportedOnly, boolean requiredOnly, String id) {
+        var request =
+                new GenerateRequest(resolveStructureDefinition(profile), supportedOnly, requiredOnly, modelResolver);
         return generateQuestionnaire(request, id);
     }
 

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/generate/GenerateRequest.java

@@ -22,11 +22,6 @@
 public class GenerateRequest implements IQuestionnaireRequest {
     private final boolean supportedOnly;
     private final boolean requiredOnly;
-    private final IIdType subjectId;
-    private final IBaseParameters parameters;
-    private final boolean useServerData;
-    private final IBaseBundle data;
-    private final LibraryEngine libraryEngine;
     private final ModelResolver modelResolver;
     private final FhirVersionEnum fhirVersion;
     private final IBaseResource profile;
@@ -38,28 +33,14 @@ public class GenerateRequest implements IQuestionnaireRequest {
     private List<? extends ICompositeType> snapshotElements;
 
     public GenerateRequest(
-            IBaseResource profile,
-            boolean supportedOnly,
-            boolean requiredOnly,
-            IIdType subjectId,
-            IBaseParameters parameters,
-            boolean useServerData,
-            IBaseBundle data,
-            LibraryEngine libraryEngine,
-            ModelResolver modelResolver) {
-        checkNotNull(libraryEngine, "expected non-null value for libraryEngine");
+            IBaseResource profile, boolean supportedOnly, boolean requiredOnly, ModelResolver modelResolver) {
+        checkNotNull(profile, "expected non-null value for profile");
         checkNotNull(modelResolver, "expected non-null value for modelResolver");
         this.profile = profile;
+        fhirVersion = this.profile.getStructureFhirVersionEnum();
         this.supportedOnly = supportedOnly;
         this.requiredOnly = requiredOnly;
-        this.subjectId = subjectId;
-        this.parameters = parameters;
-        this.useServerData = useServerData;
-        this.data = data;
-        this.libraryEngine = libraryEngine;
         this.modelResolver = modelResolver;
-        fhirVersion =
-                this.libraryEngine.getRepository().fhirContext().getVersion().getVersion();
         defaultLibraryUrl = resolveDefaultLibraryUrl();
     }
 
@@ -126,27 +107,27 @@ public String getOperationName() {
 
     @Override
     public IIdType getSubjectId() {
-        return subjectId;
+        throw new UnsupportedOperationException("Unimplemented method 'getSubjectId'");
     }
 
     @Override
     public IBaseBundle getData() {
-        return data;
+        throw new UnsupportedOperationException("Unimplemented method 'getData'");
     }
 
     @Override
     public boolean getUseServerData() {
-        return useServerData;
+        throw new UnsupportedOperationException("Unimplemented method 'getUseServerData'");
     }
 
     @Override
     public IBaseParameters getParameters() {
-        return parameters;
+        throw new UnsupportedOperationException("Unimplemented method 'getParameters'");
     }
 
     @Override
     public LibraryEngine getLibraryEngine() {
-        return libraryEngine;
+        throw new UnsupportedOperationException("Unimplemented method 'getLibraryEngine'");
     }
 
     @Override

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaire/generate/ItemGenerator.java

@@ -10,7 +10,6 @@
 import java.util.stream.Collectors;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.instance.model.api.IBaseBooleanDatatype;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
@@ -107,11 +106,6 @@ protected CqfExpression getFeatureExpression(GenerateRequest request) {
         return expression;
     }
 
-    protected List<IBase> getFeatureExpressionResults(
-            GenerateRequest request, CqfExpression featureExpression, String itemLinkId) {
-        return expressionProcessor.getExpressionResultForItem(request, featureExpression, itemLinkId);
-    }
-
     protected <E extends ICompositeType> void processElements(
             GenerateRequest request,
             IBaseBackboneElement item,

cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/helpers/RequestHelpers.java

@@ -125,8 +125,7 @@ public static ApplyRequest newPDApplyRequestForVersion(
                 inputParameterResolver);
     }
 
-    public static GenerateRequest newGenerateRequestForVersion(
-            FhirVersionEnum fhirVersion, LibraryEngine libraryEngine) {
+    public static GenerateRequest newGenerateRequestForVersion(FhirVersionEnum fhirVersion) {
         IBaseResource profile = null;
         try {
             var fhirContext = FhirContext.forCached(fhirVersion);
@@ -137,21 +136,11 @@ public static GenerateRequest newGenerateRequestForVersion(
         } catch (Exception e) {
             // Do nothing
         }
-        return newGenerateRequestForVersion(fhirVersion, libraryEngine, profile);
+        return newGenerateRequestForVersion(fhirVersion, profile);
     }
 
-    public static GenerateRequest newGenerateRequestForVersion(
-            FhirVersionEnum fhirVersion, LibraryEngine libraryEngine, IBaseResource profile) {
-        return new GenerateRequest(
-                profile,
-                false,
-                true,
-                Ids.newId(fhirVersion, Ids.ensureIdType(PATIENT_ID, "Patient")),
-                null,
-                true,
-                null,
-                libraryEngine,
-                FhirModelResolverCache.resolverForVersion(fhirVersion));
+    public static GenerateRequest newGenerateRequestForVersion(FhirVersionEnum fhirVersion, IBaseResource profile) {
+        return new GenerateRequest(profile, false, true, FhirModelResolverCache.resolverForVersion(fhirVersion));
     }
 
     public static PopulateRequest newPopulateRequestForVersion(

cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaire/TestItemGenerator.java

@@ -20,9 +20,7 @@
 import java.util.stream.Collectors;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
-import org.hl7.fhir.instance.model.api.IBaseBundle;
 import org.hl7.fhir.instance.model.api.IBaseExtension;
-import org.hl7.fhir.instance.model.api.IBaseParameters;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
@@ -84,9 +82,6 @@ public static class When {
         private IPrimitiveType<String> profileUrl;
         private IBaseResource profile;
         private String id;
-        private String subjectId;
-        private IBaseBundle data;
-        private IBaseParameters parameters;
 
         When(Repository repository, QuestionnaireProcessor itemGenerator) {
             this.repository = repository;
@@ -113,35 +108,9 @@ public When id(String id) {
             return this;
         }
 
-        public When subjectId(String id) {
-            subjectId = id;
-            return this;
-        }
-
-        public When bundle(IBaseBundle data) {
-            this.data = data;
-            return this;
-        }
-
-        public When parameters(IBaseParameters params) {
-            parameters = params;
-            return this;
-        }
-
         public GeneratedItem then() {
             IBaseResource result;
-            if (subjectId != null || parameters != null || data != null) {
-                result = processor.generateQuestionnaire(
-                        Eithers.for3(profileUrl, profileId, profile),
-                        false,
-                        true,
-                        subjectId,
-                        parameters,
-                        data,
-                        true,
-                        null,
-                        id);
-            } else if (profileUrl != null || profileId != null || profile != null) {
+            if (profileUrl != null || profileId != null || profile != null) {
                 result = processor.generateQuestionnaire(Eithers.for3(profileUrl, profileId, profile), false, true);
             } else {
                 result = processor.generateQuestionnaire(id);

cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaire/generate/ElementProcessorTests.java

@@ -23,7 +23,6 @@
 
 @ExtendWith(MockitoExtension.class)
 class ElementProcessorTests {
-    private final FhirContext fhirContextDstu2 = FhirContext.forDstu2Cached();
     private final FhirContext fhirContextR4B = FhirContext.forR4BCached();
 
     @Mock
@@ -155,9 +154,7 @@ void createProcessorShouldReturnNullForUnsupportedVersion() {
 
     @Test
     void createInitialShouldReturnNullForUnsupportedVersion() {
-        doReturn(repository).when(libraryEngine).getRepository();
-        doReturn(fhirContextDstu2).when(repository).fhirContext();
-        var request = newGenerateRequestForVersion(FhirVersionEnum.DSTU2, libraryEngine);
+        var request = newGenerateRequestForVersion(FhirVersionEnum.DSTU2);
         var initial = createInitial(request, new BooleanType(true));
         assertNull(initial);
     }