Inline failIfAlreadyExists in executeMultipartCopy

Author: kvanerum

modules/repository-s3/qa/third-party/src/test/java/org/elasticsearch/repositories/s3/S3RepositoryThirdPartyTests.java

@@ -277,8 +277,7 @@ public void testMultipartCopy() {
                 (S3BlobContainer) sourceBlobContainer,
                 sourceBlobName,
                 destinationBlobName,
-                blobBytes.length(),
-                randomBoolean()
+                blobBytes.length()
             );
 
             return destinationBlobContainer.readBlob(randomPurpose(), destinationBlobName).readAllBytes();

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java

@@ -363,7 +363,7 @@ public void copyBlob(
 
         try {
             if (blobSize > getMaxCopySizeBeforeMultipart()) {
-                executeMultipartCopy(purpose, s3SourceBlobContainer, sourceBlobName, blobName, blobSize, false);
+                executeMultipartCopy(purpose, s3SourceBlobContainer, sourceBlobName, blobName, blobSize);
             } else {
                 // metadata is inherited from source, but not canned ACL or storage class
                 final var blobKey = buildKey(blobName);
@@ -708,8 +708,7 @@ void executeMultipartCopy(
         final S3BlobContainer sourceContainer,
         final String sourceBlobName,
         final String destinationBlobName,
-        final long blobSize,
-        final boolean failIfAlreadyExists
+        final long blobSize
     ) throws IOException {
         final long copyPartSize = MAX_FILE_SIZE.getBytes();
         final var destinationKey = buildKey(destinationBlobName);
@@ -738,7 +737,7 @@ void executeMultipartCopy(
                     return CompletedPart.builder().partNumber(partNum).eTag(uploadPartCopyResponse.copyPartResult().eTag()).build();
                 }
             }),
-            failIfAlreadyExists
+            false
         );
     }
 

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobStoreContainerTests.java

@@ -301,7 +301,7 @@ void testExecuteMultipart(boolean doCopy) throws IOException {
         final S3BlobContainer sourceContainer = new S3BlobContainer(sourceBlobPath, sourceBlobStore);
 
         if (doCopy) {
-            blobContainer.executeMultipartCopy(randomPurpose(), sourceContainer, sourceBlobName, blobName, blobSize, false);
+            blobContainer.executeMultipartCopy(randomPurpose(), sourceContainer, sourceBlobName, blobName, blobSize);
         } else {
             blobContainer.executeMultipartUpload(randomPurpose(), blobStore, blobName, inputStream, blobSize, failIfAlreadyExists);
         }