Sync APIs with S3 specification

balamurugana · balamurugana · commit 7cb505bfdf62 · 2025-11-23T11:50:53.000+05:30
Signed-off-by: Bala.FA &lt;bala@minio.io&gt;
diff --git a/api/src/main/java/io/minio/BaseS3Client.java b/api/src/main/java/io/minio/BaseS3Client.java
@@ -664,13 +664,18 @@ public CompletableFuture<AbortMultipartUploadResponse> abortMultipartUpload(
   public CompletableFuture<ObjectWriteResponse> completeMultipartUpload(
       CompleteMultipartUploadArgs args) {
     checkArgs(args);
+    args.validateSsec(baseUrl.isHttps());
     Http.Body body = null;
     try {
       body = new Http.Body(new CompleteMultipartUpload(args.parts()), null, null, null);
     } catch (MinioException e) {
       return Utils.failedFuture(e);
     }
-    return executePostAsync(args, null, new Http.QueryParameters(UPLOAD_ID, args.uploadId()), body)
+    return executePostAsync(
+            args,
+            args.ssec() == null ? null : args.ssec().headers(),
+            new Http.QueryParameters(UPLOAD_ID, args.uploadId()),
+            body)
         .thenApply(
             response -> {
               try {
@@ -802,7 +807,7 @@ public CompletableFuture<GenericResponse> createBucket(CreateBucketArgs args) {
     if (locationConstraint.equals(Http.US_EAST_1)) {
       config =
           new CreateBucketConfiguration(
-              locationConstraint, args.locationConfig(), args.bucketConfig());
+              locationConstraint, args.locationConfig(), args.bucketConfig(), args.tags());
     }
 
     Http.Body body = null;
@@ -951,6 +956,20 @@ public CompletableFuture<String> getBucketLocation(GetBucketLocationArgs args) {
             });
   }
 
+  /**
+   * Do <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadBucket.html">HeadBucket S3
+   * API</a> asynchronously.
+   *
+   * @param args {@link HeadBucketArgs} object.
+   * @return {@link CompletableFuture}&lt;{@link HeadBucketResponse}&gt; object.
+   */
+  public CompletableFuture<HeadBucketResponse> headBucket(HeadBucketArgs args) {
+    checkArgs(args);
+    return executeHeadAsync(args, null, null)
+        .thenApply(
+            response -> new HeadBucketResponse(response.headers(), args.bucket(), args.region()));
+  }
+
   /**
    * Do <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html">HeadObject S3
    * API</a> asynchronously.
diff --git a/api/src/main/java/io/minio/BucketExistsArgs.java b/api/src/main/java/io/minio/BucketExistsArgs.java
@@ -17,11 +17,11 @@
 package io.minio;
 
 /** Arguments of {@link MinioAsyncClient#bucketExists} and {@link MinioClient#bucketExists}. */
-public class BucketExistsArgs extends BucketArgs {
+public class BucketExistsArgs extends HeadBucketBaseArgs {
   public static Builder builder() {
     return new Builder();
   }
 
   /** Builder of {@link BucketExistsArgs}. */
-  public static final class Builder extends BucketArgs.Builder<Builder, BucketExistsArgs> {}
+  public static final class Builder extends HeadBucketBaseArgs.Builder<Builder, BucketExistsArgs> {}
 }
diff --git a/api/src/main/java/io/minio/CompleteMultipartUploadArgs.java b/api/src/main/java/io/minio/CompleteMultipartUploadArgs.java
@@ -24,6 +24,7 @@
 public class CompleteMultipartUploadArgs extends ObjectArgs {
   private String uploadId;
   private Part[] parts;
+  private ServerSideEncryption.CustomerKey ssec;
 
   protected CompleteMultipartUploadArgs() {}
 
@@ -37,6 +38,9 @@ public CompleteMultipartUploadArgs(PutObjectBaseArgs args, String uploadId, Part
     super(args);
     this.uploadId = uploadId;
     this.parts = parts;
+    if (args.sse() != null && args.sse() instanceof ServerSideEncryption.CustomerKey) {
+      this.ssec = (ServerSideEncryption.CustomerKey) args.sse();
+    }
   }
 
   public String uploadId() {
@@ -47,6 +51,14 @@ public Part[] parts() {
     return parts;
   }
 
+  public ServerSideEncryption.CustomerKey ssec() {
+    return ssec;
+  }
+
+  public void validateSsec(boolean isHttps) {
+    checkSse(ssec, isHttps);
+  }
+
   public static Builder builder() {
     return new Builder();
   }
@@ -72,6 +84,11 @@ public Builder parts(Part[] parts) {
       operations.add(args -> args.parts = parts);
       return this;
     }
+
+    public Builder ssec(ServerSideEncryption.CustomerKey ssec) {
+      operations.add(args -> args.ssec = ssec);
+      return this;
+    }
   }
 
   @Override
@@ -80,11 +97,13 @@ public boolean equals(Object o) {
     if (!(o instanceof CompleteMultipartUploadArgs)) return false;
     if (!super.equals(o)) return false;
     CompleteMultipartUploadArgs that = (CompleteMultipartUploadArgs) o;
-    return Objects.equals(uploadId, that.uploadId) && Arrays.equals(parts, that.parts);
+    return Objects.equals(uploadId, that.uploadId)
+        && Arrays.equals(parts, that.parts)
+        && Objects.equals(ssec, that.ssec);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), uploadId, parts);
+    return Objects.hash(super.hashCode(), uploadId, parts, ssec);
   }
 }
diff --git a/api/src/main/java/io/minio/CreateBucketBaseArgs.java b/api/src/main/java/io/minio/CreateBucketBaseArgs.java
@@ -17,13 +17,15 @@
 package io.minio;
 
 import io.minio.messages.CreateBucketConfiguration;
+import io.minio.messages.Tags;
 import java.util.Objects;
 
 /** Common arguments of {@link CreateBucketArgs} and {@link MakeBucketArgs}. */
 public abstract class CreateBucketBaseArgs extends BucketArgs {
   protected boolean objectLock;
   protected CreateBucketConfiguration.Location locationConfig;
   protected CreateBucketConfiguration.Bucket bucket;
+  protected Tags tags;
 
   protected CreateBucketBaseArgs() {}
 
@@ -32,6 +34,7 @@ protected CreateBucketBaseArgs(CreateBucketBaseArgs args) {
     this.objectLock = args.objectLock;
     this.locationConfig = args.locationConfig;
     this.bucket = args.bucket;
+    this.tags = args.tags;
   }
 
   public boolean objectLock() {
@@ -46,6 +49,10 @@ public CreateBucketConfiguration.Bucket bucketConfig() {
     return bucket;
   }
 
+  public Tags tags() {
+    return tags;
+  }
+
   /** Base argument builder of {@link CreateBucketBaseArgs}. */
   @SuppressWarnings("unchecked") // Its safe to type cast to B as B is inherited by this class
   public abstract static class Builder<B extends Builder<B, A>, A extends CreateBucketBaseArgs>
@@ -69,6 +76,11 @@ public B bucketConfig(CreateBucketConfiguration.Bucket bucket) {
       operations.add(args -> args.bucket = bucket);
       return (B) this;
     }
+
+    public B tags(Tags tags) {
+      operations.add(args -> args.tags = tags);
+      return (B) this;
+    }
   }
 
   @Override
@@ -79,11 +91,12 @@ public boolean equals(Object o) {
     CreateBucketBaseArgs that = (CreateBucketBaseArgs) o;
     return objectLock == that.objectLock
         && Objects.equals(locationConfig, that.locationConfig)
-        && Objects.equals(bucket, that.bucket);
+        && Objects.equals(bucket, that.bucket)
+        && Objects.equals(tags, that.tags);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), objectLock, locationConfig, bucket);
+    return Objects.hash(super.hashCode(), objectLock, locationConfig, bucket, tags);
   }
 }
diff --git a/api/src/main/java/io/minio/GenericUploadResponse.java b/api/src/main/java/io/minio/GenericUploadResponse.java
@@ -18,11 +18,13 @@
 
 import io.minio.messages.CompleteMultipartUploadResult;
 import io.minio.messages.CopyObjectResult;
+import java.time.ZonedDateTime;
 import okhttp3.Headers;
 
 /** Common response of {@link ObjectWriteResponse} and {@link PutObjectFanOutResponse}. */
 public class GenericUploadResponse extends GenericResponse {
   private String etag;
+  private ZonedDateTime lastModified;
   private String checksumCRC32;
   private String checksumCRC32C;
   private String checksumCRC64NVME;
@@ -53,6 +55,7 @@ public GenericUploadResponse(
       CopyObjectResult result) {
     super(headers, bucket, region, object);
     this.etag = etag;
+    this.lastModified = result.lastModified();
     if (result != null) {
       this.checksumType = result.checksumType();
       this.checksumCRC32 = result.checksumCRC32();
@@ -86,6 +89,10 @@ public String etag() {
     return etag;
   }
 
+  public ZonedDateTime lastModified() {
+    return lastModified;
+  }
+
   public String checksumCRC32() {
     return checksumCRC32;
   }
diff --git a/api/src/main/java/io/minio/HeadBucketArgs.java b/api/src/main/java/io/minio/HeadBucketArgs.java
@@ -0,0 +1,27 @@
+/*
+ * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2025 MinIO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.minio;
+
+/** Arguments of {@link BaseS3Client#headBucket}. */
+public class HeadBucketArgs extends HeadBucketBaseArgs {
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  /** Builder of {@link HeadBucketArgs}. */
+  public static final class Builder extends HeadBucketBaseArgs.Builder<Builder, HeadBucketArgs> {}
+}
diff --git a/api/src/main/java/io/minio/HeadBucketBaseArgs.java b/api/src/main/java/io/minio/HeadBucketBaseArgs.java
@@ -0,0 +1,24 @@
+/*
+ * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2025 MinIO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.minio;
+
+/** Common arguments of {@link HeadBucketArgs} and {@link BucketExistsArgs}. */
+public abstract class HeadBucketBaseArgs extends BucketArgs {
+  /** Builder of {@link HeadBucketBaseArgs}. */
+  public abstract static class Builder<B extends Builder<B, A>, A extends HeadBucketBaseArgs>
+      extends BucketArgs.Builder<B, A> {}
+}
diff --git a/api/src/main/java/io/minio/HeadBucketResponse.java b/api/src/main/java/io/minio/HeadBucketResponse.java
@@ -0,0 +1,45 @@
+/*
+ * MinIO Java SDK for Amazon S3 Compatible Cloud Storage, (C) 2025 MinIO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.minio;
+
+/** Response of {@link BaseS3Client#headBucket}. */
+public class HeadBucketResponse extends GenericResponse {
+  public HeadBucketResponse(okhttp3.Headers headers, String bucket, String region) {
+    super(headers, bucket, region, null);
+  }
+
+  public String bucketArn() {
+    return this.headers().get("x-amz-bucket-arn");
+  }
+
+  public String locationType() {
+    return this.headers().get("x-amz-bucket-location-type");
+  }
+
+  public String locationName() {
+    return this.headers().get("x-amz-bucket-location-name");
+  }
+
+  public String accessPointAlias() {
+    return this.headers().get("x-amz-access-point-alias");
+  }
+
+  @Override
+  public String toString() {
+    return "HeadObjectResponse{" + "bucket=" + bucket() + ", region=" + region() + "}";
+  }
+}
diff --git a/api/src/main/java/io/minio/HeadObjectResponse.java b/api/src/main/java/io/minio/HeadObjectResponse.java
@@ -19,7 +19,7 @@
 import io.minio.messages.LegalHold;
 import io.minio.messages.RetentionMode;
 import java.time.ZonedDateTime;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -34,6 +34,7 @@ public class HeadObjectResponse extends GenericResponse {
   private LegalHold lockLegalHold;
   private boolean deleteMarker;
   private Http.Headers userMetadata;
+  private Map<Checksum.Algorithm, String> checksums;
   private Checksum.Type checksumType;
 
   public HeadObjectResponse(okhttp3.Headers headers, String bucket, String region, String object) {
@@ -72,6 +73,19 @@ public HeadObjectResponse(okhttp3.Headers headers, String bucket, String region,
 
     value = headers.get("x-amz-checksum-type");
     this.checksumType = value == null ? null : Checksum.Type.valueOf(value);
+
+    Map<Checksum.Algorithm, String> checksums = new HashMap<>();
+    value = headers.get("x-amz-checksum-crc32");
+    if (value != null && !value.isEmpty()) checksums.put(Checksum.Algorithm.CRC32, value);
+    value = headers.get("x-amz-checksum-crc32c");
+    if (value != null && !value.isEmpty()) checksums.put(Checksum.Algorithm.CRC32C, value);
+    value = headers.get("x-amz-checksum-crc64nvme");
+    if (value != null && !value.isEmpty()) checksums.put(Checksum.Algorithm.CRC64NVME, value);
+    value = headers.get("x-amz-checksum-sha1");
+    if (value != null && !value.isEmpty()) checksums.put(Checksum.Algorithm.SHA1, value);
+    value = headers.get("x-amz-checksum-sha256");
+    if (value != null && !value.isEmpty()) checksums.put(Checksum.Algorithm.SHA256, value);
+    if (checksums.size() != 0) this.checksums = checksums;
   }
 
   public String etag() {
@@ -118,32 +132,13 @@ public Checksum.Type checksumType() {
     return checksumType;
   }
 
-  public List<Checksum.Algorithm> algorithms() {
-    okhttp3.Headers headers = headers();
-    List<Checksum.Algorithm> algorithms = new ArrayList<>();
-    String value;
-
-    value = headers.get("x-amz-checksum-crc32");
-    if (value != null && !value.isEmpty()) algorithms.add(Checksum.Algorithm.CRC32);
-
-    value = headers.get("x-amz-checksum-crc32c");
-    if (value != null && !value.isEmpty()) algorithms.add(Checksum.Algorithm.CRC32C);
-
-    value = headers.get("x-amz-checksum-crc64nvme");
-    if (value != null && !value.isEmpty()) algorithms.add(Checksum.Algorithm.CRC64NVME);
-
-    value = headers.get("x-amz-checksum-sha1");
-    if (value != null && !value.isEmpty()) algorithms.add(Checksum.Algorithm.SHA1);
-
-    value = headers.get("x-amz-checksum-sha256");
-    if (value != null && !value.isEmpty()) algorithms.add(Checksum.Algorithm.SHA256);
-
-    return algorithms.size() == 0 ? null : algorithms;
+  public Map<Checksum.Algorithm, String> checksums() {
+    return checksums;
   }
 
   @Override
   public String toString() {
-    return "ObjectHead{"
+    return "HeadObjectResponse{"
         + "bucket="
         + bucket()
         + ", object="
diff --git a/api/src/main/java/io/minio/MinioAsyncClient.java b/api/src/main/java/io/minio/MinioAsyncClient.java
diff --git a/api/src/main/java/io/minio/messages/CreateBucketConfiguration.java b/api/src/main/java/io/minio/messages/CreateBucketConfiguration.java

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@`
`17`	`17`	`package io.minio;`
`18`	`18`
`19`	`19`	`/** Arguments of {@link MinioAsyncClient#bucketExists} and {@link MinioClient#bucketExists}. */`
`20`		`-public class BucketExistsArgs extends BucketArgs {`
	`20`	`+public class BucketExistsArgs extends HeadBucketBaseArgs {`
`21`	`21`	`public static Builder builder() {`
`22`	`22`	`return new Builder();`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/** Builder of {@link BucketExistsArgs}. */`
`26`		`- public static final class Builder extends BucketArgs.Builder<Builder, BucketExistsArgs> {}`
	`26`	`+ public static final class Builder extends HeadBucketBaseArgs.Builder<Builder, BucketExistsArgs> {}`
`27`	`27`	`}`