Merge pull request #7195 from hapifhir/mergeback-2-rel-8-4

Mergeback 2 for rel 8 4

Author: markiantorno

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/AttachmentUtil.java

@@ -27,10 +27,16 @@
 import ca.uhn.fhir.model.primitive.CodeDt;
 import org.apache.commons.lang3.Validate;
 import org.hl7.fhir.instance.model.api.IBase;
+import org.hl7.fhir.instance.model.api.IBaseExtension;
+import org.hl7.fhir.instance.model.api.IBaseHasExtensions;
 import org.hl7.fhir.instance.model.api.ICompositeType;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 public class AttachmentUtil {
 
@@ -93,6 +99,19 @@ public static void setSize(FhirContext theContext, ICompositeType theAttachment,
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	public static Optional<String> getFirstExtension(
+			IBaseHasExtensions theAttachment, String theExtension, Predicate<? super IBaseExtension<?, ?>> theFilter) {
+		return theAttachment.getExtension().stream()
+				.filter(theFilter)
+				.filter(t -> theExtension.equals(t.getUrl()))
+				.filter(t -> t.getValue() instanceof IPrimitiveType)
+				.map(t -> (IPrimitiveType<String>) t.getValue())
+				.map(t -> t.getValue())
+				.filter(t -> isNotBlank(t))
+				.findFirst();
+	}
+
 	/**
 	 * This is internal API- Use with caution as it may change
 	 */

hapi-fhir-base/src/main/java/ca/uhn/fhir/util/HapiExtensions.java

@@ -81,6 +81,12 @@ public class HapiExtensions {
 	public static final String EXT_EXTERNALIZED_BINARY_ID =
 			"http://hapifhir.io/fhir/StructureDefinition/externalized-binary-id";
 
+	/**
+	 * Extension ID for the SHA-256 hash of external binary content
+	 */
+	public static final String EXT_EXTERNALIZED_BINARY_HASH_SHA_256 =
+			"http://hapifhir.io/fhir/StructureDefinition/externalized-binary-hash-sha256";
+
 	/**
 	 * For subscription, deliver a bundle containing a search result instead of just a single resource
 	 */

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_4_0/7179-fix-requestdetailscloner.yaml

@@ -0,0 +1,6 @@
+---
+type: fix
+issue: 7179
+title: "A bug in the class used to copy and reuse the RequestDetails during operations
+ invoked through the HapiFhirRepository would cause an invalid cast exception downstream
+ when authentication interceptors were enabled for the operation.  This has been fixed."

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/8_4_0/7183-duplicate-uploads-of-binary-content-for-externalized-binary-storage.yaml

@@ -0,0 +1,7 @@
+---
+type: fix
+issue: 7183
+jira: SMILE-10474
+title: "Previously, updating the binary content of a DocumentReference or Binary resource multiple times with 
+the same data via the $binary-access-write operation or a resource update would cause a new resource version 
+to be created and the binary data to be re-uploaded to external binary storage. This has been fixed."

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

@@ -1,3 +1,3 @@
 ---
 release-date: "2025-08-18"
-codename: "TBD"
+codename: "Amplification"

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/migrate/tasks/HapiFhirJpaMigrationTasks.java

@@ -130,15 +130,6 @@ public HapiFhirJpaMigrationTasks(Set<String> theFlags) {
 		init780();
 		init820();
 		init840();
-		init860();
-	}
-
-	protected void init860() {
-		Builder version = forVersion(VersionEnum.V8_4_0);
-		{
-			version.onTable("HFJ_RESOURCE_MODIFIED").dropPrimaryKey("20250729.1");
-			version.onTable("HFJ_RESOURCE_MODIFIED").addPrimaryKey("20250729.2", "RES_ID", "RES_VER", "RESOURCE_TYPE");
-		}
 	}
 
 	protected void init840() {
@@ -177,6 +168,10 @@ protected void init840() {
 			Builder.BuilderWithTableName resLink = version.onTable("HFJ_RES_LINK");
 			resLink.addColumn("20250515.501", "SRC_RES_TYPE_ID").nullable().type(ColumnTypeEnum.SMALLINT);
 			resLink.addColumn("20250515.502", "TARGET_RES_TYPE_ID").nullable().type(ColumnTypeEnum.SMALLINT);
+
+			// Add RESOURCE_TYPE to the HFJ_RESOURCE_MODIFIED primary key
+			version.onTable("HFJ_RESOURCE_MODIFIED").dropPrimaryKey("20250729.1");
+			version.onTable("HFJ_RESOURCE_MODIFIED").addPrimaryKey("20250729.2", "RES_ID", "RES_VER", "RESOURCE_TYPE");
 		}
 	}
 

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/packages/PackageInstallerSvcR4Test.java

@@ -374,7 +374,7 @@ public void testInstallR4PackageWithExternalizedBinaries() throws Exception {
 		runInTransaction(() -> {
 			SearchParameterMap map = SearchParameterMap.newSynchronous();
 			map.add(StructureDefinition.SP_URL, new UriParam("http://hl7.org/fhir/uv/shorthand/CodeSystem/shorthand-code-system"));
-			IBundleProvider result = myCodeSystemDao.search(map);
+			IBundleProvider result = myCodeSystemDao.search(map, mySrd);
 			assertEquals(1, result.sizeOrThrowNpe());
 			IBaseResource resource = result.getResources(0, 1).get(0);
 			assertEquals("CodeSystem/shorthand-code-system/_history/1", resource.getIdElement().toString());