resolve comments

Signed-off-by: Sandeep Kumawat <[email protected]>
skumawat2025 · Apr 11, 2024 · d454a2c · d454a2c
1 parent 349c1c0
commit d454a2c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 20 deletions.
diff --git a/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java b/plugins/repository-s3/src/main/java/org/opensearch/repositories/s3/S3BlobContainer.java
@@ -177,7 +177,7 @@ public long readBlobPreferredLength() {
      */
     @Override
     public void writeBlob(String blobName, InputStream inputStream, long blobSize, boolean failIfAlreadyExists) throws IOException {
-        writeBlobWithMetadata(blobName, inputStream, null, blobSize, failIfAlreadyExists);
+        writeBlobWithMetadata(blobName, inputStream, blobSize, failIfAlreadyExists, null);
     }
 
     /**
@@ -188,9 +188,9 @@ public void writeBlob(String blobName, InputStream inputStream, long blobSize, b
     public void writeBlobWithMetadata(
         String blobName,
         InputStream inputStream,
-        @Nullable Map<String, String> metadata,
         long blobSize,
-        boolean failIfAlreadyExists
+        boolean failIfAlreadyExists,
+        @Nullable Map<String, String> metadata
     ) throws IOException {
         assert inputStream.markSupported() : "No mark support on inputStream breaks the S3 SDK's ability to retry requests";
         SocketAccess.doPrivilegedIOException(() -> {
@@ -334,18 +334,6 @@ public void writeBlobAtomic(String blobName, InputStream inputStream, long blobS
         writeBlob(blobName, inputStream, blobSize, failIfAlreadyExists);
     }
 
-    @ExperimentalApi
-    @Override
-    public void writeBlobAtomicWithMetadata(
-        String blobName,
-        InputStream inputStream,
-        Map<String, String> metadata,
-        long blobSize,
-        boolean failIfAlreadyExists
-    ) throws IOException {
-        writeBlobWithMetadata(blobName, inputStream, metadata, blobSize, failIfAlreadyExists);
-    }
-
     @Override
     public DeleteResult delete() throws IOException {
         final AtomicLong deletedBlobs = new AtomicLong();

diff --git a/...pository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobContainerRetriesTests.java b/...pository-s3/src/test/java/org/opensearch/repositories/s3/S3BlobContainerRetriesTests.java
@@ -283,7 +283,7 @@ public void writeBlobWithRetriesHelper(Map<String, String> metadata) throws Exce
         final BlobContainer blobContainer = createBlobContainer(maxRetries, null, true, null);
         try (InputStream stream = new ByteArrayInputStream(bytes)) {
             if (metadata != null) {
-                blobContainer.writeBlobWithMetadata("write_blob_max_retries", stream, metadata, bytes.length, false);
+                blobContainer.writeBlobWithMetadata("write_blob_max_retries", stream, bytes.length, false, metadata);
             } else {
                 blobContainer.writeBlob("write_blob_max_retries", stream, bytes.length, false);
             }
@@ -404,7 +404,7 @@ public void writeBlobWithReadTimeoutsHelper(Map<String, String> metadata) {
         Exception exception = expectThrows(IOException.class, () -> {
             try (InputStream stream = new InputStreamIndexInput(new ByteArrayIndexInput("desc", bytes), bytes.length)) {
                 if (metadata != null) {
-                    blobContainer.writeBlobWithMetadata("write_blob_timeout", stream, metadata, bytes.length, false);
+                    blobContainer.writeBlobWithMetadata("write_blob_timeout", stream, bytes.length, false, metadata);
                 } else {
                     blobContainer.writeBlob("write_blob_timeout", stream, bytes.length, false);
                 }
@@ -520,7 +520,7 @@ public void WriteLargeBlobHelper(Map<String, String> metadata) throws Exception
         });
 
         if (metadata != null) {
-            blobContainer.writeBlobWithMetadata("write_large_blob", new ZeroInputStream(blobSize), metadata, blobSize, false);
+            blobContainer.writeBlobWithMetadata("write_large_blob", new ZeroInputStream(blobSize), blobSize, false, metadata);
         } else {
             blobContainer.writeBlob("write_large_blob", new ZeroInputStream(blobSize), blobSize, false);
         }

diff --git a/server/src/main/java/org/opensearch/common/blobstore/BlobContainer.java b/server/src/main/java/org/opensearch/common/blobstore/BlobContainer.java
@@ -167,9 +167,9 @@ default long readBlobPreferredLength() {
     default void writeBlobWithMetadata(
         String blobName,
         InputStream inputStream,
-        @Nullable Map<String, String> metadata,
         long blobSize,
-        boolean failIfAlreadyExists
+        boolean failIfAlreadyExists,
+        @Nullable Map<String, String> metadata
     ) throws IOException {
         throw new UnsupportedOperationException("writeBlobWithMetadata is not implemented yet");
     };