Merge rel 8 in

Author: tadgh

hapi-fhir-base/src/main/java/ca/uhn/fhir/interceptor/model/RequestPartitionId.java

@@ -220,14 +220,36 @@ public String getFirstPartitionNameOrNull() {
 
 	/**
 	 * Returns true if this request partition contains only one partition ID and it is the DEFAULT partition ID (null)
+	 *
+	 * @deprecated use {@link #isDefaultPartition(Integer)} or {@link IRequestPartitionHelperSvc.isDefaultPartition}
+	 * instead
+	 * .
 	 */
+	@Deprecated(since = "2025.02.R01")
 	public boolean isDefaultPartition() {
+		return isDefaultPartition(null);
+	}
+
+	/**
+	 * Test whether this request partition is for a given default partition ID.
+	 *
+	 * This method can be directly invoked on a requestPartition object providing that <code>theDefaultPartitionId</code>
+	 * is known or through {@link IRequestPartitionHelperSvc.isDefaultPartition} where the implementer of the interface
+	 * will provide the default partition id (see {@link IRequestPartitionHelperSvc.getDefaultPartition}).
+	 *
+	 * @param theDefaultPartitionId is the ID that was given to the default partition.  The default partition ID can be
+	 *                              NULL as per default or specifically assigned another value.
+	 *                              See PartitionSettings#setDefaultPartitionId.
+	 * @return <code>true</code> if the request partition contains only one partition ID and the partition ID is
+	 *         <code>theDefaultPartitionId</code>.
+	 */
+	public boolean isDefaultPartition(@Nullable Integer theDefaultPartitionId) {
 		if (isAllPartitions()) {
 			return false;
 		}
 		return hasPartitionIds()
 				&& getPartitionIds().size() == 1
-				&& getPartitionIds().get(0) == null;
+				&& Objects.equals(getPartitionIds().get(0), theDefaultPartitionId);
 	}
 
 	public boolean hasPartitionId(Integer thePartitionId) {
@@ -243,8 +265,34 @@ public boolean hasPartitionNames() {
 		return myPartitionNames != null;
 	}
 
+	/**
+	 * Verifies that one of the requested partition is the default partition which is assumed to have a default value of
+	 * null.
+	 *
+	 * @return true if one of the requested partition is the default partition(null).
+	 *
+	 * @deprecated use {@link #hasDefaultPartitionId(Integer)} or {@link IRequestPartitionHelperSvc.hasDefaultPartitionId}
+	 * instead
+	 */
+	@Deprecated(since = "2025.02.R01")
 	public boolean hasDefaultPartitionId() {
-		return getPartitionIds().contains(null);
+		return hasDefaultPartitionId(null);
+	}
+
+	/**
+	 * Test whether this request partition has the default partition as one of its targeted partitions.
+	 *
+	 * This method can be directly invoked on a requestPartition object providing that <code>theDefaultPartitionId</code>
+	 * is known or through {@link IRequestPartitionHelperSvc.hasDefaultPartitionId} where the implementer of the interface
+	 * will provide the default partition id (see {@link IRequestPartitionHelperSvc.getDefaultPartition}).
+	 *
+	 * @param theDefaultPartitionId is the ID that was given to the default partition.  The default partition ID can be
+	 *                              NULL as per default or specifically assigned another value.
+	 *                              See PartitionSettings#setDefaultPartitionId.
+	 * @return <code>true</code> if the request partition has the default partition as one of the targeted partition.
+	 */
+	public boolean hasDefaultPartitionId(@Nullable Integer theDefaultPartitionId) {
+		return getPartitionIds().contains(theDefaultPartitionId);
 	}
 
 	public List<Integer> getPartitionIdsWithoutDefault() {
@@ -285,11 +333,13 @@ public static RequestPartitionId allPartitions() {
 	}
 
 	@Nonnull
+	//	TODO GGG: This is a now-bad usage and we should remove it. we cannot assume null means default.
 	public static RequestPartitionId defaultPartition() {
 		return fromPartitionIds(Collections.singletonList(null));
 	}
 
 	@Nonnull
+	//	TODO GGG: This is a now-bad usage and we should remove it. we cannot assume null means default.
 	public static RequestPartitionId defaultPartition(@Nullable LocalDate thePartitionDate) {
 		return fromPartitionIds(Collections.singletonList(null), thePartitionDate);
 	}
@@ -360,14 +410,6 @@ public static RequestPartitionId forPartitionIdsAndNames(
 		return new RequestPartitionId(thePartitionNames, thePartitionIds, thePartitionDate);
 	}
 
-	public static boolean isDefaultPartition(@Nullable RequestPartitionId thePartitionId) {
-		if (thePartitionId == null) {
-			return false;
-		}
-
-		return thePartitionId.isDefaultPartition();
-	}
-
 	/**
 	 * Create a string representation suitable for use as a cache key. Null aware.
 	 * <p>

hapi-fhir-base/src/main/java/ca/uhn/fhir/system/HapiSystemProperties.java

@@ -37,6 +37,8 @@ public final class HapiSystemProperties {
 	static final long DEFAULT_VALIDATION_RESOURCE_CACHE_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(10);
 	static final String PREVENT_INVALIDATING_CONDITIONAL_MATCH_CRITERIA =
 			"hapi.storage.prevent_invalidating_conditional_match_criteria";
+	static final String DISABLE_DATABASE_PARTITION_MODE_SCHEMA_CHECK =
+			"hapi.storage.disable_database_partition_mode_schema_check";
 
 	private HapiSystemProperties() {}
 
@@ -164,4 +166,9 @@ public static boolean isPreventInvalidatingConditionalMatchCriteria() {
 		return Boolean.parseBoolean(System.getProperty(
 				HapiSystemProperties.PREVENT_INVALIDATING_CONDITIONAL_MATCH_CRITERIA, Boolean.FALSE.toString()));
 	}
+
+	public static boolean isDisableDatabasePartitionModeSchemaCheck() {
+		return Boolean.parseBoolean(System.getProperty(
+				HapiSystemProperties.DISABLE_DATABASE_PARTITION_MODE_SCHEMA_CHECK, Boolean.FALSE.toString()));
+	}
 }

hapi-fhir-base/src/test/java/ca/uhn/fhir/interceptor/model/RequestPartitionIdTest.java

@@ -17,6 +17,8 @@
 public class RequestPartitionIdTest {
 	private static final Logger ourLog = LoggerFactory.getLogger(RequestPartitionIdTest.class);
 
+	private static final Integer ourDefaultPartitionId = 0;
+	
 	@Test
 	public void testHashCode() {
 		assertEquals(31860737, RequestPartitionId.allPartitions().hashCode());
@@ -41,6 +43,29 @@ public void testPartition() {
 		assertFalse(RequestPartitionId.forPartitionIdsAndNames(null, Lists.newArrayList(1, 2), null).isDefaultPartition());
 	}
 
+	@Test
+	public void testIsDefaultPartition_withDefaultPartitionAsParameter() {
+
+		assertThat(RequestPartitionId.defaultPartition().isDefaultPartition(null)).isTrue();
+		assertThat(RequestPartitionId.fromPartitionIds(ourDefaultPartitionId).isDefaultPartition(ourDefaultPartitionId)).isTrue();
+
+		assertThat(RequestPartitionId.defaultPartition().isDefaultPartition(ourDefaultPartitionId)).isFalse();
+		assertThat(RequestPartitionId.allPartitions().isDefaultPartition(ourDefaultPartitionId)).isFalse();
+		assertThat(RequestPartitionId.fromPartitionIds(ourDefaultPartitionId, 2).isDefaultPartition(ourDefaultPartitionId)).isFalse();
+	}
+
+	@Test
+	public void testHasDefaultPartition_withDefaultPartitionAsParameter() {
+
+		assertThat(RequestPartitionId.defaultPartition().hasDefaultPartitionId(null)).isTrue();
+		assertThat(RequestPartitionId.fromPartitionIds(ourDefaultPartitionId).hasDefaultPartitionId(ourDefaultPartitionId)).isTrue();
+		assertThat(RequestPartitionId.fromPartitionIds(ourDefaultPartitionId, null).hasDefaultPartitionId(null)).isTrue();
+		assertThat(RequestPartitionId.fromPartitionIds(ourDefaultPartitionId, null).hasDefaultPartitionId(ourDefaultPartitionId)).isTrue();
+
+		assertThat(RequestPartitionId.fromPartitionIds(ourDefaultPartitionId).hasDefaultPartitionId(null)).isFalse();
+		assertThat(RequestPartitionId.defaultPartition().hasDefaultPartitionId(ourDefaultPartitionId)).isFalse();
+	}
+
 	@Test
 	public void testMergeIds() {
 		RequestPartitionId input0 = RequestPartitionId.fromPartitionIds(1, 2, 3);

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6673-search-with-fulltextsearch-enabled-should-not-return-nulls.yaml

@@ -0,0 +1,8 @@
+---
+type: fix
+issue: 6673
+title: "When attempting to search for resources while both `AdvancedHSearchIndexing`
+        and `StoreResourcesInHibernateSearchIndex` are enabled, returned lists
+        could sometimes contain null entries.
+        This has been fixed.
+"

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6686-failure-creating-cross-partition-subscription.yaml

@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 6686
+title: "Previously, attempting to create a cross-partition subscription would fail if the default partition ID was
+assigned a value different than the default value(null). This issue is fixed."
+

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6689-replace-references-operation-skip-versioned-refs.yaml

@@ -0,0 +1,4 @@
+---
+type: change
+issue: 6689
+title: "$hapi.fhir.replace-references operation has been changed to not replace versioned references"

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6692-fix-security-label-filtering-with-not-operator.yaml

@@ -0,0 +1,7 @@
+---
+type: fix
+issue: 6692
+jira: SMILE-9736
+title: "Previously, when the in-memory matcher was used to match resources with a `_security` label filter 
+and a `:not` operator (i.e. `_security:not=http://terminology.hl7.org/CodeSystem/v3-ActCode|NODSCLCD`), 
+resources with no security labels at all were not matched. This has been fixed."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6697-missing-search-params-with-hsearch-enabled.yaml

@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 6697
+title: "Previously, operation $apply-codesystem-delta-add issued with Hibernate Search enabled and default search params option turned off resulted in an invalid sort specification error. This has been fixed."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6700-cross-partition-checker.yaml

@@ -0,0 +1,4 @@
+---
+type: fix
+issue: 6700
+title: "Previously if a non-null default partition ID was selected when partitioning is enabled, the subscription matcher would fail to find cross-partition subscriptions, causing subscriptions to appear to not be working. This has been corrected."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/version.yaml

@@ -1,3 +1,3 @@
 ---
 release-date: "2025-02-17"
-codename: "TBD"
+codename: "Transfiguration"