Refactor messages by subclasses

merge SelectObjectContentRequest merge ListVersionsResult Remove unused CompleteMultipartUploadOutput.java merge ListMultipartUploadsResult merge NotificationRecords merge SseConfiguration merge DeleteRequest, DeleteResult merge RestoreRequest merge NotificationConfiguration merge LifecycleConfiguration merge ReplicationConfiguration merge Filter merge ObjectLockConfiguration merge ListAllMyBucketsResult merge Item merge ListObjectsResult Move common fields for ListPartsResult and GetObjectAttributesOutput Signed-off-by: Bala.FA <[email protected]>
minio · Feb 16, 2025 · a1ffb3d · a1ffb3d
1 parent 5e7e074
commit a1ffb3d
Show file tree

Hide file tree

Showing 199 changed files with 4,929 additions and 6,344 deletions.
diff --git a/adminapi/src/main/java/io/minio/admin/MinioAdminClient.java b/adminapi/src/main/java/io/minio/admin/MinioAdminClient.java
diff --git a/api/src/main/java/io/minio/BaseArgs.java b/api/src/main/java/io/minio/BaseArgs.java
@@ -60,75 +60,34 @@ public abstract static class Builder<B extends Builder<B, A>, A extends BaseArgs
 
     protected abstract void validate(A args);
 
-    protected void validateNotNull(Object arg, String argName) {
-      if (arg == null) {
-        throw new IllegalArgumentException(argName + " must not be null.");
-      }
-    }
-
-    protected void validateNotEmptyString(String arg, String argName) {
-      validateNotNull(arg, argName);
-      if (arg.isEmpty()) {
-        throw new IllegalArgumentException(argName + " must be a non-empty string.");
-      }
-    }
-
-    protected void validateNullOrNotEmptyString(String arg, String argName) {
-      if (arg != null && arg.isEmpty()) {
-        throw new IllegalArgumentException(argName + " must be a non-empty string.");
-      }
-    }
-
-    protected void validateNullOrPositive(Number arg, String argName) {
-      if (arg != null && arg.longValue() < 0) {
-        throw new IllegalArgumentException(argName + " cannot be non-negative.");
-      }
-    }
-
     public Builder() {
       this.operations = new ArrayList<>();
     }
 
-    protected Multimap<String, String> copyMultimap(Multimap<String, String> multimap) {
-      Multimap<String, String> multimapCopy = HashMultimap.create();
-      if (multimap != null) {
-        multimapCopy.putAll(multimap);
-      }
-      return Multimaps.unmodifiableMultimap(multimapCopy);
-    }
-
-    protected Multimap<String, String> toMultimap(Map<String, String> map) {
-      Multimap<String, String> multimap = HashMultimap.create();
-      if (map != null) {
-        multimap.putAll(Multimaps.forMap(map));
-      }
-      return Multimaps.unmodifiableMultimap(multimap);
-    }
-
     @SuppressWarnings("unchecked") // Its safe to type cast to B as B extends this class.
     public B extraHeaders(Multimap<String, String> headers) {
-      final Multimap<String, String> extraHeaders = copyMultimap(headers);
+      final Multimap<String, String> extraHeaders = Utils.newMultimap(headers);
       operations.add(args -> args.extraHeaders = extraHeaders);
       return (B) this;
     }
 
     @SuppressWarnings("unchecked") // Its safe to type cast to B as B extends this class.
     public B extraQueryParams(Multimap<String, String> queryParams) {
-      final Multimap<String, String> extraQueryParams = copyMultimap(queryParams);
+      final Multimap<String, String> extraQueryParams = Utils.newMultimap(queryParams);
       operations.add(args -> args.extraQueryParams = extraQueryParams);
       return (B) this;
     }
 
     @SuppressWarnings("unchecked") // Its safe to type cast to B as B extends this class.
     public B extraHeaders(Map<String, String> headers) {
-      final Multimap<String, String> extraHeaders = toMultimap(headers);
+      final Multimap<String, String> extraHeaders = Utils.newMultimap(headers);
       operations.add(args -> args.extraHeaders = extraHeaders);
       return (B) this;
     }
 
     @SuppressWarnings("unchecked") // Its safe to type cast to B as B extends this class.
     public B extraQueryParams(Map<String, String> queryParams) {
-      final Multimap<String, String> extraQueryParams = toMultimap(queryParams);
+      final Multimap<String, String> extraQueryParams = Utils.newMultimap(queryParams);
       operations.add(args -> args.extraQueryParams = extraQueryParams);
       return (B) this;
     }

diff --git a/api/src/main/java/io/minio/BucketArgs.java b/api/src/main/java/io/minio/BucketArgs.java
@@ -16,8 +16,6 @@
 
 package io.minio;
 
-import io.minio.http.HttpUtils;
-import io.minio.org.apache.commons.validator.routines.InetAddressValidator;
 import java.util.Objects;
 import java.util.regex.Pattern;
 
@@ -42,7 +40,7 @@ public abstract static class Builder<B extends Builder<B, A>, A extends BucketAr
     protected boolean skipValidation = false;
 
     protected void validateBucketName(String name) {
-      validateNotNull(name, "bucket name");
+      Utils.validateNotNull(name, "bucket name");
       if (skipValidation) {
         return;
       }
@@ -55,7 +53,7 @@ protected void validateBucketName(String name) {
                 + "https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html");
       }
 
-      if (InetAddressValidator.getInstance().isValidInet4Address(name)) {
+      if (Utils.isValidIPv4(name)) {
         throw new IllegalArgumentException(
             "bucket name '" + name + "' must not be formatted as an IP address");
       }
@@ -67,7 +65,7 @@ protected void validateBucketName(String name) {
     }
 
     private void validateRegion(String region) {
-      if (!skipValidation && region != null && !HttpUtils.REGION_REGEX.matcher(region).find()) {
+      if (!skipValidation && region != null && !Utils.REGION_REGEX.matcher(region).find()) {
         throw new IllegalArgumentException("invalid region " + region);
       }
     }

diff --git a/api/src/main/java/io/minio/CopyObjectArgs.java b/api/src/main/java/io/minio/CopyObjectArgs.java
@@ -69,7 +69,7 @@ public static final class Builder extends ObjectWriteArgs.Builder<Builder, CopyO
     @Override
     protected void validate(CopyObjectArgs args) {
       super.validate(args);
-      validateNotNull(args.source, "copy source");
+      Utils.validateNotNull(args.source, "copy source");
       if (args.source.offset() != null || args.source.length() != null) {
         if (args.metadataDirective != null && args.metadataDirective == Directive.COPY) {
           throw new IllegalArgumentException(
@@ -83,7 +83,7 @@ protected void validate(CopyObjectArgs args) {
     }
 
     public Builder source(CopySource source) {
-      validateNotNull(source, "copy source");
+      Utils.validateNotNull(source, "copy source");
       operations.add(args -> args.source = source);
       return this;
     }

diff --git a/api/src/main/java/io/minio/Digest.java b/api/src/main/java/io/minio/Digest.java
diff --git a/api/src/main/java/io/minio/DownloadObjectArgs.java b/api/src/main/java/io/minio/DownloadObjectArgs.java
@@ -40,7 +40,7 @@ public static Builder builder() {
   /** Argument class of {@link DownloadObjectArgs}. */
   public static final class Builder extends ObjectReadArgs.Builder<Builder, DownloadObjectArgs> {
     private void validateFilename(String filename) {
-      validateNotEmptyString(filename, "filename");
+      Utils.validateNotEmptyString(filename, "filename");
     }
 
     public Builder filename(String filename) {

diff --git a/api/src/main/java/io/minio/GetObjectAttributesArgs.java b/api/src/main/java/io/minio/GetObjectAttributesArgs.java
@@ -51,7 +51,7 @@ public static final class Builder
     @Override
     protected void validate(GetObjectAttributesArgs args) {
       super.validate(args);
-      validateNotNull(args.objectAttributes, "object attributes");
+      Utils.validateNotNull(args.objectAttributes, "object attributes");
     }
 
     public Builder objectAttributes(String[] objectAttributes) {

diff --git a/api/src/main/java/io/minio/GetPresignedObjectUrlArgs.java b/api/src/main/java/io/minio/GetPresignedObjectUrlArgs.java
@@ -16,7 +16,6 @@
 
 package io.minio;
 
-import io.minio.http.Method;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
@@ -28,10 +27,10 @@ public class GetPresignedObjectUrlArgs extends ObjectVersionArgs {
   // default expiration for a presigned URL is 7 days in seconds
   public static final int DEFAULT_EXPIRY_TIME = (int) TimeUnit.DAYS.toSeconds(7);
 
-  private Method method;
+  private Http.Method method;
   private int expiry = DEFAULT_EXPIRY_TIME;
 
-  public Method method() {
+  public Http.Method method() {
     return method;
   }
 
@@ -46,8 +45,8 @@ public static Builder builder() {
   /** Argument builder of {@link GetPresignedObjectUrlArgs}. */
   public static final class Builder
       extends ObjectVersionArgs.Builder<Builder, GetPresignedObjectUrlArgs> {
-    private void validateMethod(Method method) {
-      validateNotNull(method, "method");
+    private void validateMethod(Http.Method method) {
+      Utils.validateNotNull(method, "method");
     }
 
     private void validateExpiry(int expiry) {
@@ -60,7 +59,7 @@ private void validateExpiry(int expiry) {
     }
 
     /* method HTTP {@link Method} to generate presigned URL. */
-    public Builder method(Method method) {
+    public Builder method(Http.Method method) {
       validateMethod(method);
       operations.add(args -> args.method = method);
       return this;