cleanup

Author: barhodes

cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/cql/evaluate/CqlEvaluationRequest.java

@@ -5,6 +5,7 @@
 import static org.opencds.cqf.fhir.utility.Parameters.newParameters;
 
 import ca.uhn.fhir.context.FhirVersionEnum;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -155,6 +156,6 @@ protected Map<String, String> resolveIncludedLibraries(List<? extends IBaseBackb
                     });
             return libraries;
         }
-        return null;
+        return Collections.emptyMap();
     }
 }

cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/cql/evaluate/CqlEvaluationProcessorTests.java

@@ -16,7 +16,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opencds.cqf.fhir.cql.Engines;
 import org.opencds.cqf.fhir.cql.EvaluationSettings;
-import org.opencds.cqf.fhir.cql.LibraryEngine;
 
 @SuppressWarnings("UnstableApiUsage")
 @ExtendWith(MockitoExtension.class)
@@ -39,9 +38,6 @@ class CqlEvaluationProcessorTests {
     @Mock
     private IRepository repository;
 
-    @Mock
-    private LibraryEngine libraryEngine;
-
     @Spy
     private final CqlEvaluationProcessor fixture = new CqlEvaluationProcessor(repository, evaluationSettings);
 
@@ -52,7 +48,7 @@ void testResolvesNullIdentifier() {
 
     @Test
     void testResolvesStringContentLibraryIdentifier() {
-        doReturn(FhirContext.forR4Cached()).when(repository).fhirContext();
+        doReturn(fhirContextR4).when(repository).fhirContext();
         var engine = Engines.forRepository(repository, evaluationSettings, null);
         var libraryManager = engine.getEnvironment().getLibraryManager();
         var actual = fixture.resolveLibraryIdentifier(content, null, libraryManager);
@@ -62,7 +58,7 @@ void testResolvesStringContentLibraryIdentifier() {
 
     @Test
     void testResolvesLibraryIdentifier() {
-        doReturn(FhirContext.forR4Cached()).when(repository).fhirContext();
+        doReturn(fhirContextR4).when(repository).fhirContext();
         var engine = Engines.forRepository(repository, evaluationSettings, null);
         var libraryManager = engine.getEnvironment().getLibraryManager();
         var version = "1.0.0";

cqf-fhir-cr/src/test/java/org/opencds/cqf/fhir/cr/cql/evaluate/CqlEvaluationRequestTests.java

@@ -2,7 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.Mockito.CALLS_REAL_METHODS;
 import static org.mockito.Mockito.doReturn;
@@ -14,6 +13,7 @@
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.repository.IRepository;
+import java.util.Collections;
 import java.util.List;
 import org.hl7.fhir.instance.model.api.IBaseBackboneElement;
 import org.hl7.fhir.r4.model.Bundle;
@@ -82,7 +82,7 @@ void testPrefetchDataWithData() {
     void testResolveIncludedLibraries() {
         var request = mock(CqlEvaluationRequest.class, CALLS_REAL_METHODS);
         doReturn(FhirVersionEnum.R4).when(request).getFhirVersion();
-        assertNull(request.resolveIncludedLibraries(null));
+        assertEquals(Collections.emptyMap(), request.resolveIncludedLibraries(null));
         var actual = request.resolveIncludedLibraries(getLibraries(FhirContext.forR4Cached()));
         assertEquals(2, actual.size());
     }