Merge branch 'rel_8_0_mb'

Author: tadgh

hapi-fhir-base/src/main/java/ca/uhn/fhir/context/support/IValidationSupport.java

@@ -774,6 +774,7 @@ public String getPropertyName() {
 	// Some of the types in the spec are not yet implemented as well.
 	// @see https://github.com/hapifhir/hapi-fhir/issues/5700
 	String TYPE_STRING = "string";
+	String TYPE_BOOLEAN = "boolean";
 	String TYPE_CODING = "Coding";
 	String TYPE_GROUP = "group";
 
@@ -800,6 +801,29 @@ public String getType() {
 		}
 	}
 
+	class BooleanConceptProperty extends BaseConceptProperty {
+		private final boolean myValue;
+
+		/**
+		 * Constructor
+		 *
+		 * @param theName The name
+		 */
+		public BooleanConceptProperty(String theName, boolean theValue) {
+			super(theName);
+			myValue = theValue;
+		}
+
+		public boolean getValue() {
+			return myValue;
+		}
+
+		@Override
+		public String getType() {
+			return TYPE_BOOLEAN;
+		}
+	}
+
 	class CodingConceptProperty extends BaseConceptProperty {
 		private final String myCode;
 		private final String myCodeSystem;
@@ -1073,7 +1097,7 @@ class ValueSetExpansionOutcome {
 		private final IBaseResource myValueSet;
 		private final String myError;
 
-		private boolean myErrorIsFromServer;
+		private final boolean myErrorIsFromServer;
 
 		public ValueSetExpansionOutcome(String theError, boolean theErrorIsFromServer) {
 			myValueSet = null;
@@ -1199,7 +1223,7 @@ public LookupCodeResult setFound(boolean theFound) {
 		}
 
 		public void throwNotFoundIfAppropriate() {
-			if (isFound() == false) {
+			if (!isFound()) {
 				throw new ResourceNotFoundException(Msg.code(1738) + "Unable to find code[" + getSearchedForCode()
 						+ "] in system[" + getSearchedForSystem() + "]");
 			}
@@ -1270,6 +1294,10 @@ private void populateProperty(
 					StringConceptProperty stringConceptProperty = (StringConceptProperty) theConceptProperty;
 					ParametersUtil.addPartString(theContext, theProperty, "value", stringConceptProperty.getValue());
 					break;
+				case TYPE_BOOLEAN:
+					BooleanConceptProperty booleanConceptProperty = (BooleanConceptProperty) theConceptProperty;
+					ParametersUtil.addPartBoolean(theContext, theProperty, "value", booleanConceptProperty.getValue());
+					break;
 				case TYPE_CODING:
 					CodingConceptProperty codingConceptProperty = (CodingConceptProperty) theConceptProperty;
 					ParametersUtil.addPartCoding(
@@ -1321,7 +1349,7 @@ class TranslateCodeRequest {
 		private final String myTargetValueSetUrl;
 		private final IIdType myResourceId;
 		private final boolean myReverse;
-		private List<IBaseCoding> myCodings;
+		private final List<IBaseCoding> myCodings;
 
 		public TranslateCodeRequest(List<IBaseCoding> theCodings, String theTargetSystemUrl) {
 			myCodings = theCodings;

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/parser/LenientErrorHandler.java

@@ -87,9 +87,9 @@ public void incorrectJsonType(
 			ScalarType theFoundScalarType) {
 		if (myLogErrors) {
 			if (ourLog.isWarnEnabled()) {
-				String message = describeLocation(theLocation) +
-						createIncorrectJsonTypeMessage(
-							theElementName, theExpected, theExpectedScalarType, theFound, theFoundScalarType);
+				String message = describeLocation(theLocation)
+						+ createIncorrectJsonTypeMessage(
+								theElementName, theExpected, theExpectedScalarType, theFound, theFoundScalarType);
 				ourLog.warn(message);
 			}
 		}

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/main/resources/ca/uhn/fhir/i18n/hapi-messages.properties

@@ -151,6 +151,7 @@ ca.uhn.fhir.jpa.dao.BaseTransactionProcessor.fhirPatchShouldNotUseBinaryResource
 ca.uhn.fhir.jpa.patch.FhirPatch.invalidInsertIndex=Invalid insert index {0} for path {1} - Only have {2} existing entries
 ca.uhn.fhir.jpa.patch.FhirPatch.invalidMoveSourceIndex=Invalid move source index {0} for path {1} - Only have {2} existing entries
 ca.uhn.fhir.jpa.patch.FhirPatch.invalidMoveDestinationIndex=Invalid move destination index {0} for path {1} - Only have {2} existing entries
+ca.uhn.fhir.jpa.patch.FhirPatch.noMatchingElementForPath=No element matches the specified path: {0}
 ca.uhn.fhir.jpa.searchparam.extractor.BaseSearchParamExtractor.externalReferenceNotAllowed=Resource contains external reference to URL "{0}" but this server is not configured to allow external references
 ca.uhn.fhir.jpa.searchparam.extractor.BaseSearchParamExtractor.failedToExtractPaths=Failed to extract values from resource using FHIRPath "{0}": {1}
 ca.uhn.fhir.jpa.search.SearchCoordinatorSvcImpl.invalidInclude=Invalid {0} parameter value: "{1}". {2}

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/7_8_0/upgrade.md

@@ -0,0 +1 @@
+This was an interim release which was never made public, as it was decided that this release would have a major bump, to 8.0.0

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/version.yaml

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

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6599-fix-NPE-in-storage-module.yaml

@@ -0,0 +1,7 @@
+---
+type: fix
+issue: 6599
+jira: SMILE-9237
+title: "Previously, attempting to restart the Storage module would result in a `NullPointerException` when partition 
+selection mode was set to `PATIENT_ID`, mass ingestion was enabled, and at least one Search Parameter was disabled. This 
+has now been fixed."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_0_0/6615-fixing-validation-on-sp.yaml

@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 6615
+jira: SMILE-9569
+title: "SearchParameter validation was not being skipped on updates, even if requested. This has been fixed"