Merge branch 'master' into fix/retry-transient-delete-errors

Author: balamurugana

.github/workflows/codeql-analysis.yml

@@ -39,11 +39,17 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
+
+    - name: Set up Java 17
+      uses: actions/setup-java@v5
+      with:
+        java-version: '17'
+        distribution: 'temurin'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +60,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +74,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/gradle.yml

@@ -10,45 +10,79 @@ on:
 
 jobs:
   build:
-    name: Test on java-version ${{ matrix.java-version }} and ${{ matrix.os }}
+    name: Test on Java ${{ matrix.java-version }} in ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        java-version: ['8', '11', '17']
+        java-version: ['8', '11', '17', '21', '25']
         os: [ubuntu-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
+
       - name: Check limited Guava usage
         if: matrix.os == 'ubuntu-latest'
         run: |
           if grep --with-filename --line-number --no-messages --recursive --exclude-dir=.github "com.google.common.base.Objects" .; then
             echo "Error: use java.util.Objects instead of com.google.common.base.Objects"
             exit 1
           fi
-      - name: Setup java ${{ matrix.java-version }}
-        uses: actions/setup-java@v4
+
+      - name: Setup java 17 for building
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: ${{ matrix.java-version }}
-      - name: Set environment variables
+          java-version: '17'
+
+      - name: Set environment variables on Ubuntu
+        if: matrix.os == 'ubuntu-latest'
         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 Ubuntu
+
+      - name: Set environment variables on Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          $devVersion = (./gradlew.bat properties | Select-String '^version:').ToString().Split(' ')[1].Trim()
+          echo "DEV_VERSION=$devVersion" >> $Env:GITHUB_ENV
+
+      - name: Run build on Ubuntu
         if: matrix.os == 'ubuntu-latest'
         run: |
           ./gradlew build
-          ./gradlew runFunctionalTest
-          javac -cp api/build/libs/minio-${DEV_VERSION}-all.jar functional/TestUserAgent.java
-          java -Dversion=${DEV_VERSION} -cp api/build/libs/minio-${DEV_VERSION}-all.jar:functional TestUserAgent
-          ./gradlew clean
           ./gradlew build -Prelease
-          javac -cp api/build/libs/minio-${RELEASE_VERSION}-all.jar functional/TestUserAgent.java
-          java -Dversion=${RELEASE_VERSION} -cp api/build/libs/minio-${RELEASE_VERSION}-all.jar:functional TestUserAgent
-      - name: Gradle build on Windows
+
+      - name: Run build on Windows
+        if: matrix.os == 'windows-latest'
+        run: |
+          ./gradlew.bat build
+
+      - name: Setup java ${{ matrix.java-version }} for testing
+        if: matrix.java-version != '17'
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.java-version }}
+
+      - name: Run tests on Ubuntu
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          cd functional
+          curl -sSfLO https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/1.11.4/junit-platform-console-standalone-1.11.4.jar
+          curl -sSfLO https://repo1.maven.org/maven2/com/github/spotbugs/spotbugs-annotations/4.9.8/spotbugs-annotations-4.9.8.jar
+          javac -cp spotbugs-annotations-4.9.8.jar:junit-platform-console-standalone-1.11.4.jar:../api/build/libs/minio-${DEV_VERSION}-all.jar:../adminapi/build/libs/minio-admin-${DEV_VERSION}-all.jar:. FunctionalTest.java
+          java -cp spotbugs-annotations-4.9.8.jar:junit-platform-console-standalone-1.11.4.jar:../api/build/libs/minio-${DEV_VERSION}-all.jar:../adminapi/build/libs/minio-admin-${DEV_VERSION}-all.jar:. FunctionalTest
+          javac -cp spotbugs-annotations-4.9.8.jar:junit-platform-console-standalone-1.11.4.jar:../api/build/libs/minio-${DEV_VERSION}-all.jar:. ./TestUserAgent.java
+          java -Dversion=${DEV_VERSION} -cp spotbugs-annotations-4.9.8.jar:junit-platform-console-standalone-1.11.4.jar:../api/build/libs/minio-${DEV_VERSION}-all.jar:. TestUserAgent
+          javac -cp spotbugs-annotations-4.9.8.jar:junit-platform-console-standalone-1.11.4.jar:../api/build/libs/minio-${RELEASE_VERSION}-all.jar:. ./TestUserAgent.java
+          java -Dversion=${RELEASE_VERSION} -cp spotbugs-annotations-4.9.8.jar:junit-platform-console-standalone-1.11.4.jar:../api/build/libs/minio-${RELEASE_VERSION}-all.jar:. TestUserAgent
+
+      - name: Run tests on Windows
         if: matrix.os == 'windows-latest'
         run: |
-          $Env:Path += ';.'
-          gradlew.bat build
-          gradlew.bat runFunctionalTest
+          cd functional
+          curl -sSfLO https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone/1.11.4/junit-platform-console-standalone-1.11.4.jar
+          curl -sSfLO https://repo1.maven.org/maven2/com/github/spotbugs/spotbugs-annotations/4.9.8/spotbugs-annotations-4.9.8.jar
+          javac -encoding UTF-8 -cp "spotbugs-annotations-4.9.8.jar;junit-platform-console-standalone-1.11.4.jar;../api/build/libs/minio-$Env:DEV_VERSION-all.jar;../adminapi/build/libs/minio-admin-$Env:DEV_VERSION-all.jar;." FunctionalTest.java
+          java -cp "spotbugs-annotations-4.9.8.jar;junit-platform-console-standalone-1.11.4.jar;../api/build/libs/minio-$Env:DEV_VERSION-all.jar;../adminapi/build/libs/minio-admin-$Env:DEV_VERSION-all.jar;." FunctionalTest

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

@@ -27,7 +27,6 @@
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.Multimap;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.minio.Checksum;
 import io.minio.Http;
 import io.minio.Signer;
@@ -127,9 +126,9 @@ private MinioAdminClient(
     this.httpClient = httpClient;
   }
 
-  private Credentials getCredentials() {
+  private Credentials getCredentials() throws MinioException {
     Credentials creds = provider.fetch();
-    if (creds == null) throw new RuntimeException("Credential provider returns null credential");
+    if (creds == null) throw new MinioException("Credential provider returns null credential");
     return creds;
   }
 
@@ -216,7 +215,7 @@ private Response httpExecute(
 
     if (response.isSuccessful()) return response;
 
-    throw new RuntimeException("Request failed with response: " + response.body().string());
+    throw new MinioException("Request failed with response: " + response.body().string());
   }
 
   private Response execute(
@@ -890,7 +889,6 @@ public void setTimeout(long connectTimeout, long writeTimeout, long readTimeout)
    *
    * @throws MinioException thrown to indicate SDK exception.
    */
-  @SuppressFBWarnings(value = "SIC", justification = "Should not be used in production anyways.")
   public void ignoreCertCheck() throws MinioException {
     this.httpClient = Http.disableCertCheck(this.httpClient);
   }

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

@@ -108,14 +108,14 @@ private A newInstance() {
           }
         }
 
-        throw new RuntimeException(
+        throw new IllegalStateException(
             this.getClass().getEnclosingClass() + " must have no argument constructor");
       } catch (InstantiationException
           | IllegalAccessException
           | InvocationTargetException
           | SecurityException e) {
         // Args class must have no argument constructor with at least protected access.
-        throw new RuntimeException(e);
+        throw new IllegalStateException(e);
       }
     }
 

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

@@ -79,7 +79,8 @@ public abstract class BaseS3Client implements AutoCloseable {
     try {
       RequestBody.create(new byte[] {}, null);
     } catch (NoSuchMethodError ex) {
-      throw new RuntimeException("Unsupported OkHttp library found. Must use okhttp >= 4.11.0", ex);
+      throw new IllegalStateException(
+          "Unsupported OkHttp library found. Must use okhttp >= 4.11.0", ex);
     }
   }
 
@@ -162,9 +163,6 @@ public void setTimeout(long connectTimeout, long writeTimeout, long readTimeout)
    *
    * @throws MinioException thrown to indicate SDK exception.
    */
-  @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
-      value = "SIC",
-      justification = "Should not be used in production anyways.")
   public void ignoreCertCheck() throws MinioException {
     this.httpClient = Http.disableCertCheck(this.httpClient);
   }

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

@@ -33,7 +33,7 @@ public ByteBufferPool(int capacity, long bufferSize) {
     // Optionally pre-fill
     for (int i = 0; i < capacity - 1; i++) {
       if (!pool.offer(new ByteBuffer(bufferSize))) {
-        throw new RuntimeException("unable to allocate byte buffer; this should not happen");
+        throw new IllegalStateException("unable to allocate byte buffer; this should not happen");
       }
     }
   }
@@ -52,7 +52,7 @@ public void put(ByteBuffer buffer) {
       buffer.reset();
       if (!pool.offer(buffer)) return; // ignore if pool is full
     } catch (MinioException e) {
-      throw new RuntimeException(e);
+      throw new IllegalStateException(e);
     }
   }
 }

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

@@ -624,17 +624,14 @@ public static OkHttpClient newDefaultClient() {
     try {
       return enableExternalCertificatesFromEnv(client);
     } catch (MinioException e) {
-      throw new RuntimeException(e);
+      throw new IllegalStateException(e);
     }
   }
 
   /**
    * Disables TLS certificate check as a special case for self-signed certificate and testing to the
    * specified HTTP client.
    */
-  @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
-      value = "SIC",
-      justification = "Should not be used in production anyways.")
   public static OkHttpClient disableCertCheck(OkHttpClient client) throws MinioException {
     try {
       final TrustManager[] trustAllCerts =

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

@@ -1271,7 +1271,7 @@ public Iterator<Result<ListAllMyBucketsResult.Bucket>> iterator() {
           private ListAllMyBucketsResult result = null;
           private Result<ListAllMyBucketsResult.Bucket> error = null;
           private Iterator<ListAllMyBucketsResult.Bucket> iterator = null;
-          private boolean completed = false;
+          private volatile boolean completed = false;
 
           private synchronized void populate() {
             if (completed) return;
@@ -1851,7 +1851,7 @@ private CompletableFuture<List<UploadPartResponse>> uploadPartsParallelly(
                         }
                       });
               if (result == null) {
-                throw new RuntimeException(
+                throw new IllegalStateException(
                     "uploadExecutor.submit() returns null; this should not happen");
               }
             }
@@ -3675,15 +3675,15 @@ public void throwMinioException(CompletionException e) throws MinioException {
     Throwable ex = e.getCause();
     if (ex instanceof MinioException) throw (MinioException) ex;
     Throwable exc = ex.getCause();
-    throw new RuntimeException(exc != null ? exc : ex);
+    throw new IllegalStateException(exc != null ? exc : ex);
   }
 
   private abstract class ObjectIterator implements Iterator<Result<Item>> {
     protected Result<Item> error;
     protected Iterator<? extends Item> itemIterator;
     protected Iterator<ListVersionsResult.DeleteMarker> deleteMarkerIterator;
     protected Iterator<ListObjectsResult.Prefix> prefixIterator;
-    protected boolean completed = false;
+    protected volatile boolean completed = false;
     protected ListObjectsResult listObjectsResult;
     protected String lastObjectName;
 

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

@@ -1917,9 +1917,6 @@ public void setTimeout(long connectTimeout, long writeTimeout, long readTimeout)
    *
    * @throws MinioException thrown to indicate SDK exception.
    */
-  @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
-      value = "SIC",
-      justification = "Should not be used in production anyways.")
   public void ignoreCertCheck() throws MinioException {
     asyncClient.ignoreCertCheck();
   }

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

@@ -213,7 +213,7 @@ public Map<String, String> formData(@Nonnull Credentials creds, @Nonnull String
     try {
       policyBytes = objectMapper.writeValueAsString(policyMap).getBytes(StandardCharsets.UTF_8);
     } catch (JsonProcessingException e) {
-      throw new RuntimeException(e);
+      throw new IllegalStateException(e);
     }
 
     String policy = Base64.getEncoder().encodeToString(policyBytes);