Refactor mdm expander holder out

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/batch2/JpaBatch2Config.java

@@ -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

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessor.java

@@ -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;
@@ -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(
@@ -99,7 +99,7 @@ public JpaBulkExportProcessor(
 			EntityManager theEntityManager,
 			IHapiTransactionService theHapiTransactionService,
 			ISearchParamRegistry theSearchParamRegistry,
-			MdmExpandersHolder theMdmExpandersHolder) {
+			Optional<IMdmLinkExpandSvc> theMdmLinkExpandSvc) {
 		myContext = theContext;
 		myBulkExportHelperSvc = theBulkExportHelperSvc;
 		myStorageSettings = theStorageSettings;
@@ -109,7 +109,7 @@ public JpaBulkExportProcessor(
 		myEntityManager = theEntityManager;
 		myHapiTransactionService = theHapiTransactionService;
 		mySearchParamRegistry = theSearchParamRegistry;
-		myMdmExpandersHolder = theMdmExpandersHolder;
+		myMdmLinkExpandSvc = theMdmLinkExpandSvc;
 	}
 
 	@Override
@@ -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
 	 **/
@@ -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.
 	 */
@@ -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;
 	}

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/JpaBulkExportConfig.java

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

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/MdmJpaConfig.java

@@ -30,47 +30,23 @@
 import ca.uhn.fhir.jpa.entity.MdmLink;
 import ca.uhn.fhir.jpa.model.dao.JpaPid;
 import ca.uhn.fhir.mdm.api.IMdmLinkExpandSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.mdm.dao.IMdmLinkDao;
 import ca.uhn.fhir.mdm.dao.IMdmLinkImplFactory;
-import ca.uhn.fhir.mdm.svc.BulkExportMdmEidMatchOnlyResourceExpander;
-import ca.uhn.fhir.mdm.svc.BulkExportMdmResourceExpander;
+import ca.uhn.fhir.mdm.svc.DisabledMdmLinkExpandSvc;
 import ca.uhn.fhir.mdm.svc.MdmEidMatchOnlyExpandSvc;
-import ca.uhn.fhir.mdm.svc.MdmExpandersHolder;
-import ca.uhn.fhir.mdm.svc.MdmExpansionCacheSvc;
 import ca.uhn.fhir.mdm.svc.MdmLinkExpandSvc;
 import ca.uhn.fhir.mdm.svc.MdmSearchExpansionSvc;
+import ca.uhn.fhir.mdm.util.EIDHelper;
+import jakarta.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 
 @Configuration
 public class MdmJpaConfig {
-
-	@Bean
-	public MdmExpandersHolder mdmLinkExpandSvcHolder(
-			FhirContext theFhirContext,
-			IMdmLinkExpandSvc theMdmLinkExpandSvc,
-			MdmEidMatchOnlyExpandSvc theMdmEidMatchOnlyLinkExpandSvc,
-			BulkExportMdmEidMatchOnlyResourceExpander theBulkExportMdmEidMatchOnlyResourceExpander,
-			BulkExportMdmResourceExpander theBulkExportMdmResourceExpander) {
-		return new MdmExpandersHolder(
-				theFhirContext,
-				theMdmLinkExpandSvc,
-				theMdmEidMatchOnlyLinkExpandSvc,
-				theBulkExportMdmResourceExpander,
-				theBulkExportMdmEidMatchOnlyResourceExpander);
-	}
-
-	@Bean
-	public MdmEidMatchOnlyExpandSvc mdmEidMatchOnlyLinkExpandSvc(DaoRegistry theDaoRegistry) {
-		return new MdmEidMatchOnlyExpandSvc(theDaoRegistry);
-	}
-
-	@Bean
-	@Primary
-	public IMdmLinkExpandSvc mdmLinkExpandSvc() {
-		return new MdmLinkExpandSvc();
-	}
+	private static final Logger ourLog = LoggerFactory.getLogger(MdmJpaConfig.class);
 
 	@Bean
 	public MdmSearchExpansionSvc mdmSearchExpansionSvc() {
@@ -83,33 +59,41 @@ public IMdmLinkDao<JpaPid, MdmLink> mdmLinkDao() {
 	}
 
 	@Bean
-	public BulkExportMdmResourceExpander bulkExportMDMResourceExpander(
-			MdmExpansionCacheSvc theMdmExpansionCacheSvc,
-			IMdmLinkDao theMdmLinkDao,
-			IIdHelperService<JpaPid> theIdHelperService,
-			DaoRegistry theDaoRegistry,
-			FhirContext theFhirContext) {
-		return new BulkExportMdmResourceExpander(
-				theMdmExpansionCacheSvc, theMdmLinkDao, theIdHelperService, theDaoRegistry, theFhirContext);
+	public IMdmLinkImplFactory<MdmLink> mdmLinkImplFactory() {
+		return new JpaMdmLinkImplFactory();
 	}
 
+	/**
+	 * Based on the rules laid out in the {@link IMdmSettings} file, construct an {@link IMdmLinkExpandSvc} that is suitable
+	 */
 	@Bean
-	public BulkExportMdmEidMatchOnlyResourceExpander bulkExportMDMEidMatchOnlyResourceExpander(
+	public IMdmLinkExpandSvc mdmLinkExpandSvc(
+			EIDHelper theEidHelper,
+			@Nullable IMdmSettings theMdmSettings,
 			DaoRegistry theDaoRegistry,
-			MdmEidMatchOnlyExpandSvc theMdmEidMatchOnlyLinkExpandSvc,
 			FhirContext theFhirContext,
-			IIdHelperService<JpaPid> theIdHelperService) {
-		return new BulkExportMdmEidMatchOnlyResourceExpander(
-				theDaoRegistry, theMdmEidMatchOnlyLinkExpandSvc, theFhirContext, theIdHelperService);
+			IIdHelperService theIdHelperService) {
+		if (theMdmSettings == null) {
+			return new DisabledMdmLinkExpandSvc();
+		}
+		if (theMdmSettings.supportsLinkBasedExpansion()) {
+			return new MdmLinkExpandSvc();
+		} else if (theMdmSettings.supportsEidBasedExpansion()) {
+			return new MdmEidMatchOnlyExpandSvc(theDaoRegistry, theFhirContext, theIdHelperService, theEidHelper);
+		}
+		return new DisabledMdmLinkExpandSvc();
 	}
 
 	@Bean
-	public IMdmLinkImplFactory<MdmLink> mdmLinkImplFactory() {
-		return new JpaMdmLinkImplFactory();
+	EIDHelper eidHelper(FhirContext theFhirContext, @Nullable IMdmSettings theMdmSettings) {
+		if (theMdmSettings == null) {
+			ourLog.warn("Loading up an EID helper without an IMdmSetting bean defined! MDM will _not_ work!");
+		}
+		return new EIDHelper(theFhirContext, theMdmSettings);
 	}
 
 	@Bean
-	public IMdmClearHelperSvc<JpaPid> helperSvc(IDeleteExpungeSvc<JpaPid> theDeleteExpungeSvc) {
+	public IMdmClearHelperSvc<JpaPid> mdmClearHelperSvc(IDeleteExpungeSvc<JpaPid> theDeleteExpungeSvc) {
 		return new MdmClearHelperSvcImpl(theDeleteExpungeSvc);
 	}
 }

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/bulk/export/svc/JpaBulkExportProcessorTest.java

@@ -8,7 +8,8 @@
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
 import ca.uhn.fhir.jpa.api.dao.IFhirResourceDao;
 import ca.uhn.fhir.jpa.api.svc.IIdHelperService;
-import ca.uhn.fhir.mdm.svc.IBulkExportMdmResourceExpander;
+import ca.uhn.fhir.mdm.api.IMdmLink;
+import ca.uhn.fhir.mdm.api.IMdmLinkExpandSvc;
 import ca.uhn.fhir.jpa.bulk.export.model.ExportPIDIteratorParameters;
 import ca.uhn.fhir.jpa.dao.IResultIterator;
 import ca.uhn.fhir.jpa.dao.ISearchBuilder;
@@ -19,7 +20,6 @@
 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.model.primitive.IdDt;
 import ca.uhn.fhir.rest.api.RestSearchParameterTypeEnum;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
@@ -52,6 +52,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -131,10 +132,10 @@ public JpaPid next() {
 	private IIdHelperService<JpaPid> myIdHelperService;
 
 	@Mock
-	private MdmExpandersHolder myMdmExpandersHolder;
+	private Optional<IMdmLinkExpandSvc> myOptionalMdmLinkExpanderService;
 
 	@Mock
-	private IBulkExportMdmResourceExpander myBulkExportMDMResourceExpander;
+	private IMdmLinkExpandSvc myMdmLinkExpanderService;
 
 	@Mock
 	private ISearchParamRegistry mySearchParamRegistry;
@@ -299,9 +300,10 @@ public void getResourcePidIterator_groupExportStyleWithPatientResource_returnsIt
 		final JpaPid mdmExpandedPatientId = JpaPid.fromId(4567L);
 		if (theMdm) {
 
-			when(myMdmExpandersHolder.getBulkExportMDMResourceExpanderInstance()).thenReturn(myBulkExportMDMResourceExpander);
 			// mock the call to expandGroup method of the expander
-			when(myBulkExportMDMResourceExpander.expandGroup(parameters.getGroupId(), getPartitionIdFromParams(thePartitioned)))
+			when(myOptionalMdmLinkExpanderService.isPresent()).thenReturn(true);
+			when(myOptionalMdmLinkExpanderService.get()).thenReturn(myMdmLinkExpanderService);
+			when(myMdmLinkExpanderService.expandGroup(parameters.getGroupId(), getPartitionIdFromParams(thePartitioned)))
 				.thenReturn(Set.of(mdmExpandedPatientId));
 		}
 
@@ -395,9 +397,10 @@ public void getResourcePidIterator_groupExportStyleWithNonPatientResource_return
 			.thenReturn(observationResultsIterator);
 
 		if (theMdm) {
-			when(myMdmExpandersHolder.getBulkExportMDMResourceExpanderInstance()).thenReturn(myBulkExportMDMResourceExpander);
 			// mock the call to expandGroup method of the expander
-			when(myBulkExportMDMResourceExpander.expandGroup(parameters.getGroupId(), getPartitionIdFromParams(thePartitioned)))
+			when(myOptionalMdmLinkExpanderService.isPresent()).thenReturn(true);
+			when(myOptionalMdmLinkExpanderService.get()).thenReturn(myMdmLinkExpanderService);
+			when(myMdmLinkExpanderService.expandGroup(parameters.getGroupId(), getPartitionIdFromParams(thePartitioned)))
 				.thenReturn(Collections.emptySet());
 		}