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

emergency fix - reverting changes introduced in 6092 to get pipeline running. (#6101) 

Co-authored-by: peartree <etienne.poirier@smilecdr.com>
This commit is contained in:
Etienne Poirier 2024-07-11 17:26:39 -04:00 committed by GitHub
parent 6c446277e3
commit bd31bcb290
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvcTest.java
View File

@ -11,6 +11,7 @@ import org.hl7.fhir.r4.model.ConceptMap;
import org.hl7.fhir.r4.model.IdType; import org.hl7.fhir.r4.model.IdType;
import org.hl7.fhir.r4.model.Patient; import org.hl7.fhir.r4.model.Patient;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoExtension;
@ -54,6 +55,8 @@ class RequestPartitionHelperSvcTest extends BaseJpaR4Test {
myPatient.setId(new IdType("Patient", "123", "1")); myPatient.setId(new IdType("Patient", "123", "1"));
} }
// TODO EHP: re-enable this test
@Disabled
@Test @Test
public void testDetermineReadPartitionForSystemRequest_whenResourceIsNonPartitionable_returnsDefaultPartition() { public void testDetermineReadPartitionForSystemRequest_whenResourceIsNonPartitionable_returnsDefaultPartition() {
// setup // setup

9
hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java
View File

@ -235,8 +235,13 @@ public abstract class BaseRequestPartitionHelperSvc implements IRequestPartition
// TODO GGG eventually, theRequest will not be allowed to be null here, and we will pass through // TODO GGG eventually, theRequest will not be allowed to be null here, and we will pass through
// SystemRequestDetails instead. // SystemRequestDetails instead.
if ((theRequest == null || theRequest instanceof SystemRequestDetails) && nonPartitionableResource) { // TODO EHP: temporarely commenting out to fix build pipeline.
return RequestPartitionId.defaultPartition(); // if ((theRequest == null || theRequest instanceof SystemRequestDetails) && nonPartitionableResource) {
// return RequestPartitionId.defaultPartition();
// }
if (theRequest == null) {
requestDetails = new SystemRequestDetails();
} }
RequestPartitionId requestPartitionId = null; RequestPartitionId requestPartitionId = null;