diff --git a/adminapi/src/main/java/io/minio/admin/MinioAdminClient.java b/adminapi/src/main/java/io/minio/admin/MinioAdminClient.java index a2ab37789..a25adcd4c 100644 --- a/adminapi/src/main/java/io/minio/admin/MinioAdminClient.java +++ b/adminapi/src/main/java/io/minio/admin/MinioAdminClient.java @@ -225,7 +225,9 @@ public void addUser( @Nullable String secretKey, @Nullable String policyName, @Nullable List memberOf) - throws NoSuchAlgorithmException, InvalidKeyException, IOException, + throws NoSuchAlgorithmException, + InvalidKeyException, + IOException, InvalidCipherTextException { if (accessKey == null || accessKey.isEmpty()) { throw new IllegalArgumentException("access key must be provided"); @@ -270,7 +272,9 @@ public UserInfo getUserInfo(String accessKey) * @throws InvalidCipherTextException thrown to indicate data cannot be encrypted/decrypted. */ public Map listUsers() - throws NoSuchAlgorithmException, InvalidKeyException, IOException, + throws NoSuchAlgorithmException, + InvalidKeyException, + IOException, InvalidCipherTextException { try (Response response = execute(Method.GET, Command.LIST_USERS, null, null)) { Credentials creds = getCredentials(); @@ -438,8 +442,10 @@ public long getBucketQuota(String bucketName) OBJECT_MAPPER .getTypeFactory() .constructMapType(HashMap.class, String.class, JsonNode.class); - return OBJECT_MAPPER.>readValue(response.body().bytes(), mapType) - .entrySet().stream() + return OBJECT_MAPPER + .>readValue(response.body().bytes(), mapType) + .entrySet() + .stream() .filter(entry -> "quota".equals(entry.getKey())) .findFirst() .map(entry -> Long.valueOf(entry.getValue().toString())) diff --git a/api/src/main/java/io/minio/MinioAsyncClient.java b/api/src/main/java/io/minio/MinioAsyncClient.java index 8c028a740..4cd0786ba 100644 --- a/api/src/main/java/io/minio/MinioAsyncClient.java +++ b/api/src/main/java/io/minio/MinioAsyncClient.java @@ -204,8 +204,12 @@ protected MinioAsyncClient(MinioAsyncClient client) { * @see StatObjectResponse */ public CompletableFuture statObject(StatObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return super.statObjectAsync(args); } @@ -234,8 +238,12 @@ public CompletableFuture statObject(StatObjectArgs args) * @see GetObjectResponse */ public CompletableFuture getObject(GetObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); args.validateSsec(this.baseUrl); return executeGetAsync( @@ -311,8 +319,12 @@ private void downloadObject( * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture downloadObject(DownloadObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { String filename = args.filename(); Path filePath = Paths.get(filename); if (!args.overwrite() && Files.exists(filePath)) { @@ -445,8 +457,12 @@ public CompletableFuture downloadObject(DownloadObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture copyObject(CopyObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); args.validateSse(this.baseUrl); @@ -556,8 +572,12 @@ private CompletableFuture uploadPartCopy( int partNumber, Multimap headers, Part[] parts) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return uploadPartCopyAsync(bucketName, region, objectName, uploadId, partNumber, headers, null) .thenApply( uploadPartCopyResponse -> { @@ -621,8 +641,12 @@ private CompletableFuture uploadPartCopy( * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture composeObject(ComposeObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); args.validateSse(this.baseUrl); List sources = args.sources(); @@ -915,9 +939,15 @@ public CompletableFuture composeObject(ComposeObjectArgs ar * @throws ServerException */ public String getPresignedObjectUrl(GetPresignedObjectUrlArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - XmlParserException, ServerException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + XmlParserException, + ServerException { checkArgs(args); byte[] body = @@ -1014,9 +1044,15 @@ public String getPresignedObjectUrl(GetPresignedObjectUrlArgs args) * @see PostPolicy */ public Map getPresignedPostFormData(PostPolicy policy) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { if (provider == null) { throw new IllegalArgumentException( "Anonymous access does not require presigned post form-data"); @@ -1072,8 +1108,12 @@ public Map getPresignedPostFormData(PostPolicy policy) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture removeObject(RemoveObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync( args, @@ -1247,8 +1287,12 @@ public void remove() { * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture restoreObject(RestoreObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePostAsync(args, null, newMultimap("restore", ""), args.request()) .thenAccept(response -> response.close()); @@ -1325,8 +1369,12 @@ public Iterable> listObjects(ListObjectsArgs args) { * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture> listBuckets() - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return listBuckets(ListBucketsArgs.builder().build()); } @@ -1347,8 +1395,12 @@ public CompletableFuture> listBuckets() * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture> listBuckets(ListBucketsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeGetAsync(args, null, null) .thenApply( response -> { @@ -1382,8 +1434,12 @@ public CompletableFuture> listBuckets(ListBucketsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture bucketExists(BucketExistsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeHeadAsync(args, null, null) .exceptionally( e -> { @@ -1450,8 +1506,12 @@ public CompletableFuture bucketExists(BucketExistsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture makeBucket(MakeBucketArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); String region = args.region(); @@ -1507,8 +1567,12 @@ public CompletableFuture makeBucket(MakeBucketArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketVersioning(SetBucketVersioningArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync(args, null, newMultimap("versioning", ""), args.config(), 0) .thenAccept(response -> response.close()); @@ -1534,8 +1598,12 @@ public CompletableFuture setBucketVersioning(SetBucketVersioningArgs args) */ public CompletableFuture getBucketVersioning( GetBucketVersioningArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("versioning", "")) .thenApply( @@ -1570,8 +1638,12 @@ public CompletableFuture getBucketVersioning( * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setObjectLockConfiguration(SetObjectLockConfigurationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync(args, null, newMultimap("object-lock", ""), args.config(), 0) .thenAccept(response -> response.close()); @@ -1596,8 +1668,12 @@ public CompletableFuture setObjectLockConfiguration(SetObjectLockConfigura */ public CompletableFuture deleteObjectLockConfiguration( DeleteObjectLockConfigurationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync( args, null, newMultimap("object-lock", ""), new ObjectLockConfiguration(), 0) @@ -1624,8 +1700,12 @@ args, null, newMultimap("object-lock", ""), new ObjectLockConfiguration(), 0) */ public CompletableFuture getObjectLockConfiguration( GetObjectLockConfigurationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("object-lock", "")) .thenApply( @@ -1665,8 +1745,12 @@ public CompletableFuture getObjectLockConfiguration( * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setObjectRetention(SetObjectRetentionArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("retention", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -1703,8 +1787,12 @@ public CompletableFuture setObjectRetention(SetObjectRetentionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture getObjectRetention(GetObjectRetentionArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("retention", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -1766,8 +1854,12 @@ public CompletableFuture getObjectRetention(GetObjectRetentionArgs ar * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture enableObjectLegalHold(EnableObjectLegalHoldArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("legal-hold", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -1797,8 +1889,12 @@ public CompletableFuture enableObjectLegalHold(EnableObjectLegalHoldArgs a * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture disableObjectLegalHold(DisableObjectLegalHoldArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("legal-hold", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -1829,8 +1925,12 @@ public CompletableFuture disableObjectLegalHold(DisableObjectLegalHoldArgs * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture isObjectLegalHoldEnabled(IsObjectLegalHoldEnabledArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("legal-hold", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -1889,8 +1989,12 @@ public CompletableFuture isObjectLegalHoldEnabled(IsObjectLegalHoldEnab * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture removeBucket(RemoveBucketArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync(args, null, null) .thenAccept(response -> regionCache.remove(args.bucket())); @@ -1950,8 +2054,12 @@ public CompletableFuture removeBucket(RemoveBucketArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture putObject(PutObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); args.validateSse(this.baseUrl); return putObjectAsync( @@ -1992,8 +2100,12 @@ public CompletableFuture putObject(PutObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture uploadObject(UploadObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); args.validateSse(this.baseUrl); final RandomAccessFile file = new RandomAccessFile(args.filename(), "r"); @@ -2049,8 +2161,12 @@ public CompletableFuture uploadObject(UploadObjectArgs args * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture getBucketPolicy(GetBucketPolicyArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("policy", "")) .exceptionally( @@ -2153,8 +2269,12 @@ public CompletableFuture getBucketPolicy(GetBucketPolicyArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketPolicy(SetBucketPolicyArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync( args, @@ -2184,8 +2304,12 @@ public CompletableFuture setBucketPolicy(SetBucketPolicyArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteBucketPolicy(DeleteBucketPolicyArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync(args, null, newMultimap("policy", "")) .exceptionally( @@ -2246,8 +2370,12 @@ public CompletableFuture deleteBucketPolicy(DeleteBucketPolicyArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketLifecycle(SetBucketLifecycleArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync(args, null, newMultimap("lifecycle", ""), args.config(), 0) .thenAccept(response -> response.close()); @@ -2271,8 +2399,12 @@ public CompletableFuture setBucketLifecycle(SetBucketLifecycleArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteBucketLifecycle(DeleteBucketLifecycleArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync(args, null, newMultimap("lifecycle", "")) .thenAccept(response -> response.close()); @@ -2298,8 +2430,12 @@ public CompletableFuture deleteBucketLifecycle(DeleteBucketLifecycleArgs a * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture getBucketLifecycle(GetBucketLifecycleArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("lifecycle", "")) .exceptionally( @@ -2357,8 +2493,12 @@ public CompletableFuture getBucketLifecycle(GetBucketLif */ public CompletableFuture getBucketNotification( GetBucketNotificationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("notification", "")) .thenApply( @@ -2407,8 +2547,12 @@ public CompletableFuture getBucketNotification( * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketNotification(SetBucketNotificationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync(args, null, newMultimap("notification", ""), args.config(), 0) .thenAccept(response -> response.close()); @@ -2432,8 +2576,12 @@ public CompletableFuture setBucketNotification(SetBucketNotificationArgs a * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteBucketNotification(DeleteBucketNotificationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync( args, null, newMultimap("notification", ""), new NotificationConfiguration(), 0) @@ -2460,8 +2608,12 @@ args, null, newMultimap("notification", ""), new NotificationConfiguration(), 0) */ public CompletableFuture getBucketReplication( GetBucketReplicationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("replication", "")) .exceptionally( @@ -2540,8 +2692,12 @@ public CompletableFuture getBucketReplication( * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketReplication(SetBucketReplicationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync( args, @@ -2572,8 +2728,12 @@ public CompletableFuture setBucketReplication(SetBucketReplicationArgs arg * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteBucketReplication(DeleteBucketReplicationArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync(args, null, newMultimap("replication", "")) .thenAccept(response -> response.close()); @@ -2620,9 +2780,15 @@ public CompletableFuture deleteBucketReplication(DeleteBucketReplicationAr */ public CloseableIterator> listenBucketNotification( ListenBucketNotificationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { checkArgs(args); Multimap queryParams = @@ -2689,9 +2855,15 @@ public CloseableIterator> listenBucketNotification( * @throws XmlParserException thrown to indicate XML parsing error. */ public SelectResponseStream selectObjectContent(SelectObjectContentArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { checkArgs(args); args.validateSsec(this.baseUrl); Response response = null; @@ -2735,8 +2907,12 @@ public SelectResponseStream selectObjectContent(SelectObjectContentArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketEncryption(SetBucketEncryptionArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync(args, null, newMultimap("encryption", ""), args.config(), 0) .thenAccept(response -> response.close()); @@ -2761,8 +2937,12 @@ public CompletableFuture setBucketEncryption(SetBucketEncryptionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture getBucketEncryption(GetBucketEncryptionArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("encryption", "")) .exceptionally( @@ -2818,8 +2998,12 @@ public CompletableFuture getBucketEncryption(GetBucketEncrypti * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteBucketEncryption(DeleteBucketEncryptionArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync(args, null, newMultimap("encryption", "")) .exceptionally( @@ -2868,8 +3052,12 @@ public CompletableFuture deleteBucketEncryption(DeleteBucketEncryptionArgs * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture getBucketTags(GetBucketTagsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeGetAsync(args, null, newMultimap("tagging", "")) .exceptionally( @@ -2925,8 +3113,12 @@ public CompletableFuture getBucketTags(GetBucketTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setBucketTags(SetBucketTagsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executePutAsync(args, null, newMultimap("tagging", ""), args.tags(), 0) .thenAccept(response -> response.close()); @@ -2950,8 +3142,12 @@ public CompletableFuture setBucketTags(SetBucketTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteBucketTags(DeleteBucketTagsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return executeDeleteAsync(args, null, newMultimap("tagging", "")) .thenAccept(response -> response.close()); @@ -2976,8 +3172,12 @@ public CompletableFuture deleteBucketTags(DeleteBucketTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture getObjectTags(GetObjectTagsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("tagging", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -3019,8 +3219,12 @@ public CompletableFuture getObjectTags(GetObjectTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture setObjectTags(SetObjectTagsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("tagging", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -3046,8 +3250,12 @@ public CompletableFuture setObjectTags(SetObjectTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public CompletableFuture deleteObjectTags(DeleteObjectTagsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); Multimap queryParams = newMultimap("tagging", ""); if (args.versionId() != null) queryParams.put("versionId", args.versionId()); @@ -3088,8 +3296,12 @@ public CompletableFuture deleteObjectTags(DeleteObjectTagsArgs args) */ public CompletableFuture uploadSnowballObjects( UploadSnowballObjectsArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); return CompletableFuture.supplyAsync( diff --git a/api/src/main/java/io/minio/MinioClient.java b/api/src/main/java/io/minio/MinioClient.java index 70094ad9e..6d4ed3e91 100644 --- a/api/src/main/java/io/minio/MinioClient.java +++ b/api/src/main/java/io/minio/MinioClient.java @@ -158,9 +158,15 @@ protected MinioClient(MinioClient client) { * @see StatObjectResponse */ public StatObjectResponse statObject(StatObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.statObject(args).get(); } catch (InterruptedException e) { @@ -202,9 +208,15 @@ public StatObjectResponse statObject(StatObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public GetObjectResponse getObject(GetObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getObject(args).get(); } catch (InterruptedException e) { @@ -240,9 +252,15 @@ public GetObjectResponse getObject(GetObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void downloadObject(DownloadObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.downloadObject(args).get(); } catch (InterruptedException e) { @@ -366,9 +384,15 @@ public void downloadObject(DownloadObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public ObjectWriteResponse copyObject(CopyObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.copyObject(args).get(); } catch (InterruptedException e) { @@ -437,9 +461,15 @@ public ObjectWriteResponse copyObject(CopyObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public ObjectWriteResponse composeObject(ComposeObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.composeObject(args).get(); } catch (InterruptedException e) { @@ -509,9 +539,15 @@ public ObjectWriteResponse composeObject(ComposeObjectArgs args) * @throws ServerException */ public String getPresignedObjectUrl(GetPresignedObjectUrlArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - XmlParserException, ServerException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + XmlParserException, + ServerException { return asyncClient.getPresignedObjectUrl(args); } @@ -574,9 +610,15 @@ public String getPresignedObjectUrl(GetPresignedObjectUrlArgs args) * @see PostPolicy */ public Map getPresignedPostFormData(PostPolicy policy) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { return asyncClient.getPresignedPostFormData(policy); } @@ -618,9 +660,15 @@ public Map getPresignedPostFormData(PostPolicy policy) * @throws XmlParserException thrown to indicate XML parsing error. */ public void removeObject(RemoveObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.removeObject(args).get(); } catch (InterruptedException e) { @@ -690,9 +738,15 @@ public Iterable> removeObjects(RemoveObjectsArgs args) { * @throws XmlParserException thrown to indicate XML parsing error. */ public void restoreObject(RestoreObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.restoreObject(args).get(); } catch (InterruptedException e) { @@ -771,9 +825,15 @@ public Iterable> listObjects(ListObjectsArgs args) { * @throws XmlParserException thrown to indicate XML parsing error. */ public List listBuckets() - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.listBuckets().get(); } catch (InterruptedException e) { @@ -807,9 +867,15 @@ public List listBuckets() * @throws XmlParserException thrown to indicate XML parsing error. */ public List listBuckets(ListBucketsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.listBuckets(args).get(); } catch (InterruptedException e) { @@ -846,9 +912,15 @@ public List listBuckets(ListBucketsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public boolean bucketExists(BucketExistsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.bucketExists(args).get(); } catch (InterruptedException e) { @@ -897,9 +969,15 @@ public boolean bucketExists(BucketExistsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void makeBucket(MakeBucketArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.makeBucket(args).get(); } catch (InterruptedException e) { @@ -929,9 +1007,15 @@ public void makeBucket(MakeBucketArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketVersioning(SetBucketVersioningArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketVersioning(args).get(); } catch (InterruptedException e) { @@ -963,9 +1047,15 @@ public void setBucketVersioning(SetBucketVersioningArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public VersioningConfiguration getBucketVersioning(GetBucketVersioningArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketVersioning(args).get(); } catch (InterruptedException e) { @@ -998,9 +1088,15 @@ public VersioningConfiguration getBucketVersioning(GetBucketVersioningArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setObjectLockConfiguration(SetObjectLockConfigurationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setObjectLockConfiguration(args).get(); } catch (InterruptedException e) { @@ -1030,9 +1126,15 @@ public void setObjectLockConfiguration(SetObjectLockConfigurationArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteObjectLockConfiguration(DeleteObjectLockConfigurationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteObjectLockConfiguration(args).get(); } catch (InterruptedException e) { @@ -1067,9 +1169,15 @@ public void deleteObjectLockConfiguration(DeleteObjectLockConfigurationArgs args * @throws XmlParserException thrown to indicate XML parsing error. */ public ObjectLockConfiguration getObjectLockConfiguration(GetObjectLockConfigurationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getObjectLockConfiguration(args).get(); } catch (InterruptedException e) { @@ -1107,9 +1215,15 @@ public ObjectLockConfiguration getObjectLockConfiguration(GetObjectLockConfigura * @throws XmlParserException thrown to indicate XML parsing error. */ public void setObjectRetention(SetObjectRetentionArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setObjectRetention(args).get(); } catch (InterruptedException e) { @@ -1146,9 +1260,15 @@ public void setObjectRetention(SetObjectRetentionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public Retention getObjectRetention(GetObjectRetentionArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getObjectRetention(args).get(); } catch (InterruptedException e) { @@ -1183,9 +1303,15 @@ public Retention getObjectRetention(GetObjectRetentionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void enableObjectLegalHold(EnableObjectLegalHoldArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.enableObjectLegalHold(args).get(); } catch (InterruptedException e) { @@ -1219,9 +1345,15 @@ public void enableObjectLegalHold(EnableObjectLegalHoldArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void disableObjectLegalHold(DisableObjectLegalHoldArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.disableObjectLegalHold(args).get(); } catch (InterruptedException e) { @@ -1263,9 +1395,15 @@ public void disableObjectLegalHold(DisableObjectLegalHoldArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public boolean isObjectLegalHoldEnabled(IsObjectLegalHoldEnabledArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.isObjectLegalHoldEnabled(args).get(); } catch (InterruptedException e) { @@ -1295,9 +1433,15 @@ public boolean isObjectLegalHoldEnabled(IsObjectLegalHoldEnabledArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void removeBucket(RemoveBucketArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.removeBucket(args).get(); } catch (InterruptedException e) { @@ -1364,9 +1508,15 @@ public void removeBucket(RemoveBucketArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public ObjectWriteResponse putObject(PutObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.putObject(args).get(); } catch (InterruptedException e) { @@ -1409,9 +1559,15 @@ public ObjectWriteResponse putObject(PutObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public ObjectWriteResponse uploadObject(UploadObjectArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.uploadObject(args).get(); } catch (InterruptedException e) { @@ -1444,9 +1600,16 @@ public ObjectWriteResponse uploadObject(UploadObjectArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public String getBucketPolicy(GetBucketPolicyArgs args) - throws BucketPolicyTooLargeException, ErrorResponseException, InsufficientDataException, - InternalException, InvalidKeyException, InvalidResponseException, IOException, - NoSuchAlgorithmException, ServerException, XmlParserException { + throws BucketPolicyTooLargeException, + ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketPolicy(args).get(); } catch (InterruptedException e) { @@ -1499,9 +1662,15 @@ public String getBucketPolicy(GetBucketPolicyArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketPolicy(SetBucketPolicyArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketPolicy(args).get(); } catch (InterruptedException e) { @@ -1530,9 +1699,15 @@ public void setBucketPolicy(SetBucketPolicyArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteBucketPolicy(DeleteBucketPolicyArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteBucketPolicy(args).get(); } catch (InterruptedException e) { @@ -1574,9 +1749,15 @@ public void deleteBucketPolicy(DeleteBucketPolicyArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketLifecycle(SetBucketLifecycleArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketLifecycle(args).get(); } catch (InterruptedException e) { @@ -1605,9 +1786,15 @@ public void setBucketLifecycle(SetBucketLifecycleArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteBucketLifecycle(DeleteBucketLifecycleArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteBucketLifecycle(args).get(); } catch (InterruptedException e) { @@ -1640,9 +1827,15 @@ public void deleteBucketLifecycle(DeleteBucketLifecycleArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public LifecycleConfiguration getBucketLifecycle(GetBucketLifecycleArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketLifecycle(args).get(); } catch (InterruptedException e) { @@ -1675,9 +1868,15 @@ public LifecycleConfiguration getBucketLifecycle(GetBucketLifecycleArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public NotificationConfiguration getBucketNotification(GetBucketNotificationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketNotification(args).get(); } catch (InterruptedException e) { @@ -1724,9 +1923,15 @@ public NotificationConfiguration getBucketNotification(GetBucketNotificationArgs * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketNotification(SetBucketNotificationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketNotification(args).get(); } catch (InterruptedException e) { @@ -1756,9 +1961,15 @@ public void setBucketNotification(SetBucketNotificationArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteBucketNotification(DeleteBucketNotificationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteBucketNotification(args).get(); } catch (InterruptedException e) { @@ -1790,9 +2001,15 @@ public void deleteBucketNotification(DeleteBucketNotificationArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public ReplicationConfiguration getBucketReplication(GetBucketReplicationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketReplication(args).get(); } catch (InterruptedException e) { @@ -1846,9 +2063,15 @@ public ReplicationConfiguration getBucketReplication(GetBucketReplicationArgs ar * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketReplication(SetBucketReplicationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketReplication(args).get(); } catch (InterruptedException e) { @@ -1878,9 +2101,15 @@ public void setBucketReplication(SetBucketReplicationArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteBucketReplication(DeleteBucketReplicationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteBucketReplication(args).get(); } catch (InterruptedException e) { @@ -1931,9 +2160,15 @@ public void deleteBucketReplication(DeleteBucketReplicationArgs args) */ public CloseableIterator> listenBucketNotification( ListenBucketNotificationArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { return asyncClient.listenBucketNotification(args); } @@ -1983,9 +2218,15 @@ public CloseableIterator> listenBucketNotification( * @throws XmlParserException thrown to indicate XML parsing error. */ public SelectResponseStream selectObjectContent(SelectObjectContentArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { return asyncClient.selectObjectContent(args); } @@ -2009,9 +2250,15 @@ public SelectResponseStream selectObjectContent(SelectObjectContentArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketEncryption(SetBucketEncryptionArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketEncryption(args).get(); } catch (InterruptedException e) { @@ -2043,9 +2290,15 @@ public void setBucketEncryption(SetBucketEncryptionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public SseConfiguration getBucketEncryption(GetBucketEncryptionArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketEncryption(args).get(); } catch (InterruptedException e) { @@ -2076,9 +2329,15 @@ public SseConfiguration getBucketEncryption(GetBucketEncryptionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteBucketEncryption(DeleteBucketEncryptionArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteBucketEncryption(args).get(); } catch (InterruptedException e) { @@ -2109,9 +2368,15 @@ public void deleteBucketEncryption(DeleteBucketEncryptionArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public Tags getBucketTags(GetBucketTagsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getBucketTags(args).get(); } catch (InterruptedException e) { @@ -2145,9 +2410,15 @@ public Tags getBucketTags(GetBucketTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setBucketTags(SetBucketTagsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setBucketTags(args).get(); } catch (InterruptedException e) { @@ -2176,9 +2447,15 @@ public void setBucketTags(SetBucketTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteBucketTags(DeleteBucketTagsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteBucketTags(args).get(); } catch (InterruptedException e) { @@ -2210,9 +2487,15 @@ public void deleteBucketTags(DeleteBucketTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public Tags getObjectTags(GetObjectTagsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.getObjectTags(args).get(); } catch (InterruptedException e) { @@ -2250,9 +2533,15 @@ public Tags getObjectTags(GetObjectTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void setObjectTags(SetObjectTagsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.setObjectTags(args).get(); } catch (InterruptedException e) { @@ -2282,9 +2571,15 @@ public void setObjectTags(SetObjectTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public void deleteObjectTags(DeleteObjectTagsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { asyncClient.deleteObjectTags(args).get(); } catch (InterruptedException e) { @@ -2329,9 +2624,15 @@ public void deleteObjectTags(DeleteObjectTagsArgs args) * @throws XmlParserException thrown to indicate XML parsing error. */ public ObjectWriteResponse uploadSnowballObjects(UploadSnowballObjectsArgs args) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return asyncClient.uploadSnowballObjects(args).get(); } catch (InterruptedException e) { diff --git a/api/src/main/java/io/minio/Result.java b/api/src/main/java/io/minio/Result.java index 0b3b3cc50..58405185d 100644 --- a/api/src/main/java/io/minio/Result.java +++ b/api/src/main/java/io/minio/Result.java @@ -45,9 +45,17 @@ public Result(Exception ex) { /** Returns given Type if exception is null, else respective exception is thrown. */ public T get() - throws ErrorResponseException, IllegalArgumentException, InsufficientDataException, - InternalException, InvalidKeyException, InvalidResponseException, IOException, - JsonMappingException, JsonParseException, NoSuchAlgorithmException, ServerException, + throws ErrorResponseException, + IllegalArgumentException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + JsonMappingException, + JsonParseException, + NoSuchAlgorithmException, + ServerException, XmlParserException { if (ex == null) { return type; diff --git a/api/src/main/java/io/minio/S3Base.java b/api/src/main/java/io/minio/S3Base.java index aba3b0c9c..60e18fc0e 100644 --- a/api/src/main/java/io/minio/S3Base.java +++ b/api/src/main/java/io/minio/S3Base.java @@ -211,9 +211,15 @@ protected Multimap newMultimap(Multimap map) { /** Throws encapsulated exception wrapped by {@link ExecutionException}. */ public void throwEncapsulatedException(ExecutionException e) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { if (e == null) return; Throwable ex = e.getCause(); @@ -471,8 +477,12 @@ protected CompletableFuture executeAsync( Multimap queryParamMap, Object body, int length) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { boolean traceRequestBody = false; if (body != null && !(body instanceof PartSource || body instanceof byte[])) { byte[] bytes; @@ -702,8 +712,12 @@ protected CompletableFuture executeAsync( Multimap queryParams, Object body, int length) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { final String bucketName; final String region; final String objectName; @@ -761,9 +775,15 @@ protected Response execute( Multimap queryParamMap, Object body, int length) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { CompletableFuture completableFuture = executeAsync(method, bucketName, objectName, region, headers, queryParamMap, body, length); try { @@ -789,9 +809,15 @@ protected Response execute( Multimap queryParams, Object body, int length) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { String bucketName = null; String region = null; String objectName = null; @@ -816,8 +842,12 @@ protected Response execute( /** Returns region of given bucket either from region cache or set in constructor. */ protected CompletableFuture getRegionAsync(String bucketName, String region) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { if (region != null) { // Error out if region does not match with region passed via constructor. if (this.region != null && !this.region.equals(region)) { @@ -868,9 +898,15 @@ protected CompletableFuture getRegionAsync(String bucketName, String reg */ @Deprecated protected String getRegion(String bucketName, String region) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return getRegionAsync(bucketName, region).get(); } catch (InterruptedException e) { @@ -884,8 +920,12 @@ protected String getRegion(String bucketName, String region) /** Execute asynchronously GET HTTP request for given parameters. */ protected CompletableFuture executeGetAsync( BaseArgs args, Multimap headers, Multimap queryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeAsync(Method.GET, args, headers, queryParams, null, 0); } @@ -897,9 +937,15 @@ protected CompletableFuture executeGetAsync( @Deprecated protected Response executeGet( BaseArgs args, Multimap headers, Multimap queryParams) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return executeGetAsync(args, headers, queryParams).get(); } catch (InterruptedException e) { @@ -913,8 +959,12 @@ protected Response executeGet( /** Execute asynchronously HEAD HTTP request for given parameters. */ protected CompletableFuture executeHeadAsync( BaseArgs args, Multimap headers, Multimap queryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeAsync(Method.HEAD, args, headers, queryParams, null, 0) .exceptionally( e -> { @@ -953,9 +1003,15 @@ protected CompletableFuture executeHeadAsync( @Deprecated protected Response executeHead( BaseArgs args, Multimap headers, Multimap queryParams) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return executeHeadAsync(args, headers, queryParams).get(); } catch (InterruptedException e) { @@ -969,8 +1025,12 @@ protected Response executeHead( /** Execute asynchronously DELETE HTTP request for given parameters. */ protected CompletableFuture executeDeleteAsync( BaseArgs args, Multimap headers, Multimap queryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeAsync(Method.DELETE, args, headers, queryParams, null, 0) .thenApply( response -> { @@ -987,9 +1047,15 @@ protected CompletableFuture executeDeleteAsync( @Deprecated protected Response executeDelete( BaseArgs args, Multimap headers, Multimap queryParams) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return executeDeleteAsync(args, headers, queryParams).get(); } catch (InterruptedException e) { @@ -1006,8 +1072,12 @@ protected CompletableFuture executePostAsync( Multimap headers, Multimap queryParams, Object data) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeAsync(Method.POST, args, headers, queryParams, data, 0); } @@ -1022,9 +1092,15 @@ protected Response executePost( Multimap headers, Multimap queryParams, Object data) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return executePostAsync(args, headers, queryParams, data).get(); } catch (InterruptedException e) { @@ -1042,8 +1118,12 @@ protected CompletableFuture executePutAsync( Multimap queryParams, Object data, int length) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return executeAsync(Method.PUT, args, headers, queryParams, data, length); } @@ -1059,9 +1139,15 @@ protected Response executePut( Multimap queryParams, Object data, int length) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return executePutAsync(args, headers, queryParams, data, length).get(); } catch (InterruptedException e) { @@ -1073,8 +1159,12 @@ protected Response executePut( } protected CompletableFuture calculatePartCountAsync(List sources) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { long[] objectSize = {0}; int index = 0; @@ -1159,9 +1249,15 @@ protected CompletableFuture calculatePartCountAsync(List /** Calculate part count of given compose sources. */ @Deprecated protected int calculatePartCount(List sources) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { long objectSize = 0; int partCount = 0; int i = 0; @@ -1251,9 +1347,15 @@ private abstract class ObjectIterator implements Iterator> { protected String lastObjectName; protected abstract void populateResult() - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException; + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException; protected synchronized void populate() { try { @@ -1368,9 +1470,15 @@ public Iterator> iterator() { @Override protected void populateResult() - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, - NoSuchAlgorithmException, ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { this.listObjectsResult = null; this.itemIterator = null; this.prefixIterator = null; @@ -1407,9 +1515,15 @@ public Iterator> iterator() { @Override protected void populateResult() - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, - NoSuchAlgorithmException, ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { this.listObjectsResult = null; this.itemIterator = null; this.prefixIterator = null; @@ -1446,9 +1560,15 @@ public Iterator> iterator() { @Override protected void populateResult() - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, - NoSuchAlgorithmException, ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { this.listObjectsResult = null; this.itemIterator = null; this.prefixIterator = null; @@ -1498,9 +1618,15 @@ protected ObjectWriteResponse putObject( long partSize, int partCount, String contentType) - throws ErrorResponseException, InsufficientDataException, InternalException, - InvalidKeyException, InvalidResponseException, IOException, NoSuchAlgorithmException, - ServerException, XmlParserException { + throws ErrorResponseException, + InsufficientDataException, + InternalException, + InvalidKeyException, + InvalidResponseException, + IOException, + NoSuchAlgorithmException, + ServerException, + XmlParserException { try { return putObjectAsync(args, data, objectSize, partSize, partCount, contentType).get(); } catch (InterruptedException e) { @@ -1710,8 +1836,12 @@ public void disableVirtualStyleEndpoint() { /** Execute stat object asynchronously. */ protected CompletableFuture statObjectAsync(StatObjectArgs args) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { checkArgs(args); args.validateSsec(baseUrl); return executeHeadAsync( @@ -1750,8 +1880,12 @@ protected CompletableFuture abortMultipartUploadAs String uploadId, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return getRegionAsync(bucketName, region) .thenCompose( location -> { @@ -1816,8 +1950,14 @@ protected AbortMultipartUploadResponse abortMultipartUpload( String uploadId, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return abortMultipartUploadAsync( @@ -1859,8 +1999,12 @@ protected CompletableFuture completeMultipartUploadAsync( Part[] parts, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = newMultimap(extraQueryParams); queryParams.put(UPLOAD_ID, uploadId); return getRegionAsync(bucketName, region) @@ -1969,8 +2113,14 @@ protected ObjectWriteResponse completeMultipartUpload( Part[] parts, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return completeMultipartUploadAsync( @@ -2008,8 +2158,12 @@ protected CompletableFuture createMultipartUpload String objectName, Multimap headers, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = newMultimap(extraQueryParams); queryParams.put("uploads", ""); @@ -2086,8 +2240,14 @@ protected CreateMultipartUploadResponse createMultipartUpload( String objectName, Multimap headers, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return createMultipartUploadAsync(bucketName, region, objectName, headers, extraQueryParams) @@ -2128,8 +2288,12 @@ protected CompletableFuture deleteObjectsAsync( boolean bypassGovernanceMode, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { if (objectList == null) objectList = new LinkedList<>(); if (objectList.size() > 1000) { @@ -2223,8 +2387,14 @@ protected DeleteObjectsResponse deleteObjects( boolean bypassGovernanceMode, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return deleteObjectsAsync( @@ -2281,8 +2451,12 @@ protected CompletableFuture listObjectsV2Async( boolean includeUserMetadata, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = merge( extraQueryParams, @@ -2371,9 +2545,15 @@ protected ListObjectsV2Response listObjectsV2( boolean includeUserMetadata, Multimap extraHeaders, Multimap extraQueryParams) - throws InvalidKeyException, NoSuchAlgorithmException, InsufficientDataException, - ServerException, XmlParserException, ErrorResponseException, InternalException, - InvalidResponseException, IOException { + throws InvalidKeyException, + NoSuchAlgorithmException, + InsufficientDataException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, + InvalidResponseException, + IOException { try { return listObjectsV2Async( bucketName, @@ -2428,8 +2608,12 @@ protected CompletableFuture listObjectsV1Async( String prefix, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = merge( extraQueryParams, @@ -2508,8 +2692,14 @@ protected ListObjectsV1Response listObjectsV1( String prefix, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return listObjectsV1Async( @@ -2565,8 +2755,12 @@ protected CompletableFuture listObjectVersionsAsync( String versionIdMarker, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = merge( extraQueryParams, @@ -2651,8 +2845,14 @@ protected ListObjectVersionsResponse listObjectVersions( String versionIdMarker, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return listObjectVersionsAsync( @@ -2677,8 +2877,14 @@ protected ListObjectVersionsResponse listObjectVersions( private Part[] uploadParts( PutObjectBaseArgs args, String uploadId, PartReader partReader, PartSource firstPartSource) - throws InterruptedException, ExecutionException, InsufficientDataException, InternalException, - InvalidKeyException, IOException, NoSuchAlgorithmException, XmlParserException { + throws InterruptedException, + ExecutionException, + InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Part[] parts = new Part[ObjectWriteArgs.MAX_MULTIPART_COUNT]; int partNumber = 0; PartSource partSource = firstPartSource; @@ -2716,8 +2922,12 @@ private CompletableFuture putMultipartObjectAsync( Multimap headers, PartReader partReader, PartSource firstPartSource) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return CompletableFuture.supplyAsync( () -> { String uploadId = null; @@ -2806,8 +3016,12 @@ protected CompletableFuture putObjectAsync( long partSize, int partCount, String contentType) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { PartReader partReader = newPartReader(data, objectSize, partSize, partCount); if (partReader == null) { throw new IllegalArgumentException("data must be RandomAccessFile or InputStream"); @@ -2875,8 +3089,12 @@ private CompletableFuture putObjectAsync( PartSource partSource, Multimap headers, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return getRegionAsync(bucketName, region) .thenCompose( location -> { @@ -2941,8 +3159,12 @@ protected CompletableFuture putObjectAsync( long length, Multimap headers, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { if (!(data instanceof InputStream || data instanceof RandomAccessFile || data instanceof byte[] @@ -3027,8 +3249,14 @@ protected ObjectWriteResponse putObject( long length, Multimap headers, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return putObjectAsync(bucketName, region, objectName, data, length, headers, extraQueryParams) @@ -3075,8 +3303,12 @@ protected CompletableFuture listMultipartUploadsAs String uploadIdMarker, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = merge( extraQueryParams, @@ -3169,8 +3401,14 @@ protected ListMultipartUploadsResponse listMultipartUploads( String uploadIdMarker, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return listMultipartUploadsAsync( @@ -3222,8 +3460,12 @@ protected CompletableFuture listPartsAsync( String uploadId, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { Multimap queryParams = merge( extraQueryParams, @@ -3307,8 +3549,14 @@ protected ListPartsResponse listParts( String uploadId, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return listPartsAsync( @@ -3358,8 +3606,12 @@ protected CompletableFuture uploadPartAsync( String uploadId, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return getRegionAsync(bucketName, region) .thenCompose( location -> { @@ -3433,8 +3685,12 @@ protected CompletableFuture uploadPartAsync( int partNumber, Multimap extraHeaders, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { if (!(data instanceof InputStream || data instanceof RandomAccessFile || data instanceof byte[] @@ -3535,8 +3791,14 @@ protected UploadPartResponse uploadPart( int partNumber, Multimap extraHeaders, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return uploadPartAsync( @@ -3591,8 +3853,14 @@ protected UploadPartCopyResponse uploadPartCopy( int partNumber, Multimap headers, Multimap extraQueryParams) - throws NoSuchAlgorithmException, InsufficientDataException, IOException, InvalidKeyException, - ServerException, XmlParserException, ErrorResponseException, InternalException, + throws NoSuchAlgorithmException, + InsufficientDataException, + IOException, + InvalidKeyException, + ServerException, + XmlParserException, + ErrorResponseException, + InternalException, InvalidResponseException { try { return uploadPartCopyAsync( @@ -3634,8 +3902,12 @@ protected CompletableFuture uploadPartCopyAsync( int partNumber, Multimap headers, Multimap extraQueryParams) - throws InsufficientDataException, InternalException, InvalidKeyException, IOException, - NoSuchAlgorithmException, XmlParserException { + throws InsufficientDataException, + InternalException, + InvalidKeyException, + IOException, + NoSuchAlgorithmException, + XmlParserException { return getRegionAsync(bucketName, region) .thenCompose( location -> { diff --git a/build.gradle b/build.gradle index bdf578a38..773f6a7d5 100644 --- a/build.gradle +++ b/build.gradle @@ -14,16 +14,16 @@ * limitations under the License. */ -/***************************/ -/* gradleVersion = '7.6' */ -/***************************/ +/*****************************/ +/* gradleVersion = '8.1.1' */ +/*****************************/ plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" - id "com.github.spotbugs" version "5.0.13" + id "com.github.johnrengelman.shadow" version "8.1.1" + id "com.github.spotbugs" version "5.0.14" id "io.codearte.nexus-staging" version "0.30.0" id "de.marcphilipp.nexus-publish" version "0.4.0" - id "com.diffplug.spotless" version "6.12.0" + id "com.diffplug.spotless" version "6.19.0" } /* @@ -52,17 +52,17 @@ subprojects { dependencies { api "com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" - api "com.google.guava:guava:30.1.1-jre" - api "com.squareup.okhttp3:okhttp:4.10.0" - api "com.fasterxml.jackson.core:jackson-annotations:2.13.4" - api "com.fasterxml.jackson.core:jackson-core:2.13.4" - api "com.fasterxml.jackson.core:jackson-databind:2.13.4.2" - api "org.bouncycastle:bcprov-jdk15on:1.69" - api 'org.apache.commons:commons-compress:1.21' - api "org.xerial.snappy:snappy-java:1.1.8.4" - compileOnly "com.github.spotbugs:spotbugs-annotations:4.1.2" - - testImplementation "com.squareup.okhttp3:mockwebserver:4.8.1" + api "com.google.guava:guava:32.0.0-jre" + api "com.squareup.okhttp3:okhttp:4.11.0" + api "com.fasterxml.jackson.core:jackson-annotations:2.15.2" + api "com.fasterxml.jackson.core:jackson-core:2.15.2" + api "com.fasterxml.jackson.core:jackson-databind:2.15.2" + api "org.bouncycastle:bcprov-jdk15on:1.70" + api 'org.apache.commons:commons-compress:1.23.0' + api "org.xerial.snappy:snappy-java:1.1.10.0" + compileOnly "com.github.spotbugs:spotbugs-annotations:4.7.3" + + testImplementation "com.squareup.okhttp3:mockwebserver:4.11.0" testImplementation "junit:junit:4.13.2" } @@ -116,7 +116,7 @@ subprojects { target '**/*.java' importOrder 'edu', 'com', 'io', 'java', 'javax', 'org', '' removeUnusedImports() - googleJavaFormat('1.7') + googleJavaFormat('1.17.0') } groovyGradle { target '*.gradle' @@ -242,7 +242,7 @@ project(':adminapi') { dependencies { api project(':api') - api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4" + api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2" testImplementation project(':api') } @@ -346,10 +346,13 @@ project(':adminapi') { project(':examples') { dependencies { - compileOnly "me.tongfei:progressbar:0.5.3" + compileOnly "me.tongfei:progressbar:0.9.5" compileOnly project(':api') } + compileJava.dependsOn spotlessGroovyGradle, spotlessJava + spotbugsMain.dependsOn compileTestJava, jar, localeTest, spotlessGroovyGradle, spotlessJava + sourceSets { main { java { @@ -368,6 +371,9 @@ project(':functional') { implementation project(':adminapi') } + compileJava.dependsOn spotlessGroovyGradle, spotlessJava + spotbugsMain.dependsOn compileTestJava, jar, localeTest, spotlessGroovyGradle, spotlessJava + sourceSets { main { java { diff --git a/examples/GetObjectProgressBar.java b/examples/GetObjectProgressBar.java index 2975247ef..33ef9041b 100644 --- a/examples/GetObjectProgressBar.java +++ b/examples/GetObjectProgressBar.java @@ -29,7 +29,6 @@ import java.nio.file.StandardOpenOption; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import me.tongfei.progressbar.ProgressBarStyle; public class GetObjectProgressBar { /** MinioClient.getObjectProgressBar() example. */ @@ -66,7 +65,6 @@ public static void main(String[] args) InputStream is = new ProgressStream( "Downloading .. ", - ProgressBarStyle.ASCII, stat.size(), minioClient.getObject( GetObjectArgs.builder().bucket("my-bucketname").object("my-objectname").build())); diff --git a/examples/ProgressStream.java b/examples/ProgressStream.java index ec29d9741..28de24252 100644 --- a/examples/ProgressStream.java +++ b/examples/ProgressStream.java @@ -17,7 +17,6 @@ import java.io.IOException; import java.io.InputStream; import me.tongfei.progressbar.ProgressBar; -import me.tongfei.progressbar.ProgressBarStyle; public class ProgressStream extends InputStream { private InputStream in; @@ -29,12 +28,11 @@ public class ProgressStream extends InputStream { * input. * * @param msg Custom message string. - * @param style Custom progress bar style. * @param stream InputStream to be wrapped. * @throws IOException For any exception generated by the InputStream. */ - public ProgressStream(String msg, ProgressBarStyle style, InputStream stream) throws IOException { - this(msg, style, (long) stream.available(), stream); + public ProgressStream(String msg, InputStream stream) throws IOException { + this(msg, (long) stream.available(), stream); } /** @@ -43,21 +41,18 @@ public ProgressStream(String msg, ProgressBarStyle style, InputStream stream) th * input. * * @param msg Custom message string. - * @param style Custom progress bar style. * @param size Size of the progress bar. * @param stream InputStream to be wrapped. * @throws IOException For any exception generated by the InputStream. */ - public ProgressStream(String msg, ProgressBarStyle style, long size, InputStream stream) - throws IOException { + public ProgressStream(String msg, long size, InputStream stream) throws IOException { super(); // Allocate the reader. this.in = stream; // Initialize progress bar. - this.pb = new ProgressBar(msg, size, style); - this.pb.start(); + this.pb = new ProgressBar(msg, size); } @Override @@ -67,7 +62,6 @@ public int available() throws IOException { @Override public void close() throws IOException { - this.pb.stop(); this.in.close(); return; } diff --git a/examples/PutObjectProgressBar.java b/examples/PutObjectProgressBar.java index 837f97133..557a20c15 100644 --- a/examples/PutObjectProgressBar.java +++ b/examples/PutObjectProgressBar.java @@ -24,7 +24,6 @@ import java.io.InputStream; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; -import me.tongfei.progressbar.ProgressBarStyle; public class PutObjectProgressBar { /** MinioClient.putObjectProgressBar() example. */ @@ -49,8 +48,7 @@ public static void main(String[] args) File file = new File("my-filename"); InputStream pis = - new BufferedInputStream( - new ProgressStream("Uploading... ", ProgressBarStyle.ASCII, new FileInputStream(file))); + new BufferedInputStream(new ProgressStream("Uploading... ", new FileInputStream(file))); minioClient.putObject( PutObjectArgs.builder().bucket(bucketName).object(objectName).stream( pis, pis.available(), -1) diff --git a/functional/FunctionalTest.java b/functional/FunctionalTest.java index 1fc1b1d89..d2c06abe9 100644 --- a/functional/FunctionalTest.java +++ b/functional/FunctionalTest.java @@ -866,7 +866,9 @@ public static void putObject() throws Exception { testPutObject( "[object name ends with '/']", - PutObjectArgs.builder().bucket(bucketName).object("path/to/" + getRandomName() + "/") + PutObjectArgs.builder() + .bucket(bucketName) + .object("path/to/" + getRandomName() + "/") .stream(new ContentInputStream(0), 0, -1) .contentType(customContentType) .build(), @@ -1781,7 +1783,9 @@ public static void testCopyObject( client.makeBucket(MakeBucketArgs.builder().bucket(args.source().bucket()).build()); try { PutObjectArgs.Builder builder = - PutObjectArgs.builder().bucket(args.source().bucket()).object(args.source().object()) + PutObjectArgs.builder() + .bucket(args.source().bucket()) + .object(args.source().object()) .stream(new ContentInputStream(1 * KB), 1 * KB, -1); if (sse != null) { builder.sse(sse); diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c02..943f0cbfa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 070cb702f..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0c8..65dcd68d6 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd32c..93e3f59f1 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal