Few enhancements in the builder framework

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

@@ -22,25 +22,26 @@
 import java.util.function.Consumer;
 
 public abstract class BaseArgs {
-  public abstract static class BaseBuilder<T extends BaseBuilder<T, B>, B extends BaseArgs> {
-    protected List<Consumer<B>> operations;
+  public abstract static class Builder<B extends Builder<B, A>, A extends BaseArgs> {
+    protected List<Consumer<A>> operations;
 
-    public BaseBuilder() {
+    public Builder() {
       this.operations = new ArrayList<>();
     }
 
-    protected B build(Class<B> clazz) throws IllegalArgumentException {
+    @SuppressWarnings("unchecked") // safe as B will always be the builder of the current args class
+    public A build() throws IllegalArgumentException {
       try {
-        B args = clazz.getDeclaredConstructor().newInstance();
+        A args = (A) this.getClass().getEnclosingClass().getDeclaredConstructor().newInstance();
         operations.forEach(operation -> operation.accept(args));
         return args;
       } catch (InstantiationException
           | IllegalAccessException
           | InvocationTargetException
           | NoSuchMethodException
           | SecurityException e) {
-        // This should never happen as we'll always be
-        // sending a proper class as argument to build()
+        // This should never happen as we'll always have the
+        // Builder class as an enclosed class of the args class
         e.printStackTrace();
         return null;
       }

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

@@ -32,8 +32,8 @@ public String region() {
   }
 
   /** Base argument builder class. */
-  public abstract static class Builder<T extends Builder<T, B>, B extends BucketArgs>
-      extends BaseArgs.BaseBuilder<Builder<T, B>, B> {
+  public abstract static class Builder<B extends Builder<B, A>, A extends BucketArgs>
+      extends BaseArgs.Builder<B, A> {
     protected void validateName(String name) {
       if (name == null) {
         throw new IllegalArgumentException("null bucket name");
@@ -61,16 +61,16 @@ protected void validateName(String name) {
     }
 
     @SuppressWarnings("unchecked") // Its safe to type cast to T as T is inherited by this class
-    public T bucket(String name) {
+    public B bucket(String name) {
       validateName(name);
       operations.add(args -> args.name = name);
-      return (T) this;
+      return (B) this;
     }
 
     @SuppressWarnings("unchecked") // Its safe to type cast to T as T is inherited by this class
-    public T region(String region) {
+    public B region(String region) {
       operations.add(args -> args.region = region);
-      return (T) this;
+      return (B) this;
     }
   }
 }

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

@@ -35,9 +35,5 @@ public Builder objectLock(boolean objectLock) {
       operations.add(args -> args.objectLock = objectLock);
       return this;
     }
-
-    public MakeBucketArgs build() throws IllegalArgumentException {
-      return build(MakeBucketArgs.class);
-    }
   }
 }