Skip to content

Refactor mdm expander holder out #7295

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
wants to merge 31 commits into
base: master
Choose a base branch
from
Open

Refactor mdm expander holder out #7295

Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9fa7ff4
Initial pass over refactoring the sprawling MDM expansion
Oct 9, 2025
be91a82
Fix up an error in construction
Oct 9, 2025
daa3e48
failing test location
Oct 9, 2025
58db184
Remove dead annotation, fix logic bug in new method for determining w…
Oct 10, 2025
4a9663f
Spotless
Oct 10, 2025
f76048b
Redefine bean in jpaconfig for app ctx loading
Oct 10, 2025
ebb9a6a
comments
Oct 10, 2025
e65b52c
Version bumped to 8.5.8-SNAPSHOT
Oct 10, 2025
eb0953f
wip
Oct 10, 2025
3844dc6
wip maybe revert
Oct 14, 2025
b01f50d
wip maybe revert
Oct 14, 2025
7d452df
wip
tadgh Oct 14, 2025
cc5d682
Revert "wip maybe revert"
tadgh Oct 14, 2025
16e7d2e
Remove dead code
tadgh Oct 14, 2025
1211448
move MDM stuff down the test class stack
tadgh Oct 14, 2025
95176ab
move MDM stuff down the test class stack
tadgh Oct 14, 2025
f38c402
Push all mdm related stuff down into MDM-related classes
tadgh Oct 14, 2025
c6834cc
Patch up mock tests
tadgh Oct 14, 2025
9af2564
Patch up mock tests
tadgh Oct 14, 2025
b40fca6
Remove fixmes
tadgh Oct 14, 2025
754ec3d
Merge branch 'master' into refactor-mdm-expander-holder-out
tadgh Oct 14, 2025
8f2ebce
Remove conditionalonbean
tadgh Oct 15, 2025
00547d5
Remove service annotation
tadgh Oct 15, 2025
8547472
bump hapi version
Oct 17, 2025
4d46c84
Remove another useless configuration class
Oct 17, 2025
5f15470
Make the cacher no longer a bean, as its used only inside of the mdml…
Oct 17, 2025
557da59
Make the cacher no longer a bean, as its used only inside of the mdml…
Oct 17, 2025
c684366
Remove usage of the mdm expansion cache entirely. It doesnt work dist…
Oct 17, 2025
37dad05
Spotless
Oct 17, 2025
42bc3e0
Make IMdmSettings nullable
Oct 19, 2025
39b9837
Merge branch 'master' into refactor-mdm-expander-holder-out
Nov 19, 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
2 changes: 1 addition & 1 deletion hapi-deployable-pom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-android/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
4 changes: 2 additions & 2 deletions hapi-fhir-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-bom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<packaging>pom</packaging>
<name>HAPI FHIR BOM</name>

<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-checkstyle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-cli</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-client-apache-http5/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-client-okhttp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-converter/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-docs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-jacoco/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-jaxrsserver-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-jpa-hibernate-services/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-jpa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>
<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion hapi-fhir-jpaserver-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-deployable-pom</artifactId>
<version>8.5.7-SNAPSHOT</version>
<version>8.5.9-SNAPSHOT</version>

<relativePath>../hapi-deployable-pom/pom.xml</relativePath>
</parent>
Expand Down
3 changes: 0 additions & 3 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,15 @@
import ca.uhn.fhir.batch2.api.IJobPersistence;
import ca.uhn.fhir.batch2.config.BaseBatch2Config;
import ca.uhn.fhir.interceptor.api.IInterceptorBroadcaster;
import ca.uhn.fhir.jpa.bulk.export.job.BulkExportJobConfig;
import ca.uhn.fhir.jpa.dao.data.IBatch2JobInstanceRepository;
import ca.uhn.fhir.jpa.dao.data.IBatch2WorkChunkMetadataViewRepository;
import ca.uhn.fhir.jpa.dao.data.IBatch2WorkChunkRepository;
import ca.uhn.fhir.jpa.dao.tx.IHapiTransactionService;
import jakarta.persistence.EntityManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

@Configuration
@Import({BulkExportJobConfig.class})
public class JpaBatch2Config extends BaseBatch2Config {

@Bean
Expand Down
37 changes: 0 additions & 37 deletions ...hir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/job/BulkExportJobConfig.java
View file
Open in desktop

This file was deleted.

31 changes: 13 additions & 18 deletions ...-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import ca.uhn.fhir.jpa.model.search.SearchBuilderLoadIncludesParameters;
import ca.uhn.fhir.jpa.model.search.SearchRuntimeDetails;
import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
import ca.uhn.fhir.mdm.svc.MdmExpandersHolder;
import ca.uhn.fhir.mdm.api.IMdmLinkExpandSvc;
import ca.uhn.fhir.model.api.Include;
import ca.uhn.fhir.model.primitive.IdDt;
import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
Expand Down Expand Up @@ -86,7 +86,7 @@ public class JpaBulkExportProcessor implements IBulkExportProcessor<JpaPid> {
private EntityManager myEntityManager;
private IHapiTransactionService myHapiTransactionService;
private ISearchParamRegistry mySearchParamRegistry;
private MdmExpandersHolder myMdmExpandersHolder;
private Optional<IMdmLinkExpandSvc> myMdmLinkExpandSvc;

@Autowired
public JpaBulkExportProcessor(
Expand All @@ -99,7 +99,7 @@ public JpaBulkExportProcessor(
EntityManager theEntityManager,
IHapiTransactionService theHapiTransactionService,
ISearchParamRegistry theSearchParamRegistry,
MdmExpandersHolder theMdmExpandersHolder) {
Optional<IMdmLinkExpandSvc> theMdmLinkExpandSvc) {
Copy link
Collaborator

@fil512 fil512 Oct 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

optional arguments is an antipattern
https://cloud-ci.sgs.com/sonar/coding_rules?open=java%3AS3553&rule_key=java%3AS3553

myContext = theContext;
myBulkExportHelperSvc = theBulkExportHelperSvc;
myStorageSettings = theStorageSettings;
Expand All @@ -109,7 +109,7 @@ public JpaBulkExportProcessor(
myEntityManager = theEntityManager;
myHapiTransactionService = theHapiTransactionService;
mySearchParamRegistry = theSearchParamRegistry;
myMdmExpandersHolder = theMdmExpandersHolder;
myMdmLinkExpandSvc = theMdmLinkExpandSvc;
}

@Override
Expand Down Expand Up @@ -345,15 +345,6 @@ protected RuntimeSearchParam getPatientSearchParamForCurrentResourceType(String
return searchParam;
}

@Override
public void expandMdmResources(List<IBaseResource> theResources) {
for (IBaseResource resource : theResources) {
if (!PATIENT_BULK_EXPORT_FORWARD_REFERENCE_RESOURCE_TYPES.contains(resource.fhirType())) {
myMdmExpandersHolder.getBulkExportMDMResourceExpanderInstance().annotateResource(resource);
}
}
}

/**
* For Patient
**/
Expand Down Expand Up @@ -389,7 +380,7 @@ private void validateSearchParametersForGroup(SearchParameterMap expandedSpMap,
/**
* Given the local myGroupId, perform an expansion to retrieve all resource IDs of member patients.
* if myMdmEnabled is set to true, we also attempt to also expand it into matched
* patients.
* patients, assuming MDM is configured.
*
* @return a Set of Strings representing the resource IDs of all members of a group.
*/
Expand All @@ -404,10 +395,14 @@ private LinkedHashSet<JpaPid> getExpandedPatientList(
LinkedHashSet<JpaPid> patientPidsToExport = new LinkedHashSet<>(members);

if (theParameters.isExpandMdm()) {
RequestPartitionId partitionId = theParameters.getPartitionIdOrAllPartitions();
patientPidsToExport.addAll(myMdmExpandersHolder
.getBulkExportMDMResourceExpanderInstance()
.expandGroup(theParameters.getGroupId(), partitionId));
if (myMdmLinkExpandSvc.isPresent()) {
RequestPartitionId partitionId = theParameters.getPartitionIdOrAllPartitions();
IMdmLinkExpandSvc iMdmLinkExpandSvc = myMdmLinkExpandSvc.get();
patientPidsToExport.addAll(iMdmLinkExpandSvc.expandGroup(theParameters.getGroupId(), partitionId));
} else {
ourLog.warn(
"Attempted to perform MDM expansion during a group-level export operation, but no IMdmLinkExpandSvc was configured. Is MDM Configured correctly?");
}
}
return patientPidsToExport;
}
Expand Down
8 changes: 5 additions & 3 deletions hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,14 @@
import ca.uhn.fhir.jpa.dao.SearchBuilderFactory;
import ca.uhn.fhir.jpa.dao.tx.IHapiTransactionService;
import ca.uhn.fhir.jpa.model.dao.JpaPid;
import ca.uhn.fhir.mdm.svc.MdmExpandersHolder;
import ca.uhn.fhir.mdm.api.IMdmLinkExpandSvc;
import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
import jakarta.persistence.EntityManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import java.util.Optional;

@Configuration
public class JpaBulkExportConfig {
@Bean
Expand All @@ -48,7 +50,7 @@ public IBulkExportProcessor<JpaPid> jpaBulkExportProcessor(
EntityManager theEntityManager,
IHapiTransactionService theHapiTransactionService,
ISearchParamRegistry theSearchParamRegistry,
MdmExpandersHolder theMdmExpandersHolder) {
Optional<IMdmLinkExpandSvc> theMdmLinkExpandSvc) {
return new JpaBulkExportProcessor(
theFhirContext,
theBulkExportHelperService,
Expand All @@ -59,7 +61,7 @@ public IBulkExportProcessor<JpaPid> jpaBulkExportProcessor(
theEntityManager,
theHapiTransactionService,
theSearchParamRegistry,
theMdmExpandersHolder);
theMdmLinkExpandSvc);
}

@Bean
Expand Down
Loading
Loading