From cfe95bec921afe085ccd540bd5daaabefde02d47 Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Fri, 31 Jan 2025 08:19:59 -0700 Subject: [PATCH] cleanup --- .../cqf/fhir/cr/common/IOperationRequest.java | 5 -- .../r4/InputParameterResolver.java | 8 --- .../extract/ProcessDefinitionItem.java | 5 +- .../inputparameters/InputParametersTest.java | 61 ------------------- .../fhir/cr/questionnaire/HelperTests.java | 2 - .../QuestionnaireResponseProcessorTests.java | 3 +- .../extract/ProcessDefinitionItemTests.java | 4 -- 7 files changed, 5 insertions(+), 83 deletions(-) diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/common/IOperationRequest.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/common/IOperationRequest.java index 54fb95844..2808b01ef 100644 --- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/common/IOperationRequest.java +++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/common/IOperationRequest.java @@ -157,9 +157,4 @@ default IBase newValue(Class clazz) { throw new IllegalArgumentException(e); } } - - default IBase newValue(String type, IBase value) { - var newValue = newValue(type); - return newValue; - } } diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r4/InputParameterResolver.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r4/InputParameterResolver.java index d4ba0817a..18571048f 100644 --- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r4/InputParameterResolver.java +++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/inputparameters/r4/InputParameterResolver.java @@ -123,10 +123,6 @@ protected void resolveLaunchContext( var types = launchContext.getExtensionsByUrl("type").stream() .map(type -> type.getValueAsPrimitive().getValueAsString()) .collect(Collectors.toList()); - // if (!validateContext(SDC_QUESTIONNAIRE_LAUNCH_CONTEXT_CODE.valueOf(name.toUpperCase()), type)) { - // throw new IllegalArgumentException(String.format("Unsupported launch context for %s: %s", name, - // type)); - // } var content = getContent(contexts, name); if (content != null && !content.isEmpty()) { var value = getValue(types, content); @@ -140,10 +136,6 @@ protected void resolveLaunchContext( params.addParameter(part(cqlParameterName, resource)); }); } - // else { - // throw new IllegalArgumentException( - // String.format("Unable to retrieve resource for context: %s", name)); - // } } }); } diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItem.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItem.java index eeb8189ec..4a86ad18a 100644 --- a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItem.java +++ b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItem.java @@ -449,7 +449,10 @@ protected void processSliceItem( sliceIndex = i; } } - var sliceName = identifiers[sliceIndex]; + var sliceName = sliceIndex == -1 ? null : identifiers[sliceIndex]; + if (sliceName == null) { + return; + } var slicePath = sliceName.split(":")[0]; var slicePropertyDef = propertyDefs.get(sliceName); var sliceClass = slicePropertyDef instanceof BaseRuntimeChildDatatypeDefinition def diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/inputparameters/InputParametersTest.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/inputparameters/InputParametersTest.java index 985c3eab3..194630e1d 100644 --- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/inputparameters/InputParametersTest.java +++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/inputparameters/InputParametersTest.java @@ -295,67 +295,6 @@ void testUserLaunchContextAsRelatedPersonR4() { assertEquals(user, actual.getParameter().get(2).getResource()); } - // @Test - // void testUnsupportedLaunchContextR4() { - // var user = new org.hl7.fhir.r4.model.Patient(); - // user.setIdElement(Ids.newId(fhirContextR4, "Patient", patientId)); - // doReturn(fhirContextR4).when(repository).fhirContext(); - // doReturn(user).when(repository).read(org.hl7.fhir.r4.model.Patient.class, user.getIdElement()); - // assertThrows( - // IllegalArgumentException.class, - // () -> IInputParameterResolver.createResolver( - // repository, - // user.getIdElement(), - // null, - // null, - // null, - // true, - // null, - // Arrays.asList(adapterFactoryR4.createParametersParameters((IBaseBackboneElement) newPart( - // fhirContextR4, - // "context", - // newStringPart(fhirContextR4, "name", "user"), - // newPart(fhirContextR4, "Reference", "content", user.getId())))), - // Arrays.asList((IBaseExtension) - // new org.hl7.fhir.r4.model.Extension(Constants.SDC_QUESTIONNAIRE_LAUNCH_CONTEXT) - // .setExtension(Arrays.asList( - // new org.hl7.fhir.r4.model.Extension( - // "name", new org.hl7.fhir.r4.model.Coding().setCode("user")), - // new org.hl7.fhir.r4.model.Extension( - // "type", new - // org.hl7.fhir.r4.model.CodeType("Observation"))))))); - // } - - // @Test - // void testMissingLaunchContextResourceR4() { - // var patient = new org.hl7.fhir.r4.model.Patient(); - // patient.setIdElement(Ids.newId(fhirContextR4, "Patient", patientId)); - // doReturn(fhirContextR4).when(repository).fhirContext(); - // doReturn(patient).when(repository).read(org.hl7.fhir.r4.model.Patient.class, patient.getIdElement()); - // assertThrows( - // IllegalArgumentException.class, - // () -> IInputParameterResolver.createResolver( - // repository, - // patient.getIdElement(), - // null, - // null, - // null, - // true, - // null, - // Arrays.asList(adapterFactoryR4.createParametersParameters((IBaseBackboneElement) newPart( - // fhirContextR4, - // "context", - // newStringPart(fhirContextR4, "name", "user"), - // newPart(fhirContextR4, "Reference", "content", practitionerId)))), - // Arrays.asList((IBaseExtension) new org.hl7.fhir.r4.model.Extension( - // Constants.SDC_QUESTIONNAIRE_LAUNCH_CONTEXT) - // .setExtension(Arrays.asList( - // new org.hl7.fhir.r4.model.Extension( - // "name", new org.hl7.fhir.r4.model.Coding().setCode("user")), - // new org.hl7.fhir.r4.model.Extension( - // "type", new org.hl7.fhir.r4.model.CodeType("Practitioner"))))))); - // } - @Test void testResolveParametersR5() { var patient = new org.hl7.fhir.r5.model.Patient(); diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaire/HelperTests.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaire/HelperTests.java index ba9142ce7..55977fb37 100644 --- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaire/HelperTests.java +++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaire/HelperTests.java @@ -15,8 +15,6 @@ void testNullElementType() { assertNull(Helpers.parseR5ItemType(null, false, false)); assertNotNull(Helpers.parseR5ItemType(null, true, false)); assertNotNull(Helpers.parseR5ItemType(null, false, true)); - // assertThrows(IllegalArgumentException.class, () -> Helpers.parseR4ItemType(null, false, false)); - // assertThrows(IllegalArgumentException.class, () -> Helpers.parseR5ItemType(null, false, false)); } @Test diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/QuestionnaireResponseProcessorTests.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/QuestionnaireResponseProcessorTests.java index 8b99022b1..0a2bd0c02 100644 --- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/QuestionnaireResponseProcessorTests.java +++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/QuestionnaireResponseProcessorTests.java @@ -98,7 +98,6 @@ void extractWithHiddenItems() { var resources = BundleHelper.getEntryResources(result); var obs = (Observation) resources.get(0); assertTrue(obs.hasCode()); - // assertTrue(obs.hasSubject()); assertTrue(obs.hasValueBooleanType()); } @@ -128,7 +127,7 @@ void definitionExtractAtRoot() { .getBundle(); var organization = (Organization) BundleHelper.getEntryResourceFirstRep(bundle); assertNotNull(organization); - // assertEquals(String.format("extract-%s", questionnaireResponseId), organization.getIdPart()); + assertEquals(String.format("extract-%s", questionnaireResponseId), organization.getIdPart()); assertEquals("Acme Clinic", organization.getName()); } diff --git a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItemTests.java b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItemTests.java index fd42fc301..8025ddddc 100644 --- a/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItemTests.java +++ b/cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/questionnaireresponse/extract/ProcessDefinitionItemTests.java @@ -177,8 +177,4 @@ void testItemWithContextExtensionAndRepeatingNestedPath() { assertEquals("test1", names.get(0).getText()); assertEquals("test2", names.get(1).getText()); } - - @Test - @Disabled - void testItemWithContextExtensionAndFixedValueExtension() {} }