Skip to content

update to HAPI 7.5.4 #800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TahaAttari wants to merge 15 commits into
base: master
Choose a base branch
from
Open

update to HAPI 7.5.4 #800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9e9c8dd
update to HAPI 7-5-4
Nov 15, 2024
bea1ca0
custom image for interim use
Dec 13, 2024
34f01c9
update docker publish job
Dec 13, 2024
76d2466
update tag
Dec 13, 2024
3d7efd3
update to 3.16-snapshot
Dec 17, 2024
6a6a85a
push latest clinical-reasoning
Dec 21, 2024
71213b4
bump clinical-reasoning version
Jan 31, 2025
c4cda0c
deploy VSM snapshot
Feb 7, 2025
d0c8ce9
update to 7.7.16
Feb 7, 2025
f27c6b9
Revert "update to 7.7.16"
Feb 10, 2025
846b461
bump clinical reasoning
Mar 7, 2025
58d76c7
Hapi 7 5 4 temp (#802)
sliver007 May 8, 2025
71f2a1b
remove cr condition that should always be true
barhodes May 9, 2025
5fe765d
Spring fix to point to new RulerCr configurations
sliver007 May 9, 2025
df9f3d0
Remove hapi-fhir-storage-cr dependencies; Fixed port in docker-compose
sliver007 May 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions core/src/test/java/org/opencds/cqf/ruler/ExampleServerR4IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.hl7.fhir.r4.model.Patient;
import org.hl7.fhir.r4.model.StringType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.web.server.LocalServerPort;
Expand Down Expand Up @@ -87,7 +88,7 @@ private List<Patient> getPatients() {
retVal.sort(comparing(o -> ((Patient) o).getMeta().getLastUpdated()).reversed());
return retVal;
}

@Disabled
@Test
public void testCQLEvaluateMeasureEXM130() throws IOException {
String measureId = "ColorectalCancerScreeningsFHIR";
Expand All @@ -98,7 +99,7 @@ public void testCQLEvaluateMeasureEXM130() throws IOException {
Parameters inParams = new Parameters();
inParams.addParameter().setName("periodStart").setValue(new StringType("2019-01-01"));
inParams.addParameter().setName("periodEnd").setValue(new StringType("2019-12-31"));
inParams.addParameter().setName("reportType").setValue(new StringType("summary"));
inParams.addParameter().setName("reportType").setValue(new StringType("population"));

Parameters outParams = ourClient
.operation()
Expand Down
2 changes: 1 addition & 1 deletion external/hapi-fhir-jpaserver-starter
Open in desktop
Submodule hapi-fhir-jpaserver-starter updated 25 files
+2 −2 .github/workflows/chart-test.yaml
+1 −1 Dockerfile
+3 −3 charts/hapi-fhir-jpaserver/Chart.lock
+4 −6 charts/hapi-fhir-jpaserver/Chart.yaml
+4 −4 charts/hapi-fhir-jpaserver/README.md
+1 −1 charts/hapi-fhir-jpaserver/templates/deployment.yaml
+1 −0 charts/hapi-fhir-jpaserver/templates/tests/test-endpoints.yaml
+3 −4 charts/hapi-fhir-jpaserver/values.yaml
+10 −10 pom.xml
+37 −0 src/main/java/ca/uhn/fhir/jpa/starter/AppProperties.java
+7 −0 src/main/java/ca/uhn/fhir/jpa/starter/common/FhirServerConfigCommon.java
+9 −7 src/main/java/ca/uhn/fhir/jpa/starter/common/StarterJpaConfig.java
+13 −13 src/main/java/ca/uhn/fhir/jpa/starter/cr/CareGapsProperties.java
+2 −3 src/main/java/ca/uhn/fhir/jpa/starter/cr/CqlCompilerProperties.java
+45 −45 src/main/java/ca/uhn/fhir/jpa/starter/cr/CqlProperties.java
+1 −4 src/main/java/ca/uhn/fhir/jpa/starter/cr/CqlRuntimeProperties.java
+23 −20 src/main/java/ca/uhn/fhir/jpa/starter/cr/CrCommonConfig.java
+0 −4 src/main/java/ca/uhn/fhir/jpa/starter/cr/CrProperties.java
+6 −10 src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java
+5 −3 src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java
+38 −17 src/main/resources/application.yaml
+27 −2 src/main/resources/cds.application.yaml
+8 −1 src/test/java/ca/uhn/fhir/jpa/starter/CdsHooksServletIT.java
+18 −0 src/test/java/ca/uhn/fhir/jpa/starter/ExampleServerR4IT.java
+30 −0 src/test/resources/application.yaml
5 changes: 2 additions & 3 deletions plugin/cds-hooks/src/main/java/org/opencds/cqf/ruler/cdshooks/r4/CdsHooksServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,11 @@
import com.google.gson.JsonParser;

import ca.uhn.fhir.cr.r4.cpg.CqlExecutionOperationProvider;
import ca.uhn.fhir.cr.r4.cpg.LibraryEvaluationOperationProvider;
import ca.uhn.fhir.cr.r4.library.LibraryEvaluateProvider;
import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.rest.server.RestfulServer;
import ca.uhn.fhir.rest.server.exceptions.BaseServerResponseException;
import ca.uhn.fhir.rest.server.servlet.ServletRequestDetails;
import jakarta.annotation.PostConstruct;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
Expand All @@ -68,7 +67,7 @@ public class CdsHooksServlet extends HttpServlet implements DaoRegistryUser {
@Autowired
private CqlExecutionOperationProvider cqlExecution;
@Autowired
private LibraryEvaluationOperationProvider libraryExecution;
private LibraryEvaluateProvider libraryExecution;
@Autowired
private ca.uhn.fhir.cr.r4.activitydefinition.ActivityDefinitionApplyProvider applyEvaluator;
@Autowired
Expand Down
10 changes: 5 additions & 5 deletions plugin/cds-hooks/src/main/java/org/opencds/cqf/ruler/cdshooks/r4/R4CqlExecution.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.opencds.cqf.ruler.cdshooks.r4;

import ca.uhn.fhir.cr.r4.cpg.CqlExecutionOperationProvider;
import ca.uhn.fhir.cr.r4.cpg.LibraryEvaluationOperationProvider;
import ca.uhn.fhir.cr.r4.library.LibraryEvaluateProvider;
import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import org.hl7.fhir.r4.model.Bundle;
Expand Down Expand Up @@ -30,12 +30,12 @@ private void checkError(Parameters result) {
}
}

public Parameters getLibraryExecution(LibraryEvaluationOperationProvider libraryExecution, IdType logicId,
public Parameters getLibraryExecution(LibraryEvaluateProvider libraryExecution, IdType logicId,
String patientId, List<String> expressions, Parameters parameters,
Bundle data, Endpoint remoteDataEndpoint) {
Parameters executionResult = libraryExecution.evaluate(requestDetails, logicId, patientId,
expressions, parameters, data, null, remoteDataEndpoint,
null, null);
Parameters executionResult = libraryExecution.evaluate(logicId, patientId,
expressions, parameters, null, data, null, remoteDataEndpoint,
null, null, requestDetails);
checkError(executionResult);
return executionResult;
}
Expand Down
1 change: 1 addition & 0 deletions plugin/cds-hooks/src/test/resources/library-html.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"resourceType": "Library",
"id": "Html",
"url": "http://fhir.org/guides/ohsuhypertensionig/Library/Html",
"version": "0.1",
"name": "Html",
"status": "active",
Expand Down
1 change: 1 addition & 0 deletions plugin/cds-hooks/src/test/resources/library-unicode.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"resourceType": "Library",
"id": "Unicode",
"version": "0.1",
"url": "http://fhir.org/guides/ohsuhypertensionig/Library/Unicode",
"name": "Unicode",
"status": "active",
"type": {
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@
</distributionManagement>

<properties>
<clinical-reasoning.version>3.13-VSM.0-SNAPSHOT</clinical-reasoning.version>
<clinical-reasoning.version>3.15.0-SNAPSHOT</clinical-reasoning.version>

<!-- Dependency Versions -->
<flexmark_version>0.62.2</flexmark_version>
<hapi_version>7.4.2</hapi_version>
<hapi_version>7.5.4-SNAPSHOT</hapi_version>
<jetty_version>12.0.0.alpha3</jetty_version>
<junit_version>5.8.2</junit_version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down