Fix mdm config for single application context environment. (#3338)

* wip

* remove beans

* Remove javax.mail from the classpath as we use simplemail instead, which uses jakarta.

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

@@ -521,21 +521,12 @@ public abstract class BaseConfig {
 		return new RequestTenantPartitionInterceptor();
 	}
 
-	@Bean
-	@Lazy
-	public MdmSearchExpandingInterceptor mdmSearchExpandingInterceptor() {
-		return new MdmSearchExpandingInterceptor();
-	}
 
 	@Bean
 	public MdmLinkExpandSvc mdmLinkExpandSvc() {
 		return new MdmLinkExpandSvc();
 	}
 
-	@Bean
-	IMdmBatchJobSubmitterFactory mdmBatchJobSubmitterFactory() {
-		return new MdmBatchJobSubmitterFactoryImpl();
-	}
 
 	@Bean
 	IMdmClearJobSubmitter mdmClearJobSubmitter() {

hapi-fhir-jpaserver-cql/pom.xml

@@ -27,6 +27,13 @@
 			<groupId>org.opencds.cqf.cql</groupId>
 			<artifactId>evaluator.engine</artifactId>
 			<version>${cql-evaluator.version}</version>
+			<exclusions>
+				<!-- we exclude this because we don't want javax.mail and will use jakarta.mail instead -->
+				<exclusion>
+					<groupId>com.sun.mail</groupId>
+					<artifactId>javax.mail</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.opencds.cqf.cql</groupId>

hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmCommonConfig.java

@@ -0,0 +1,36 @@
+package ca.uhn.fhir.jpa.mdm.config;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.jpa.batch.mdm.MdmBatchJobSubmitterFactoryImpl;
+import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDeleteSvc;
+import ca.uhn.fhir.jpa.interceptor.MdmSearchExpandingInterceptor;
+import ca.uhn.fhir.mdm.api.IMdmBatchJobSubmitterFactory;
+import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
+import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+@Configuration
+public class MdmCommonConfig {
+	@Bean
+	MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext, ISearchParamRegistry theSearchParamRetriever) {
+		return new MdmRuleValidator(theFhirContext, theSearchParamRetriever);
+	}
+	@Bean
+	@Lazy
+	public MdmSearchExpandingInterceptor mdmSearchExpandingInterceptor() {
+		return new MdmSearchExpandingInterceptor();
+	}
+
+	@Bean
+	IMdmBatchJobSubmitterFactory mdmBatchJobSubmitterFactory() {
+		return new MdmBatchJobSubmitterFactoryImpl();
+	}
+
+	@Bean
+	MdmLinkDeleteSvc mdmLinkDeleteSvc() {
+		return new MdmLinkDeleteSvc();
+	}
+
+}

hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmConsumerConfig.java

@@ -22,9 +22,6 @@ package ca.uhn.fhir.jpa.mdm.config;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
-import ca.uhn.fhir.jpa.batch.mdm.MdmBatchJobSubmitterFactoryImpl;
-import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDeleteSvc;
-import ca.uhn.fhir.jpa.interceptor.MdmSearchExpandingInterceptor;
 import ca.uhn.fhir.jpa.mdm.broker.MdmMessageHandler;
 import ca.uhn.fhir.jpa.mdm.broker.MdmMessageKeySvc;
 import ca.uhn.fhir.jpa.mdm.broker.MdmQueueConsumerLoader;
@@ -55,7 +52,6 @@ import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchCriteriaBuilderSvc;
 import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmCandidateSearchSvc;
 import ca.uhn.fhir.jpa.mdm.svc.candidate.MdmGoldenResourceFindingSvc;
 import ca.uhn.fhir.mdm.api.IGoldenResourceMergerSvc;
-import ca.uhn.fhir.mdm.api.IMdmBatchJobSubmitterFactory;
 import ca.uhn.fhir.mdm.api.IMdmControllerSvc;
 import ca.uhn.fhir.mdm.api.IMdmLinkCreateSvc;
 import ca.uhn.fhir.mdm.api.IMdmLinkQuerySvc;
@@ -67,18 +63,18 @@ import ca.uhn.fhir.mdm.api.IMdmSurvivorshipService;
 import ca.uhn.fhir.mdm.log.Logs;
 import ca.uhn.fhir.mdm.provider.MdmControllerHelper;
 import ca.uhn.fhir.mdm.provider.MdmProviderLoader;
-import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
 import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
 import ca.uhn.fhir.mdm.util.EIDHelper;
 import ca.uhn.fhir.mdm.util.GoldenResourceHelper;
 import ca.uhn.fhir.mdm.util.MessageHelper;
-import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
 import ca.uhn.fhir.validation.IResourceLoader;
 import org.slf4j.Logger;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 
 @Configuration
+@Import(MdmCommonConfig.class)
 public class MdmConsumerConfig {
 	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
@@ -87,11 +83,6 @@ public class MdmConsumerConfig {
 		return new MdmStorageInterceptor();
 	}
 
-	@Bean
-    MdmSearchExpandingInterceptor myMdmSearchExpandingInterceptorInterceptor() {
-		return new MdmSearchExpandingInterceptor();
-	}
-
 	@Bean
 	IMdmSurvivorshipService mdmSurvivorshipService() { return new MdmSurvivorshipSvcImpl(); }
 
@@ -169,10 +160,6 @@ public class MdmConsumerConfig {
 		return new MdmProviderLoader();
 	}
 
-	@Bean
-	MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext, ISearchParamRegistry theSearchParamRetriever) {
-		return new MdmRuleValidator(theFhirContext, theSearchParamRetriever);
-	}
 
 	@Bean
 	IMdmMatchFinderSvc mdmMatchFinderSvc() {
@@ -195,10 +182,6 @@ public class MdmConsumerConfig {
 		return new MdmModelConverterSvcImpl();
 	}
 
-	@Bean
-	IMdmBatchJobSubmitterFactory mdmBatchJobSubmitterFactory() {
-		return new MdmBatchJobSubmitterFactoryImpl();
-	}
 
 	@Bean
 	MdmCandidateSearchSvc mdmCandidateSearchSvc() {
@@ -251,11 +234,6 @@ public class MdmConsumerConfig {
 		return new MdmLoader();
 	}
 
-	@Bean
-	MdmLinkDeleteSvc mdmLinkDeleteSvc() {
-		return new MdmLinkDeleteSvc();
-	}
-
 	@Bean
 	MdmResourceFilteringSvc mdmResourceFilteringSvc() {
 		return new MdmResourceFilteringSvc();

hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java

@@ -33,9 +33,11 @@ import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
 import ca.uhn.fhir.rest.server.util.ISearchParamRegistry;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Lazy;
 
 @Configuration
+@Import(MdmCommonConfig.class)
 public class MdmSubmitterConfig {
 
 	@Bean
@@ -48,16 +50,6 @@ public class MdmSubmitterConfig {
 		return new MdmSearchParamSvc();
 	}
 
-	@Bean
-	MdmRuleValidator mdmRuleValidator(FhirContext theFhirContext, ISearchParamRegistry theSearchParamRetriever) {
-		return new MdmRuleValidator(theFhirContext, theSearchParamRetriever);
-	}
-
-	@Bean
-	MdmLinkDeleteSvc mdmLinkDeleteSvc() {
-		return new MdmLinkDeleteSvc();
-	}
-
 	@Bean
 	@Lazy
 	IMdmChannelSubmitterSvc mdmChannelSubmitterSvc(FhirContext theFhirContext, IChannelFactory theChannelFactory) {

hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/BaseMdmR4Test.java

@@ -74,7 +74,6 @@ import static org.slf4j.LoggerFactory.getLogger;
 @ContextConfiguration(classes = {MdmSubmitterConfig.class, MdmConsumerConfig.class, TestMdmConfigR4.class, SubscriptionProcessorConfig.class})
 abstract public class BaseMdmR4Test extends BaseJpaR4Test {
 
-
 	public static final String NAME_GIVEN_JANE = "Jane";
 	public static final String NAME_GIVEN_PAUL = "Paul";
 	public static final String TEST_NAME_FAMILY = "Doe";

hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/config/MdmConfigTest.java

@@ -0,0 +1,2 @@
+package ca.uhn.fhir.jpa.mdm.config;public class MdmConfigTest {
+}