added resourceId for deferredBinaryTarget to avoid adding binary appl…

…ications multiple times in one transaction

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/6_10_0/5437-entityexistsexception-in-transaction-with-two-binary-resources.yaml

@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 5437
+jira: SMILE-7588
+title: "Previously, when adding several binary resources in one bundle in a transaction, the EntityExistsException error appeared. This is now fixed."

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/BinaryStorageInterceptorR4Test.java

@@ -558,4 +558,40 @@
  content.getAttachment().setData(theData);
  }
 
+ @Test
+ public void testCreateBundleWithMultipleBinaryAttachments_createdSuccessfully() {
+ Binary binary = new Binary();
+ binary.setContentType("application/octet-stream");
+ binary.setData(SOME_BYTES);
+
+ DocumentReference docRef = new DocumentReference();
+ addDocumentAttachmentData(docRef, SOME_BYTES_2);
+
+ // Prepare the bundle
+ Bundle bundle = new Bundle();
+ bundle.setType(Bundle.BundleType.TRANSACTION);
+ addBundleEntry(bundle, binary, "Binary");
+ addBundleEntry(bundle, docRef, "DocumentReference");
+
+ // Execute transaction
+ Bundle output = myClient.transaction().withBundle(bundle).execute();
+ ourLog.debug(myFhirContext.newXmlParser().setPrettyPrint(true).encodeResourceToString(output));
+
+ // Verify bundle response
+ assertEquals(2, output.getEntry().size());
+ output.getEntry().forEach(entry -> assertEquals("201 Created", entry.getResponse().getStatus()));
+
+ // Verify Binary and attachment
+ IIdType binaryId = new IdType(output.getEntry().get(0).getResponse().getLocation());
+ Binary actualBinary = myBinaryDao.read(binaryId, mySrd);
+ assertEquals(binary.getContentType(), actualBinary.getContentType());
+ assertArrayEquals(SOME_BYTES, actualBinary.getData());
+
+ // Verify DocumentReference and attachments
+ IIdType docRefId = new IdType(output.getEntry().get(1).getResponse().getLocation());
+ DocumentReference actualDocRef = myDocumentReferenceDao.read(docRefId, mySrd);
+ assertEquals("application/octet-stream", actualDocRef.getContentFirstRep().getAttachment().getContentType());
+ assertArrayEquals(SOME_BYTES_2, actualDocRef.getContentFirstRep().getAttachment().getData());
+ }
+
 }

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/binary/interceptor/BinaryStorageInterceptor.java

@@ -253,7 +253,7 @@ private void extractLargeBinaries(
  List<DeferredBinaryTarget> deferredBinaryTargets =
  getOrCreateDeferredBinaryStorageList(theResource);
  DeferredBinaryTarget newDeferredBinaryTarget =
- new DeferredBinaryTarget(newBlobId, nextTarget, data);
+ new DeferredBinaryTarget(newBlobId, resourceId.getValue(), nextTarget, data);
  deferredBinaryTargets.add(newDeferredBinaryTarget);
  newDeferredBinaryTarget.setBlobIdPrefixHookApplied(true);
  } else {
@@ -312,12 +312,14 @@ public void storeLargeBinariesBeforeCreatePersistence(
  if (deferredBinaryTargetList != null) {
  IIdType resourceId = theResource.getIdElement();
  for (DeferredBinaryTarget next : (List<DeferredBinaryTarget>) deferredBinaryTargetList) {
- String blobId = next.getBlobId();
- IBinaryTarget target = next.getBinaryTarget();
- InputStream dataStream = next.getDataStream();
- String contentType = target.getContentType();
- RequestDetails requestDetails = initRequestDetails(next);
- myBinaryStorageSvc.storeBlob(resourceId, blobId, contentType, dataStream, requestDetails);
+ if (resourceId.getValueAsString().equals(next.getResourceId())) {
+ String blobId = next.getBlobId();
+ IBinaryTarget target = next.getBinaryTarget();
+ InputStream dataStream = next.getDataStream();
+ String contentType = target.getContentType();
+ RequestDetails requestDetails = initRequestDetails(next);
+ myBinaryStorageSvc.storeBlob(resourceId, blobId, contentType, dataStream, requestDetails);
+ }
  }
  }
  }
@@ -422,12 +424,15 @@ public boolean isAllowAutoInflateBinaries() {
 
  private static class DeferredBinaryTarget {
  private final String myBlobId;
+ private final String myResourceId;
  private final IBinaryTarget myBinaryTarget;
  private final InputStream myDataStream;
  private boolean myBlobIdPrefixHookApplied;
 
- private DeferredBinaryTarget(String theBlobId, IBinaryTarget theBinaryTarget, byte[] theData) {
+ private DeferredBinaryTarget(
+ String theBlobId, String theResourceId, IBinaryTarget theBinaryTarget, byte[] theData) {
  myBlobId = theBlobId;
+ myResourceId = theResourceId;
  myBinaryTarget = theBinaryTarget;
  myDataStream = new ByteArrayInputStream(theData);
  }
@@ -436,6 +441,10 @@ String getBlobId() {
  return myBlobId;
  }
 
+ String getResourceId() {
+ return myResourceId;
+ }
+
  IBinaryTarget getBinaryTarget() {
  return myBinaryTarget;
  }