honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated wording assertion in exception tracing

This commit is contained in:
Nick 2020-12-08 19:05:21 -05:00
parent 4b610801fa
commit b3a9ab20dc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hapi-fhir-jpaserver-mdm/src/test/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptorIT.java
View File

@ -242,7 +242,7 @@ public class MdmStorageInterceptorIT extends BaseMdmR4Test {
myMdmHelper.doUpdateResource(jane, true); myMdmHelper.doUpdateResource(jane, true);
fail(); fail();
} catch (ForbiddenOperationException e) { } catch (ForbiddenOperationException e) {
assertThat(e.getMessage(), is(equalTo("While running with EID updates disabled, EIDs may not be updated on Patient/Practitioner resources"))); assertThat(e.getMessage(), is(equalTo("While running with EID updates disabled, EIDs may not be updated on source resources")));
} }
setPreventEidUpdates(false); setPreventEidUpdates(false);
} }
@ -257,7 +257,7 @@ public class MdmStorageInterceptorIT extends BaseMdmR4Test {
myMdmHelper.doCreateResource(patient, true); myMdmHelper.doCreateResource(patient, true);
fail(); fail();
} catch (ForbiddenOperationException e) { } catch (ForbiddenOperationException e) {
assertThat(e.getMessage(), is(equalTo("While running with multiple EIDs disabled, Patient/Practitioner resources may have at most one EID."))); assertThat(e.getMessage(), is(equalTo("While running with multiple EIDs disabled, source resources may have at most one EID.")));
} }
setPreventMultipleEids(false); setPreventMultipleEids(false);

1
hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/util/MdmResourceUtil.java
View File

@ -85,7 +85,6 @@ public final class MdmResourceUtil {
theResource.getMeta().getTag().removeIf(tag -> tag.getSystem().equalsIgnoreCase(theSystem)); theResource.getMeta().getTag().removeIf(tag -> tag.getSystem().equalsIgnoreCase(theSystem));
} }
/** /**
* Sets the MDM-managed tag, indicating the MDM system has ownership of this * Sets the MDM-managed tag, indicating the MDM system has ownership of this
* Resource. No changes are made if resource is already maanged by MDM. * Resource. No changes are made if resource is already maanged by MDM.