Trying to fixing tests

Author: madduci

hapi-fhir-jpaserver-subscription/src/main/java/ca/uhn/fhir/jpa/topic/SubscriptionTopicPayloadBuilder.java

@@ -241,7 +241,7 @@ private void addResources(
 			BundleBuilder theBundleBuilder) {
 
 		org.hl7.fhir.r5.model.Subscription.SubscriptionPayloadContent content =
-				ObjectUtils.defaultIfNull(theCanonicalSubscription.getContent(), FULLRESOURCE);
+				ObjectUtils.getIfNull(theCanonicalSubscription.getContent(), FULLRESOURCE);
 
 		switch (content) {
 			case IDONLY:

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

@@ -300,7 +300,7 @@ private List<? extends BaseResourceIndexedSearchParam> getAndValidateIndexedSear
 		JpaRepository<? extends BaseResourceIndexedSearchParam, Long> theIndexedSpRepository,
 		IIdType theId, String theSearchParam, String theResourceType) {
 		long hashIdentity = BaseResourceIndexedSearchParam.calculateHashIdentity(new PartitionSettings(),
-			RequestPartitionId.defaultPartition(), theResourceType, theSearchParam);
+			RequestPartitionId.allPartitions(), theResourceType, theSearchParam);
 
 		await().atMost(30, TimeUnit.SECONDS).untilAsserted(() -> {
 			IndexedSearchParamIdentity spIdentity = runInTransaction(() ->

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

@@ -47,9 +47,9 @@ public void before() throws Exception {
 
 	@Override
 	public void after() {
-		super.after();
 		myTransactionService.setTransactionPropagationWhenChangingPartitions(HapiTransactionService.DEFAULT_TRANSACTION_PROPAGATION_WHEN_CHANGING_PARTITIONS);
-		myInterceptorRegistry.unregisterInterceptorsIf(t -> t instanceof MyPartitionSelectorInterceptor);
+		myInterceptorRegistry.unregisterInterceptorsIf(MyPartitionSelectorInterceptor.class::isInstance);
+		super.after();
 	}
 
 	/**
@@ -89,6 +89,7 @@ public void testSinglePartitionCreate(String theBundleType, int theExpectedCommi
 		IdType id = new IdType(output.getEntry().get(0).getResponse().getLocation());
 		Patient actualPatient = myPatientDao.read(id, mySrd);
 		RequestPartitionId actualPartitionId = (RequestPartitionId) actualPatient.getUserData(Constants.RESOURCE_PARTITION_ID);
+		assertThat(actualPartitionId).isNotNull();
 		assertThat(actualPartitionId.getPartitionIds()).containsExactly(myPartitionId);
 	}
 

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/delete/ThreadSafeResourceDeleterSvcTest.java

@@ -16,7 +16,6 @@
 import ca.uhn.test.util.LogbackTestExtension;
 import ca.uhn.test.util.LogbackTestExtensionAssert;
 import jakarta.annotation.Nullable;
-import org.hibernate.engine.jdbc.spi.SqlExceptionHelper;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IIdType;
 import org.hl7.fhir.r4.model.HumanName;
@@ -42,7 +41,7 @@ public class ThreadSafeResourceDeleterSvcTest extends BaseJpaR4Test {
 	private ThreadSafeResourceDeleterSvc myThreadSafeResourceDeleterSvc;
 
 	@RegisterExtension
-	final LogbackTestExtension mySqlExceptionHelperLog = new LogbackTestExtension(SqlExceptionHelper.class);
+	final LogbackTestExtension mySqlExceptionHelperLog = new LogbackTestExtension("org.hibernate.orm.jdbc.error");
 
 	@Autowired
 	IInterceptorBroadcaster myIdInterceptorBroadcaster;
@@ -57,7 +56,7 @@ public class ThreadSafeResourceDeleterSvcTest extends BaseJpaR4Test {
 
 
 	@BeforeEach
-	void beforeEach() {
+	void beforeEach() throws Exception {
 		myThreadSafeResourceDeleterSvc = new ThreadSafeResourceDeleterSvc(myDaoRegistry, myIdInterceptorBroadcaster, myHapiTransactionService);
 	}
 
@@ -176,7 +175,7 @@ void delete_update_retryTest() throws ExecutionException, InterruptedException {
 		// Unpause and succeed in deleting the second patient because we will get the correct version now
 		// Red Green: If you delete the updatePatient above, it will timeout here
 		phaser.arriveAndAwaitSharedEndOf(UpdateSteps.DEL_BEFORE_SECOND_PATIENT_DELETE_SUCCEED);
-		LogbackTestExtensionAssert.assertThat(mySqlExceptionHelperLog).hasErrorMessage("Unique index or primary key violation");
+		LogbackTestExtensionAssert.assertThat(mySqlExceptionHelperLog).hasWarnMessage("Unique index or primary key violation");
 
 		phaser.assertInPhase(UpdateSteps.BOTH_COMPLETE);
 

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/dao/BaseTransactionProcessor.java

@@ -258,12 +258,7 @@ public <BUNDLE extends IBaseBundle> BUNDLE transaction(
 		}
 
 		List<IBase> entries = myVersionAdapter.getEntries(response);
-		for (int i = 0; i < entries.size(); i++) {
-			if (ElementUtil.isEmpty(entries.get(i))) {
-				entries.remove(i);
-				i--;
-			}
-		}
+		entries.removeIf(ElementUtil::isEmpty);
 
 		return (BUNDLE) response;
 	}
@@ -344,7 +339,7 @@ private void handleTransactionCreateOrUpdateOutcome(
 			theRes = theIdToPersistedOutcome.get(newId).getResource();
 		}
 
-		if (theOutcome.getCreated()) {
+		if (Boolean.TRUE.equals(theOutcome.getCreated())) {
 			myVersionAdapter.setResponseStatus(theNewEntry, toStatusString(Constants.STATUS_HTTP_201_CREATED));
 		} else {
 			myVersionAdapter.setResponseStatus(theNewEntry, toStatusString(Constants.STATUS_HTTP_200_OK));
@@ -766,9 +761,7 @@ private void setRequestPartitionHeaderIfEntryHasTheExtension(IBase theReqEntry,
 		Optional<IBaseExtension<?, ?>> partitionIdsExtensionOptional =
 				myVersionAdapter.getEntryRequestExtensionByUrl(theReqEntry, EXTENSION_TRANSACTION_ENTRY_PARTITION_IDS);
 		if (partitionIdsExtensionOptional.isPresent()
-				&& partitionIdsExtensionOptional.get().getValue() instanceof IPrimitiveType<?>) {
-			IPrimitiveType<?> valueAsPrimitiveType =
-					(IPrimitiveType<?>) partitionIdsExtensionOptional.get().getValue();
+				&& partitionIdsExtensionOptional.get().getValue() instanceof IPrimitiveType<?> valueAsPrimitiveType) {
 			String value = valueAsPrimitiveType.getValueAsString();
 			theRequestDetails.setHeaders(Constants.HEADER_X_REQUEST_PARTITION_IDS, List.of(value));
 		}

hapi-fhir-test-utilities/src/main/java/ca/uhn/test/util/LogbackTestExtension.java

@@ -140,7 +140,7 @@ public void setLoggerLevel(Level theLevel) {
 	/**
 	 * @deprecated Use {@link #setLoggerLevel(Level)} instead
 	 */
-	@Deprecated
+	@Deprecated(forRemoval = true)
 	public void setUp(Level theLevel) {
 		setLoggerLevel(theLevel);
 	}
@@ -149,7 +149,7 @@ public void setUp(Level theLevel) {
 	 * @deprecated This class should be registered as a junit5 extension, and will be set
 	 * up automatically.
 	 */
-	@Deprecated
+	@Deprecated(forRemoval = true)
 	public void setUp() {
 		// nothing
 	}