Fixing tests, upgraded github actions

Author: madduci

.github/actions/build-cache/action.yml

@@ -14,7 +14,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up JDK ${{ inputs.java-version }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ inputs.java-version }}
         distribution: "temurin"

.github/actions/build-module/action.yml

@@ -15,12 +15,12 @@ runs:
   using: "composite"
   steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 1
 
     - name: Set up Java 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: '17'

.github/actions/generate-module-list/action.yml

@@ -13,10 +13,10 @@ runs:
   using: 'composite'
   steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'adopt'
         java-version: '17'

.github/actions/run-tests-and-archive-results/action.yml

@@ -18,7 +18,7 @@ runs:
   using: "composite"
   steps:
     - name: Set up JDK ${{ inputs.java-version }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         java-version: ${{ inputs.java-version }}
         distribution: 'temurin'

.github/workflows/spotless.yml

@@ -11,9 +11,9 @@ jobs:
     permissions:
       pull-requests: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           java-version: '17'
           distribution: 'temurin'

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/BasePartitioningR4Test.java

@@ -6,6 +6,7 @@
 import static ca.uhn.fhir.interceptor.model.RequestPartitionId.fromPartitionNames;
 import static ca.uhn.fhir.jpa.model.entity.ResourceTable.IDX_RES_TYPE_FHIR_ID;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import ca.uhn.fhir.interceptor.api.Hook;
 import ca.uhn.fhir.interceptor.api.Interceptor;
 import ca.uhn.fhir.interceptor.api.Pointcut;
@@ -84,6 +85,8 @@ public void after() {
 		if (myRegisteredSearchParamValidatingInterceptor) {
 			myInterceptorRegistry.unregisterInterceptor(mySearchParamValidatingInterceptor);
 		}
+
+		afterPurgeDatabase();
 	}
 
 	protected void assertNoRemainingPartitionIds() {
@@ -128,7 +131,7 @@ public void before() throws Exception {
 			myPartitionConfigSvc.getPartitionById(i);
 		}
 
-		if (myInterceptorRegistry.getAllRegisteredInterceptors().stream().noneMatch(t->t instanceof SearchParamValidatingInterceptor)) {
+		if (myInterceptorRegistry.getAllRegisteredInterceptors().stream().noneMatch(t -> t instanceof SearchParamValidatingInterceptor)) {
 			myRegisteredSearchParamValidatingInterceptor = true;
 			myInterceptorRegistry.registerInterceptor(mySearchParamValidatingInterceptor);
 		}
@@ -285,8 +288,10 @@ protected void addNextTargetPartitionForCreateWithId(RequestPartitionId requestP
 		addNextInterceptorCreateResult(requestPartitionId);
 	}
 
-	/** Actual update of an existing resource.
-	 * We only need one call for the tx boundary, since the actual partition is already assigned. */
+	/**
+	 * Actual update of an existing resource.
+	 * We only need one call for the tx boundary, since the actual partition is already assigned.
+	 */
 	protected void addNextTargetPartitionForUpdate(RequestPartitionId theRequestPartitionId) {
 		addNextInterceptorCreateResult(theRequestPartitionId);
 	}
@@ -420,7 +425,7 @@ public void addNextIterceptorReadResult(RequestPartitionId theRequestPartitionId
 
 		@Hook(Pointcut.STORAGE_PARTITION_IDENTIFY_READ)
 		public RequestPartitionId partitionIdentifyRead(ServletRequestDetails theRequestDetails,
-																		ReadPartitionIdRequestDetails theDetails) {
+														ReadPartitionIdRequestDetails theDetails) {
 
 			// Just to be nice, figure out the first line in the stack that isn't a part of the
 			// partitioning or interceptor infrastructure, just so it's obvious who is asking
@@ -449,10 +454,10 @@ private static String getCallerStackLine() {
 		} catch (Exception e) {
 			stack = StackTraceHelper.getStackAsString(e);
 			stack = Arrays.stream(stack.split("\\n"))
-				.filter(t->t.contains("ca.uhn.fhir"))
-				.filter(t->!t.toLowerCase().contains("interceptor"))
-				.filter(t->!t.toLowerCase().contains("partitionhelper"))
-				.filter(t->!t.contains("Test"))
+				.filter(t -> t.contains("ca.uhn.fhir"))
+				.filter(t -> !t.toLowerCase().contains("interceptor"))
+				.filter(t -> !t.toLowerCase().contains("partitionhelper"))
+				.filter(t -> !t.contains("Test"))
 				.findFirst()
 				.orElse("UNKNOWN");
 		}

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/PartitioningAllowedUnqualifiedR4Test.java

@@ -23,14 +23,14 @@ public void beforeEach() {
 	@AfterEach
 	@Override
 	public void after() {
-
 		PartitionSettings defaultPartitionSettings = new PartitionSettings();
 		myPartitionSettings.setIncludePartitionInSearchHashes(defaultPartitionSettings.isIncludePartitionInSearchHashes());
 		myPartitionSettings.setPartitioningEnabled(defaultPartitionSettings.isPartitioningEnabled());
 		myPartitionSettings.setAllowReferencesAcrossPartitions(defaultPartitionSettings.getAllowReferencesAcrossPartitions());
 		myPartitionSettings.setDefaultPartitionId(defaultPartitionSettings.getDefaultPartitionId());
 
 		mySrdInterceptorService.unregisterInterceptorsIf(MyReadWriteInterceptor.class::isInstance);
+		afterPurgeDatabase();
 	}
 
 	@Test

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/interceptor/PartitioningInterceptorR4Test.java

@@ -1,7 +1,9 @@
 package ca.uhn.fhir.jpa.interceptor;
 
 import static ca.uhn.fhir.interceptor.model.RequestPartitionId.defaultPartition;
+import static ca.uhn.fhir.interceptor.model.RequestPartitionId.fromPartitionId;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import ca.uhn.fhir.i18n.Msg;
 import ca.uhn.fhir.interceptor.api.Hook;
 import ca.uhn.fhir.interceptor.api.Interceptor;
@@ -14,7 +16,6 @@
 import ca.uhn.fhir.jpa.interceptor.ex.PartitionInterceptorReadAllPartitions;
 import ca.uhn.fhir.jpa.interceptor.ex.PartitionInterceptorReadPartitionsBasedOnScopes;
 import ca.uhn.fhir.jpa.model.entity.ResourceTable;
-import ca.uhn.fhir.jpa.partition.IPartitionLookupSvc;
 import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.api.server.IBundleProvider;
@@ -32,7 +33,6 @@
 import org.hl7.fhir.r4.model.StructureDefinition;
 import org.hl7.fhir.r4.model.Subscription;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mock.web.MockHttpServletRequest;
 
 import jakarta.servlet.http.HttpServletRequest;
@@ -46,7 +46,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.fail;
 
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
@@ -105,14 +104,14 @@ public void testCrossPartitionUpdate() {
 			assertEquals(2, writeIndex.get());
 		} finally {
 			myInterceptorRegistry.unregisterInterceptor(myPartitionInterceptor);
-			myInterceptorRegistry.unregisterInterceptorsIf(t->t instanceof MySubscriptionReadInterceptor);
-			myInterceptorRegistry.unregisterInterceptorsIf(t->t instanceof MySubscriptionWriteInterceptor);
+			myInterceptorRegistry.unregisterInterceptorsIf(MySubscriptionReadInterceptor.class::isInstance);
+			myInterceptorRegistry.unregisterInterceptorsIf(MySubscriptionWriteInterceptor.class::isInstance);
 		}
 	}
 
 	@Test
 	public void testCreateNonPartionableResourceWithPartitionDate() {
-		addNextTargetPartitionForCreate(defaultPartition(LocalDate.of(2021, 2, 22)));
+		addNextTargetPartitionForCreate(fromPartitionId(null, LocalDate.of(2021, 2, 22)));
 
 		StructureDefinition sd = new StructureDefinition();
 		sd.setUrl("http://foo");
@@ -129,7 +128,7 @@ public void testCreateNonPartionableResourceWithPartitionDate() {
 
 	@Test
 	public void testCreateNonPartionableResourceWithNullPartitionReturned() {
-		addNextTargetPartitionForCreate(RequestPartitionId.defaultPartition());
+		addNextTargetPartitionForCreate(RequestPartitionId.allPartitions());
 
 		StructureDefinition sd = new StructureDefinition();
 		sd.setUrl("http://foo");
@@ -177,7 +176,7 @@ public void testSearch_InterceptorForAllPartitions() {
 		IIdType patientId1 = createPatient(withCreatePartition(1), withActiveTrue());
 		IIdType patientId2 = createPatient(withCreatePartition(2), withActiveTrue());
 
-
+    	ourLog.info("Created patients: {}, {}, {}", patientIdNull, patientId1, patientId2);
 		PartitionInterceptorReadAllPartitions interceptor = new PartitionInterceptorReadAllPartitions();
 		myInterceptorRegistry.registerInterceptor(interceptor);
 		try {

hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/test/BaseJpaTest.java

@@ -489,8 +489,7 @@ public void afterPerformCleanup() {
 	@AfterEach
 	public void afterValidateNoTransaction() {
 		PlatformTransactionManager txManager = getTxManager();
-		if (txManager instanceof JpaTransactionManager) {
-			JpaTransactionManager hibernateTxManager = (JpaTransactionManager) txManager;
+		if (txManager instanceof JpaTransactionManager hibernateTxManager) {
 			SessionFactory sessionFactory = (SessionFactory) hibernateTxManager.getEntityManagerFactory();
 			AtomicBoolean isReadOnly = new AtomicBoolean();
 			Session currentSession;

pom.xml

@@ -2512,6 +2512,11 @@
 					<artifactId>maven-clean-plugin</artifactId>
 					<version>3.5.0</version>
 				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-deploy-plugin</artifactId>
+					<version>3.1.4</version>
+				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>