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]>

Author: balamurugana

.github/workflows/gradle.yml

@@ -35,7 +35,7 @@ jobs:
         run: |
           echo "DEV_VERSION=$(./gradlew properties | awk '/^version:/ { print $2 }')" >> $GITHUB_ENV
           echo "RELEASE_VERSION=$(./gradlew properties -Prelease | awk '/^version:/ { print $2 }')" >> $GITHUB_ENV
-      - name: Gradle build on Ununtu
+      - name: Gradle build on Ubuntu
         if: matrix.os == 'ubuntu-latest'
         run: |
           ./gradlew build

adminapi/src/main/java/io/minio/admin/AddServiceAccountResp.java renamed to adminapi/src/main/java/io/minio/admin/AddServiceAccountResponse.java

@@ -28,7 +28,7 @@
  * "https://github.com/minio/madmin-go/blob/main/user-commands.go#L388">user-commands.go</a>
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class AddServiceAccountResp {
+public class AddServiceAccountResponse {
   @JsonProperty("credentials")
   private Credentials credentials;
 

adminapi/src/main/java/io/minio/admin/GroupAddUpdateRemoveInfo.java renamed to adminapi/src/main/java/io/minio/admin/AddUpdateRemoveGroupArgs.java

@@ -20,15 +20,15 @@
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 /** Represents groupAddUpdateRemove information. */
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class GroupAddUpdateRemoveInfo {
+@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(value = "URF_UNREAD_FIELD")
+public class AddUpdateRemoveGroupArgs {
   @JsonProperty("group")
   private String group;
 
@@ -41,7 +41,7 @@ public class GroupAddUpdateRemoveInfo {
   @JsonProperty("isRemove")
   private boolean isRemove;
 
-  public GroupAddUpdateRemoveInfo(
+  public AddUpdateRemoveGroupArgs(
       @Nonnull @JsonProperty("group") String group,
       @Nullable @JsonProperty("groupStatus") Status groupStatus,
       @Nullable @JsonProperty("members") List<String> members,
@@ -51,20 +51,4 @@ public GroupAddUpdateRemoveInfo(
     this.members = (members != null) ? Collections.unmodifiableList(members) : null;
     this.isRemove = isRemove;
   }
-
-  public String group() {
-    return group;
-  }
-
-  public Status groupStatus() {
-    return groupStatus;
-  }
-
-  public List<String> members() {
-    return Collections.unmodifiableList(members == null ? new LinkedList<>() : members);
-  }
-
-  public boolean isRemove() {
-    return isRemove;
-  }
 }

adminapi/src/main/java/io/minio/admin/Crypto.java

@@ -17,6 +17,7 @@
 
 package io.minio.admin;
 
+import io.minio.errors.MinioException;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
 import java.io.IOException;
@@ -156,22 +157,25 @@ private static byte[] generateKey(byte[] secret, byte[] salt) {
   }
 
   private static byte[] generateEncryptDecryptAdditionalData(
-      boolean encryptFlag, int aeadId, byte[] key, byte[] paddedNonce)
-      throws InvalidCipherTextException {
-    AEADCipher cipher = getEncryptCipher(aeadId, key, paddedNonce);
-    int outputLength = cipher.getMac().length;
-    byte[] additionalData = new byte[outputLength];
-    cipher.doFinal(additionalData, 0);
-    return appendBytes(new byte[] {0}, additionalData);
+      boolean encryptFlag, int aeadId, byte[] key, byte[] paddedNonce) throws MinioException {
+    try {
+      AEADCipher cipher = getEncryptCipher(aeadId, key, paddedNonce);
+      int outputLength = cipher.getMac().length;
+      byte[] additionalData = new byte[outputLength];
+      cipher.doFinal(additionalData, 0);
+      return appendBytes(new byte[] {0}, additionalData);
+    } catch (InvalidCipherTextException e) {
+      throw new MinioException(e);
+    }
   }
 
   private static byte[] generateEncryptAdditionalData(int aeadId, byte[] key, byte[] paddedNonce)
-      throws InvalidCipherTextException {
+      throws MinioException {
     return generateEncryptDecryptAdditionalData(true, aeadId, key, paddedNonce);
   }
 
   private static byte[] generateDecryptAdditionalData(int aeadId, byte[] key, byte[] paddedNonce)
-      throws InvalidCipherTextException {
+      throws MinioException {
     return generateEncryptDecryptAdditionalData(false, aeadId, key, paddedNonce);
   }
 
@@ -190,7 +194,7 @@ private static byte[] updateNonceId(byte[] nonce, int idx) {
   }
 
   /** Encrypt data payload. */
-  public static byte[] encrypt(byte[] payload, String password) throws InvalidCipherTextException {
+  public static byte[] encrypt(byte[] payload, String password) throws MinioException {
     byte[] nonce = random(NONCE_LENGTH);
     byte[] salt = random(SALT_LENGTH);
 
@@ -219,7 +223,11 @@ public static byte[] encrypt(byte[] payload, String password) throws InvalidCiph
       int outputLength = cipher.getOutputSize(chunk.length);
       byte[] encryptedData = new byte[outputLength];
       int outputOffset = cipher.processBytes(chunk, 0, chunk.length, encryptedData, 0);
-      cipher.doFinal(encryptedData, outputOffset);
+      try {
+        cipher.doFinal(encryptedData, outputOffset);
+      } catch (InvalidCipherTextException e) {
+        throw new MinioException(e);
+      }
 
       result = appendBytes(result, encryptedData);
 
@@ -243,20 +251,24 @@ public static class DecryptReader {
     private byte[] oneByte = null;
     private boolean eof = false;
 
-    public DecryptReader(InputStream inputStream, byte[] secret)
-        throws EOFException, IOException, InvalidCipherTextException {
+    public DecryptReader(InputStream inputStream, byte[] secret) throws MinioException {
       this.inputStream = inputStream;
       this.secret = secret;
-      readFully(this.inputStream, this.salt, true);
-      readFully(this.inputStream, this.aeadId, true);
-      readFully(this.inputStream, this.nonce, true);
+      try {
+        readFully(this.inputStream, this.salt, true);
+        readFully(this.inputStream, this.aeadId, true);
+        readFully(this.inputStream, this.nonce, true);
+      } catch (EOFException e) {
+        throw new MinioException(e);
+      } catch (IOException e) {
+        throw new MinioException(e);
+      }
       this.key = generateKey(this.secret, this.salt);
       byte[] paddedNonce = appendBytes(this.nonce, new byte[] {0, 0, 0, 0});
       this.additionalData = generateDecryptAdditionalData(this.aeadId[0], this.key, paddedNonce);
     }
 
-    private byte[] decrypt(byte[] encryptedData, boolean lastChunk)
-        throws InvalidCipherTextException {
+    private byte[] decrypt(byte[] encryptedData, boolean lastChunk) throws MinioException {
       this.count++;
       if (lastChunk) {
         this.additionalData = markAsLast(this.additionalData);
@@ -268,12 +280,16 @@ private byte[] decrypt(byte[] encryptedData, boolean lastChunk)
       byte[] decryptedData = new byte[outputLength];
       int outputOffset =
           cipher.processBytes(encryptedData, 0, encryptedData.length, decryptedData, 0);
-      cipher.doFinal(decryptedData, outputOffset);
+      try {
+        cipher.doFinal(decryptedData, outputOffset);
+      } catch (InvalidCipherTextException e) {
+        throw new MinioException(e);
+      }
       return decryptedData;
     }
 
     /** Read a chunk at least one byte more than chunk size. */
-    private byte[] readChunk() throws IOException {
+    private byte[] readChunk() throws EOFException, IOException {
       if (this.eof) {
         return new byte[] {};
       }
@@ -302,19 +318,24 @@ private byte[] readChunk() throws IOException {
       return baos.toByteArray();
     }
 
-    public byte[] readAllBytes() throws IOException, InvalidCipherTextException {
+    public byte[] readAllBytes() throws MinioException {
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
       while (!this.eof) {
-        byte[] payload = this.readChunk();
-        baos.write(this.decrypt(payload, this.eof));
+        try {
+          byte[] payload = this.readChunk();
+          baos.write(this.decrypt(payload, this.eof));
+        } catch (EOFException e) {
+          throw new MinioException(e);
+        } catch (IOException e) {
+          throw new MinioException(e);
+        }
       }
       return baos.toByteArray();
     }
   }
 
   /** Decrypt data stream. */
-  public static byte[] decrypt(InputStream inputStream, String password)
-      throws EOFException, IOException, InvalidCipherTextException {
+  public static byte[] decrypt(InputStream inputStream, String password) throws MinioException {
     DecryptReader reader =
         new DecryptReader(inputStream, password.getBytes(StandardCharsets.UTF_8));
     return reader.readAllBytes();