From 03643a7b3cf394c9627a7ec8046db514f1794997 Mon Sep 17 00:00:00 2001
From: Nick Goupinets <nick.goupinets@smilecdr.com>
Date: Wed, 25 Nov 2020 17:37:37 -0500
Subject: [PATCH] Fix for bean scope inconsistenices

---
 .../java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java | 4 +++-
 .../main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java | 6 ++++++
 .../src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java    | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java
index 609b005558c..59cabb68bb0 100644
--- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java
+++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/config/MdmSubmitterConfig.java
@@ -22,6 +22,7 @@ package ca.uhn.fhir.jpa.mdm.config;
 
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.mdm.api.IMdmChannelSubmitterSvc;
+import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.mdm.api.IMdmSubmitSvc;
 import ca.uhn.fhir.mdm.rules.config.MdmRuleValidator;
 import ca.uhn.fhir.jpa.dao.mdm.MdmLinkDeleteSvc;
@@ -31,6 +32,7 @@ import ca.uhn.fhir.jpa.mdm.svc.MdmGoldenResourceDeletingSvc;
 import ca.uhn.fhir.jpa.mdm.svc.MdmSearchParamSvc;
 import ca.uhn.fhir.jpa.mdm.svc.MdmSubmitSvcImpl;
 import ca.uhn.fhir.jpa.subscription.channel.api.IChannelFactory;
+import ca.uhn.fhir.mdm.util.MessageHelper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
@@ -70,7 +72,7 @@ public class MdmSubmitterConfig {
 	}
 
 	@Bean
-	IMdmSubmitSvc mdmBatchService() {
+	IMdmSubmitSvc mdmBatchService(IMdmSettings theMdmSetting) {
 		return new MdmSubmitSvcImpl();
 	}
 }
diff --git a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java
index 257a7a0f931..db4095affe5 100644
--- a/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java
+++ b/hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/svc/MdmSubmitSvcImpl.java
@@ -50,6 +50,7 @@ import java.util.List;
 import java.util.UUID;
 
 public class MdmSubmitSvcImpl implements IMdmSubmitSvc {
+
 	private static final Logger ourLog = Logs.getMdmTroubleshootingLog();
 
 	@Autowired
@@ -148,6 +149,11 @@ public class MdmSubmitSvcImpl implements IMdmSubmitSvc {
 		return 1;
 	}
 
+	@Override
+	public void setMdmSettings(IMdmSettings theMdmSettings) {
+		myMdmSettings = theMdmSettings;
+	}
+
 	private void validateTargetType(String theResourceType) {
 		if(!myMdmSettings.getMdmRules().getMdmTypes().contains(theResourceType)) {
 			throw new InvalidRequestException(ProviderConstants.OPERATION_MDM_SUBMIT + " does not support resource type: " + theResourceType);
diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java
index 4ec907275f9..f170175e1cc 100644
--- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java
+++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/api/IMdmSubmitSvc.java
@@ -70,4 +70,10 @@ public interface IMdmSubmitSvc {
 	 */
 	long submitTargetToMdm(IIdType theId);
 
+	/**
+	 * This setter exists to allow imported modules to override settings.
+	 *
+	 * @param theMdmSettings Settings to set
+	 */
+	void setMdmSettings(IMdmSettings theMdmSettings);
 }