copyBlob: use "destination" instead of "target"

Author: bcully

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

@@ -326,8 +326,8 @@ public void writeBlobAtomic(OperationPurpose purpose, String blobName, BytesRefe
      * See <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_CopyObject.html">CopyObject</a>.
      * @param purpose             The purpose of the operation
      * @param sourceBlobName      The name of the blob to copy from
-     * @param targetBlobContainer The blob container to copy the blob into
-     * @param targetBlobName      The name of the blob to copy to
+     * @param destinationBlobContainer The blob container to copy the blob into
+     * @param destinationBlobName      The name of the blob to copy to
      * @param failIfAlreadyExists Whether to throw a FileAlreadyExistsException if the target blob already exists
      *                            On S3, if true, throws UnsupportedOperationException because we don't know how
      *                            to do this atomically.
@@ -337,27 +337,27 @@ public void writeBlobAtomic(OperationPurpose purpose, String blobName, BytesRefe
     public void copyBlob(
         OperationPurpose purpose,
         String sourceBlobName,
-        BlobContainer targetBlobContainer,
-        String targetBlobName,
+        BlobContainer destinationBlobContainer,
+        String destinationBlobName,
         boolean failIfAlreadyExists
     ) throws IOException {
         assert BlobContainer.assertPurposeConsistency(purpose, sourceBlobName);
-        assert BlobContainer.assertPurposeConsistency(purpose, targetBlobName);
-        if (targetBlobContainer instanceof S3BlobContainer == false) {
+        assert BlobContainer.assertPurposeConsistency(purpose, destinationBlobName);
+        if (destinationBlobContainer instanceof S3BlobContainer == false) {
             throw new IllegalArgumentException("target blob container must be a S3BlobContainer");
         }
         if (failIfAlreadyExists) {
             throw new UnsupportedOperationException("S3 blob container does not support failIfAlreadyExists");
         }
 
-        final var s3TargetBlobContainer = (S3BlobContainer) targetBlobContainer;
+        final var s3TargetBlobContainer = (S3BlobContainer) destinationBlobContainer;
 
         // metadata is inherited from source, but not canned ACL or storage class
         final CopyObjectRequest copyRequest = new CopyObjectRequest(
             blobStore.bucket(),
             buildKey(sourceBlobName),
             s3TargetBlobContainer.blobStore.bucket(),
-            s3TargetBlobContainer.buildKey(targetBlobName)
+            s3TargetBlobContainer.buildKey(destinationBlobName)
         ).withCannedAccessControlList(blobStore.getCannedACL()).withStorageClass(blobStore.getStorageClass());
 
         S3BlobStore.configureRequestForMetrics(copyRequest, blobStore, Operation.COPY_OBJECT, purpose);

server/src/main/java/org/elasticsearch/common/blobstore/BlobContainer.java

@@ -185,8 +185,8 @@ default void writeBlobAtomic(OperationPurpose purpose, String blobName, BytesRef
      *
      * @param purpose             The purpose of the operation
      * @param sourceBlobName      The name of the blob to copy from
-     * @param targetBlobContainer The blob container to copy the blob into
-     * @param targetBlobName      The name of the blob to copy to
+     * @param destinationBlobContainer The blob container to copy the blob into
+     * @param destinationBlobName      The name of the blob to copy to
      * @param failIfAlreadyExists Whether to throw a FileAlreadyExistsException if the target blob already exists
      * @throws NoSuchFileException If the source blob does not exist
      * @throws FileAlreadyExistsException If failIfAlreadyExists is true and the target blob already exists
@@ -195,8 +195,8 @@ default void writeBlobAtomic(OperationPurpose purpose, String blobName, BytesRef
     default void copyBlob(
         OperationPurpose purpose,
         String sourceBlobName,
-        BlobContainer targetBlobContainer,
-        String targetBlobName,
+        BlobContainer destinationBlobContainer,
+        String destinationBlobName,
         boolean failIfAlreadyExists
     ) throws IOException {
         throw new UnsupportedOperationException("this blob container does not support copy");

server/src/main/java/org/elasticsearch/common/blobstore/fs/FsBlobContainer.java

@@ -353,20 +353,20 @@ public void writeBlobAtomic(OperationPurpose purpose, final String blobName, Byt
     public void copyBlob(
         OperationPurpose purpose,
         String sourceBlobName,
-        BlobContainer targetBlobContainer,
-        String targetBlobName,
+        BlobContainer destinationBlobContainer,
+        String destinationBlobName,
         boolean failIfAlreadyExists
     ) throws IOException {
-        if (targetBlobContainer instanceof FsBlobContainer == false) {
+        if (destinationBlobContainer instanceof FsBlobContainer == false) {
             throw new IllegalArgumentException("targetBlobContainer must be a FsBlobContainer");
         }
-        final FsBlobContainer targetContainer = (FsBlobContainer) targetBlobContainer;
+        final FsBlobContainer targetContainer = (FsBlobContainer) destinationBlobContainer;
         final Path sourceBlobPath = path.resolve(sourceBlobName);
-        final String tempBlob = tempBlobName(targetBlobName);
+        final String tempBlob = tempBlobName(destinationBlobName);
         final Path tempBlobPath = targetContainer.path.resolve(tempBlob);
         Files.copy(sourceBlobPath, tempBlobPath, StandardCopyOption.REPLACE_EXISTING);
         try {
-            targetContainer.moveBlobAtomic(purpose, tempBlob, targetBlobName, failIfAlreadyExists);
+            targetContainer.moveBlobAtomic(purpose, tempBlob, destinationBlobName, failIfAlreadyExists);
         } catch (IOException ex) {
             try {
                 targetContainer.deleteBlobsIgnoringIfNotExists(purpose, Iterators.single(tempBlob));