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

Allow system request details to go through MDM

This commit is contained in:
Tadgh 2021-12-15 22:47:33 -08:00
parent 6d92d08e6f
commit 700b614610
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvc.java
View File

@ -59,7 +59,6 @@ import static org.slf4j.LoggerFactory.getLogger;
public class RequestPartitionHelperSvc implements IRequestPartitionHelperSvc { public class RequestPartitionHelperSvc implements IRequestPartitionHelperSvc {
private static final Logger ourLog = getLogger(RequestPartitionHelperSvc.class); private static final Logger ourLog = getLogger(RequestPartitionHelperSvc.class);
private final HashSet<Object> myNonPartitionableResourceNames; private final HashSet<Object> myNonPartitionableResourceNames;
@Autowired @Autowired

1
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirSystemDaoR4Test.java
View File

@ -824,7 +824,6 @@ public class FhirSystemDaoR4Test extends BaseJpaR4SystemTest {
profiles = meta.getProfile(); profiles = meta.getProfile();
assertEquals(1, profiles.size()); assertEquals(1, profiles.size());
assertEquals("http://profile/2", profiles.get(0).getValue()); assertEquals("http://profile/2", profiles.get(0).getValue());
} }
@Test @Test

3
hapi-fhir-jpaserver-mdm/src/main/java/ca/uhn/fhir/jpa/mdm/interceptor/MdmStorageInterceptor.java
View File

@ -21,6 +21,7 @@ package ca.uhn.fhir.jpa.mdm.interceptor;
*/ */
import ca.uhn.fhir.context.FhirContext; import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.partition.SystemRequestDetails;
import ca.uhn.fhir.mdm.api.MdmConstants; import ca.uhn.fhir.mdm.api.MdmConstants;
import ca.uhn.fhir.mdm.api.IMdmSettings; import ca.uhn.fhir.mdm.api.IMdmSettings;
import ca.uhn.fhir.mdm.model.CanonicalEID; import ca.uhn.fhir.mdm.model.CanonicalEID;
@ -181,7 +182,7 @@ public class MdmStorageInterceptor implements IMdmStorageInterceptor {
* We assume that if we have RequestDetails, then this was an HTTP request and not an internal one. * We assume that if we have RequestDetails, then this was an HTTP request and not an internal one.
*/ */
private boolean isInternalRequest(RequestDetails theRequestDetails) { private boolean isInternalRequest(RequestDetails theRequestDetails) {
return theRequestDetails == null; return theRequestDetails == null || theRequestDetails instanceof SystemRequestDetails;
} }
private void forbidIfMdmManagedTagIsPresent(IBaseResource theResource) { private void forbidIfMdmManagedTagIsPresent(IBaseResource theResource) {