address review comments

Signed-off-by: Bala.FA <bala@minio.io>

Author: balamurugana

api/src/main/java/io/minio/BaseS3Client.java

@@ -799,16 +799,14 @@ public CompletableFuture<GenericResponse> createBucket(CreateBucketArgs args) {
       region = Http.US_EAST_1;
     }
 
-    Http.Headers headers =
-        args.objectLock() ? new Http.Headers("x-amz-bucket-object-lock-enabled", "true") : null;
-    final String locationConstraint = region;
+    Http.Headers headers = new Http.Headers();
+    if (args.objectLock()) headers.put("x-amz-bucket-object-lock-enabled", "true");
+    if (args.forceCreate()) headers.put("x-minio-force-create", "true");
 
-    CreateBucketConfiguration config = null;
-    if (locationConstraint.equals(Http.US_EAST_1)) {
-      config =
-          new CreateBucketConfiguration(
-              locationConstraint, args.locationConfig(), args.bucketConfig(), args.tags());
-    }
+    final String locationConstraint = region;
+    CreateBucketConfiguration config =
+        new CreateBucketConfiguration(
+            locationConstraint, args.locationConfig(), args.bucketConfig(), args.tags());
 
     Http.Body body = null;
     try {

api/src/main/java/io/minio/CreateBucketBaseArgs.java

@@ -26,6 +26,7 @@ public abstract class CreateBucketBaseArgs extends BucketArgs {
   protected CreateBucketConfiguration.Location locationConfig;
   protected CreateBucketConfiguration.Bucket bucket;
   protected Tags tags;
+  protected boolean forceCreate;
 
   protected CreateBucketBaseArgs() {}
 
@@ -35,6 +36,7 @@ protected CreateBucketBaseArgs(CreateBucketBaseArgs args) {
     this.locationConfig = args.locationConfig;
     this.bucket = args.bucket;
     this.tags = args.tags;
+    this.forceCreate = args.forceCreate;
   }
 
   public boolean objectLock() {
@@ -53,6 +55,10 @@ public Tags tags() {
     return tags;
   }
 
+  public boolean forceCreate() {
+    return forceCreate;
+  }
+
   /** 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>
@@ -81,6 +87,11 @@ public B tags(Tags tags) {
       operations.add(args -> args.tags = tags);
       return (B) this;
     }
+
+    public B forceCreate(boolean forceCreate) {
+      operations.add(args -> args.forceCreate = forceCreate);
+      return (B) this;
+    }
   }
 
   @Override
@@ -92,11 +103,12 @@ public boolean equals(Object o) {
     return objectLock == that.objectLock
         && Objects.equals(locationConfig, that.locationConfig)
         && Objects.equals(bucket, that.bucket)
-        && Objects.equals(tags, that.tags);
+        && Objects.equals(tags, that.tags)
+        && forceCreate == that.forceCreate;
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(super.hashCode(), objectLock, locationConfig, bucket, tags);
+    return Objects.hash(super.hashCode(), objectLock, locationConfig, bucket, tags, forceCreate);
   }
 }

api/src/main/java/io/minio/ObjectConditionalReadArgs.java

@@ -67,7 +67,7 @@ protected ObjectConditionalReadArgs(ObjectConditionalReadArgs args) {
 
   protected ObjectConditionalReadArgs(ObjectConditionalReadArgs args, String matchETag) {
     this(args);
-    this.matchETag = args.matchETag;
+    this.matchETag = matchETag;
   }
 
   public Long offset() {