add java 11 support and remove java 9/10 support (#1049)

minio · Sep 21, 2020 · ac5dde0 · ac5dde0
1 parent 7963fe7
commit ac5dde0
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        java-version: ['8.0.x', '9.0.x', '10.0.x']
+        java-version: ['8.0.x', '11.0.x']
         os: [ubuntu-latest, windows-latest]
 
     steps:

diff --git a/api/src/main/java/io/minio/MinioClient.java b/api/src/main/java/io/minio/MinioClient.java
@@ -2915,7 +2915,7 @@ public String presignedPutObject(String bucketName, String objectName)
    * }</pre>
    *
    * @param policy Post policy of an object.
-   * @return Map&ltString, String&gt - Contains form-data to upload an object using POST method.
+   * @return {@code Map<String, String>} - Contains form-data to upload an object using POST method.
    * @throws ErrorResponseException thrown to indicate S3 service returned an error response.
    * @throws IllegalArgumentException throws to indicate invalid argument passed.
    * @throws InsufficientDataException thrown to indicate not enough data available in InputStream.
@@ -3047,7 +3047,7 @@ public void removeObject(RemoveObjectArgs args)
    *
    * @param bucketName Name of the bucket.
    * @param objectNames List of Object names in the bucket.
-   * @return Iterable&ltResult&ltDeleteError&gt&gt - Lazy iterator contains object removal status.
+   * @return {@code Iterable<Result<DeleteError>>} - Lazy iterator contains object removal status.
    * @deprecated use {@link #removeObjects(RemoveObjectsArgs)}
    */
   @Deprecated
@@ -3083,7 +3083,7 @@ public Iterable<Result<DeleteError>> removeObjects(
    * }</pre>
    *
    * @param args {@link RemoveObjectsArgs} object.
-   * @return Iterable&ltResult&ltDeleteError&gt&gt - Lazy iterator contains object removal status.
+   * @return {@code Iterable<Result<DeleteError>>} - Lazy iterator contains object removal status.
    */
   public Iterable<Result<DeleteError>> removeObjects(RemoveObjectsArgs args) {
     checkArgs(args);
@@ -3215,7 +3215,7 @@ public void remove() {
    * }</pre>
    *
    * @param bucketName Name of the bucket.
-   * @return Iterable&ltResult&ltItem&gt&gt - Lazy iterator contains object information.
+   * @return {@code Iterable<Result<Item>>} - Lazy iterator contains object information.
    * @throws XmlParserException upon parsing response xml
    * @deprecated use {@link #listObjects(ListObjectsArgs)}
    */
@@ -3238,7 +3238,7 @@ public Iterable<Result<Item>> listObjects(final String bucketName) throws XmlPar
    *
    * @param bucketName Name of the bucket.
    * @param prefix Object name starts with prefix.
-   * @return Iterable&ltResult&ltItem&gt&gt - Lazy iterator contains object information.
+   * @return {@code Iterable<Result<Item>>} - Lazy iterator contains object information.
    * @throws XmlParserException upon parsing response xml
    * @deprecated use {@link #listObjects(ListObjectsArgs)}
    */
@@ -3265,7 +3265,7 @@ public Iterable<Result<Item>> listObjects(final String bucketName, final String
    * @param bucketName Name of the bucket.
    * @param prefix Object name starts with prefix.
    * @param recursive List recursively than directory structure emulation.
-   * @return Iterable&ltResult&ltItem&gt&gt - Lazy iterator contains object information.
+   * @return {@code Iterable<Result<Item>>} - Lazy iterator contains object information.
    * @see #listObjects(String bucketName)
    * @see #listObjects(String bucketName, String prefix)
    * @see #listObjects(String bucketName, String prefix, boolean recursive, boolean useVersion1)
@@ -3294,7 +3294,7 @@ public Iterable<Result<Item>> listObjects(
    * @param prefix Object name starts with prefix.
    * @param recursive List recursively than directory structure emulation.
    * @param useVersion1 when true, version 1 of REST API is used.
-   * @return Iterable&ltResult&ltItem&gt&gt - Lazy iterator contains object information.
+   * @return {@code Iterable<Result<Item>>} - Lazy iterator contains object information.
    * @see #listObjects(String bucketName)
    * @see #listObjects(String bucketName, String prefix)
    * @see #listObjects(String bucketName, String prefix, boolean recursive)
@@ -3329,7 +3329,7 @@ public Iterable<Result<Item>> listObjects(
    * @param includeUserMetadata include user metadata of each object. This is MinIO specific
    *     extension to ListObjectsV2.
    * @param useVersion1 when true, version 1 of REST API is used.
-   * @return Iterable&ltResult&ltItem&gt&gt - Lazy iterator contains object information.
+   * @return {@code Iterable<Result<Item>>} - Lazy iterator contains object information.
    * @see #listObjects(String bucketName)
    * @see #listObjects(String bucketName, String prefix)
    * @see #listObjects(String bucketName, String prefix, boolean recursive)
@@ -3392,7 +3392,7 @@ public Iterable<Result<Item>> listObjects(
    * }</pre>
    *
    * @param args Instance of {@link ListObjectsArgs} built using the builder
-   * @return Iterable&lt;Result&lt;Item&gt;&gt; - Lazy iterator contains object information.
+   * @return {@code Iterable<Result<Item>>} - Lazy iterator contains object information.
    * @throws XmlParserException upon parsing response xml
    */
   public Iterable<Result<Item>> listObjects(ListObjectsArgs args) {
@@ -3670,7 +3670,7 @@ protected void populateResult()
    * }
    * }</pre>
    *
-   * @return List&ltBucket&gt - List of bucket information.
+   * @return {@code List<Bucket>} - List of bucket information.
    * @throws ErrorResponseException thrown to indicate S3 service returned an error response.
    * @throws IllegalArgumentException throws to indicate invalid argument passed.
    * @throws InsufficientDataException thrown to indicate not enough data available in InputStream.
@@ -3702,7 +3702,7 @@ public List<Bucket> listBuckets()
    * }
    * }</pre>
    *
-   * @return List&ltBucket&gt - List of bucket information.
+   * @return {@code List<Bucket>} - List of bucket information.
    * @throws ErrorResponseException thrown to indicate S3 service returned an error response.
    * @throws IllegalArgumentException throws to indicate invalid argument passed.
    * @throws InsufficientDataException thrown to indicate not enough data available in InputStream.
@@ -5831,7 +5831,7 @@ public void deleteBucketReplication(DeleteBucketReplicationArgs args)
    * }</pre>
    *
    * @param bucketName Name of the bucket.
-   * @return Iterable&ltResult&ltUpload&gt&gt - Lazy iterator contains object upload information.
+   * @return {@code Iterable<Result<Upload>>} - Lazy iterator contains object upload information.
    * @see #listIncompleteUploads(String, String, boolean)
    */
   @Deprecated
@@ -5854,7 +5854,7 @@ public Iterable<Result<Upload>> listIncompleteUploads(String bucketName)
    *
    * @param bucketName Name of the bucket.
    * @param prefix Object name starts with prefix.
-   * @return Iterable&ltResult&ltUpload&gt&gt - Lazy iterator contains object upload information.
+   * @return {@code Iterable<Result<Upload>>} - Lazy iterator contains object upload information.
    * @throws XmlParserException upon parsing response xml
    * @see #listIncompleteUploads(String, String, boolean)
    */
@@ -5879,7 +5879,7 @@ public Iterable<Result<Upload>> listIncompleteUploads(String bucketName, String
    * @param bucketName Name of the bucket.
    * @param prefix Object name starts with prefix.
    * @param recursive List recursively than directory structure emulation.
-   * @return Iterable&ltResult&ltUpload&gt&gt - Lazy iterator contains object upload information.
+   * @return {@code Iterable<Result<Upload>>} - Lazy iterator contains object upload information.
    * @see #listIncompleteUploads(String bucketName)
    * @see #listIncompleteUploads(String bucketName, String prefix)
    */
@@ -6244,7 +6244,7 @@ public void removeIncompleteUpload(String bucketName, String objectName)
    * @param prefix Listen events of object starts with prefix.
    * @param suffix Listen events of object ends with suffix.
    * @param events Events to listen.
-   * @return CloseableIterator&ltResult&ltNotificationRecords&gt&gt - Lazy closable iterator
+   * @return {@code CloseableIterator<Result<NotificationRecords>>} - Lazy closable iterator
    *     contains event records.
    * @throws ErrorResponseException thrown to indicate S3 service returned an error response.
    * @throws IllegalArgumentException throws to indicate invalid argument passed.
@@ -6302,7 +6302,7 @@ public CloseableIterator<Result<NotificationRecords>> listenBucketNotification(
    * }</pre>
    *
    * @param args {@link ListenBucketNotificationArgs} object.
-   * @return CloseableIterator&ltResult&ltNotificationRecords&gt&gt - Lazy closable iterator
+   * @return {@code CloseableIterator<Result<NotificationRecords>>} - Lazy closable iterator
    *     contains event records.
    * @throws ErrorResponseException thrown to indicate S3 service returned an error response.
    * @throws IllegalArgumentException throws to indicate invalid argument passed.

diff --git a/build.gradle b/build.gradle
@@ -168,7 +168,11 @@ project(':api') {
 
     javadoc.options {
         encoding = 'UTF-8'
-        links 'https://docs.oracle.com/javase/8/docs/api/'
+        if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+            links 'https://docs.oracle.com/javase/8/docs/api/'
+        } else {
+            links 'https://docs.oracle.com/en/java/javase/11/docs/api/'
+        }
     }
 
     // Disable JavaDoc doclint on Java 8. It's annoying.

diff --git a/spotbugs-filter.xml b/spotbugs-filter.xml
@@ -4,4 +4,8 @@
   <Match>
     <Bug code="NP" />
   </Match>
+  <!-- False positive in java 11: Redundant nullcheck of value known to be non-null. -->
+  <Match>
+    <Bug code="RCN" />
+  </Match>
 </FindBugsFilter>