Upgrade to HAPI FHIR 7.6.0

ahdis · Dec 9, 2024 · df02db6 · df02db6
1 parent 42d36b8
commit df02db6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,6 +1,6 @@
 Unreleased
 
-- Upgrade hapifhir org.hl7.fhir.core to 6.4.4
+- Upgrade org.hl7.fhir.core to 6.4.4 and hapi-fhir to 7.6.0
 - Remove the `devMode` configuration parameter, it is now enabled when `httpReadOnly` is not [#315](https://github.com/ahdis/matchbox/issues/315)
 - Remove the `autoInstallMissingIgs` configuration parameter, it is now enabled when `httpReadOnly` is not [#315](https://github.com/ahdis/matchbox/issues/315)
 - Improve the Matchbox server documentation [#315](https://github.com/ahdis/matchbox/issues/315)

diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/config/MatchboxJpaConfig.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/config/MatchboxJpaConfig.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Nullable;
 
+import ca.uhn.fhir.batch2.model.*;
 import ch.ahdis.matchbox.CliContext;
 import ch.ahdis.matchbox.interceptors.*;
 import ch.ahdis.matchbox.mappinglanguage.StructureMapListProvider;
@@ -29,15 +30,12 @@
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.env.Environment;
 
-import ca.uhn.fhir.batch2.model.StatusEnum;
 import ca.uhn.fhir.batch2.api.IJobCoordinator;
 import ca.uhn.fhir.batch2.api.IJobPartitionProvider;
 import ca.uhn.fhir.batch2.api.IJobPersistence;
 import ca.uhn.fhir.batch2.api.JobOperationResultJson;
 import ca.uhn.fhir.batch2.coordinator.DefaultJobPartitionProvider;
 import ca.uhn.fhir.batch2.jobs.parameters.UrlPartitioner;
-import ca.uhn.fhir.batch2.model.JobInstance;
-import ca.uhn.fhir.batch2.model.JobInstanceStartRequest;
 import ca.uhn.fhir.batch2.models.JobInstanceFetchRequest;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
@@ -308,7 +306,7 @@ public JobOperationResultJson cancelInstance(String theInstanceId) throws Resour
 
 			public List<JobInstance> getInstancesbyJobDefinitionIdAndEndedStatus(String theJobDefinitionId, @Nullable Boolean theEnded, int theCount, int theStart) {
 				// fetch job instances by job definition id and ended status
-				return null;
+				return List.of();
 			}
 
 			/**
@@ -326,17 +324,26 @@ public Page<JobInstance> fetchAllJobInstances(JobInstanceFetchRequest theFetchRe
 			 */
 			public List<JobInstance> getJobInstancesByJobDefinitionIdAndStatuses(String theJobDefinitionId, Set<StatusEnum> theStatuses, int theCount, int theStart) {
 				// fetch job instances by job definition id and statuses
-				return null;
+				return List.of();
 			}
 
 			/**
 			 * Fetches all jobs by job definition id
 			 */
 			public List<JobInstance> getJobInstancesByJobDefinitionId(String theJobDefinitionId, int theCount, int theStart) {
 				// fetch job instances by job definition id
+				return List.of();
+			}
+
+			@Override
+			public List<BatchWorkChunkStatusDTO> getWorkChunkStatus(final String s) {
+				return List.of();
+			}
+
+			@Override
+			public BatchInstanceStatusDTO getBatchInstanceStatus(final String s) {
 				return null;
 			}
-
 		};
 	}
 

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <fhir.core.version>6.4.4</fhir.core.version>
-        <hapi.fhir.version>7.4.0</hapi.fhir.version>
+        <hapi.fhir.version>7.6.0</hapi.fhir.version>
         <!-- Dependency Versions -->
         <validator_test_case_version>1.6.8</validator_test_case_version>
         <activation_api_version>1.2.0</activation_api_version>