fixing some tests

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

@@ -76,7 +76,12 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {MdmSubmitterConfig.class, MdmConsumerConfig.class, TestMdmConfigR4.class, SubscriptionProcessorConfig.class})
+@ContextConfiguration(classes = {
+ MdmSubmitterConfig.class,
+ MdmConsumerConfig.class,
+ TestMdmConfigR4.class,
+ SubscriptionProcessorConfig.class
+})
 abstract public class BaseMdmR4Test extends BaseJpaR4Test {
 
  protected static final String PARTITION_1 = "PART-1";

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

@@ -7,6 +7,7 @@
 import ca.uhn.fhir.mdm.provider.MdmControllerHelper;
 import ca.uhn.fhir.mdm.provider.MdmProviderDstu3Plus;
 import ca.uhn.fhir.mdm.rules.config.MdmSettings;
+import ca.uhn.fhir.mdm.rules.svc.MdmResourceMatcherSvc;
 import ca.uhn.fhir.mdm.util.MessageHelper;
 import com.google.common.base.Charsets;
 import org.apache.commons.io.IOUtils;
@@ -34,6 +35,8 @@ public abstract class BaseProviderR4Test extends BaseMdmR4Test {
  @Autowired
  protected MdmSettings myMdmSettings;
  @Autowired
+ protected MdmResourceMatcherSvc myMdmResourceMatcherSvc;
+ @Autowired
  private MdmControllerHelper myMdmHelper;
  @Autowired
  Batch2JobHelper myBatch2JobHelper;
@@ -48,7 +51,7 @@ protected void setMdmRuleJson(String theString) throws IOException {
  String json = IOUtils.toString(resource.getInputStream(), Charsets.UTF_8);
  myMdmSettings.setEnabled(true);
  myMdmSettings.setScriptText(json);
- myMdmResourceMatcherSvc.setMdmSettings(myMdmSettings);
+ myMdmResourceMatcherSvc.setMdmRulesJson(myMdmSettings.getMdmRules());
  }
 
  @BeforeEach
@@ -62,7 +65,7 @@ public void before() throws Exception {
  public void after() throws IOException {
  super.after();
  myMdmSettings.setScriptText(defaultScript);
- myMdmResourceMatcherSvc.setMdmSettings(myMdmSettings);
+ myMdmResourceMatcherSvc.setMdmRulesJson(myMdmSettings.getMdmRules());
  }
 
  protected void clearMdmLinks() {

hapi-fhir-server-mdm/pom.xml

@@ -33,12 +33,6 @@
  <artifactId>hapi-fhir-storage</artifactId>
  <version>${project.version}</version>
  </dependency>
- <!-- should be a dependency of hapi-fhir-storage, but... -->
- <dependency>
- <groupId>ca.uhn.hapi.fhir</groupId>
- <artifactId>hapi-fhir-jpaserver-searchparam</artifactId>
- <version>${project.version}</version>
- </dependency>
  <dependency>
  <groupId>org.springframework.data</groupId>
  <artifactId>spring-data-commons</artifactId>

hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/provider/MdmControllerHelper.java

@@ -139,7 +139,7 @@ public void validateIsMdmManaged(String theName, IAnyResource theResource) {
  public IBaseBundle getMatchesAndPossibleMatchesForResource(IAnyResource theResource, String theResourceType, RequestDetails theRequestDetails) {
  RequestPartitionId requestPartitionId;
  ReadPartitionIdRequestDetails details = ReadPartitionIdRequestDetails.forSearchType(theResourceType, null, null);
- if (myMdmSettings.getSearchAllPartitionForMatch()){
+ if (myMdmSettings.getSearchAllPartitionForMatch()) {
  requestPartitionId = RequestPartitionId.allPartitions();
  } else {
  requestPartitionId = myRequestPartitionHelperSvc.determineReadPartitionForRequest(theRequestDetails, details);

hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceFieldMatcher.java

@@ -87,7 +87,6 @@ public MdmResourceFieldMatcher(
  * @param theRightResource the second {@link IBaseResource}
  * @return A boolean indicating whether they match.
  */
- @SuppressWarnings("rawtypes")
  public MdmMatchEvaluation match(IBaseResource theLeftResource, IBaseResource theRightResource) {
  validate(theLeftResource);
  validate(theRightResource);
@@ -186,8 +185,12 @@ private ExtraMatchParams getExtraMatcherParams() {
  MdmMatcherJson matcherJson = myMdmFieldMatchJson.getMatcher();
 
  ExtraMatchParams params = new ExtraMatchParams();
- params.setExactMatch(matcherJson.getExact());
- params.setIdentificationSystem(matcherJson.getIdentifierSystem());
+ if (matcherJson != null) {
+ params.setExactMatch(matcherJson.getExact());
+ params.setIdentificationSystem(matcherJson.getIdentifierSystem());
+ } else {
+ System.out.println("hereherhehere");
+ }
  return params;
  }
 }

hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/svc/MdmResourceMatcherSvc.java

@@ -22,7 +22,6 @@
 import ca.uhn.fhir.context.ConfigurationException;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.i18n.Msg;
-import ca.uhn.fhir.jpa.searchparam.matcher.IMdmFieldMatcher;
 import ca.uhn.fhir.mdm.api.IMdmSettings;
 import ca.uhn.fhir.mdm.api.MdmConstants;
 import ca.uhn.fhir.mdm.api.MdmMatchEvaluation;
@@ -32,6 +31,7 @@
 import ca.uhn.fhir.mdm.rules.json.MdmFieldMatchJson;
 import ca.uhn.fhir.mdm.rules.json.MdmRulesJson;
 import ca.uhn.fhir.mdm.rules.matcher.IMatcherFactory;
+import com.google.common.annotations.VisibleForTesting;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Service;
@@ -51,9 +51,10 @@ public class MdmResourceMatcherSvc {
 
  private final FhirContext myFhirContext;
  private final IMatcherFactory myMatcherFactory;
- private MdmRulesJson myMdmRulesJson;
  private final List<MdmResourceFieldMatcher> myFieldMatchers = new ArrayList<>();
 
+ private MdmRulesJson myMdmRulesJson;
+
  public MdmResourceMatcherSvc(
  FhirContext theFhirContext,
  IMatcherFactory theIMatcherFactory,
@@ -148,11 +149,16 @@ private MdmMatchOutcome getMatchOutcome(IBaseResource theLeftResource, IBaseReso
  return retVal;
  }
 
-
  private boolean isValidResourceType(String theResourceType, String theFieldComparatorType) {
  return (
  theFieldComparatorType.equalsIgnoreCase(MdmConstants.ALL_RESOURCE_SEARCH_PARAM_TYPE)
  || theFieldComparatorType.equalsIgnoreCase(theResourceType)
  );
  }
+
+ @VisibleForTesting
+ public void setMdmRulesJson(MdmRulesJson theMdmRulesJson) {
+ myMdmRulesJson = theMdmRulesJson;
+ addFieldMatchers();
+ }
 }