Skip to content

Commit

Permalink
Upgrade gradle, gradle dependencies and project dependencies
Browse files Browse the repository at this point in the history
* Gradle v8.1.1
* OkHttp v4.11.0
* Guava v32.0.0
* Jackson v2.15.2
* Apache Commons Compress v1.23.0

Fixes minio#1453

Signed-off-by: Bala.FA <[email protected]>
  • Loading branch information
balamurugana committed Jun 2, 2023
1 parent 5c8d783 commit ed78986
Show file tree
Hide file tree
Showing 14 changed files with 1,398 additions and 536 deletions.
14 changes: 10 additions & 4 deletions adminapi/src/main/java/io/minio/admin/MinioAdminClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,9 @@ public void addUser(
@Nullable String secretKey,
@Nullable String policyName,
@Nullable List<String> memberOf)
throws NoSuchAlgorithmException, InvalidKeyException, IOException,
throws NoSuchAlgorithmException,
InvalidKeyException,
IOException,
InvalidCipherTextException {
if (accessKey == null || accessKey.isEmpty()) {
throw new IllegalArgumentException("access key must be provided");
Expand Down Expand Up @@ -270,7 +272,9 @@ public UserInfo getUserInfo(String accessKey)
* @throws InvalidCipherTextException thrown to indicate data cannot be encrypted/decrypted.
*/
public Map<String, UserInfo> listUsers()
throws NoSuchAlgorithmException, InvalidKeyException, IOException,
throws NoSuchAlgorithmException,
InvalidKeyException,
IOException,
InvalidCipherTextException {
try (Response response = execute(Method.GET, Command.LIST_USERS, null, null)) {
Credentials creds = getCredentials();
Expand Down Expand Up @@ -438,8 +442,10 @@ public long getBucketQuota(String bucketName)
OBJECT_MAPPER
.getTypeFactory()
.constructMapType(HashMap.class, String.class, JsonNode.class);
return OBJECT_MAPPER.<Map<String, JsonNode>>readValue(response.body().bytes(), mapType)
.entrySet().stream()
return OBJECT_MAPPER
.<Map<String, JsonNode>>readValue(response.body().bytes(), mapType)
.entrySet()
.stream()
.filter(entry -> "quota".equals(entry.getKey()))
.findFirst()
.map(entry -> Long.valueOf(entry.getValue().toString()))
Expand Down
424 changes: 318 additions & 106 deletions api/src/main/java/io/minio/MinioAsyncClient.java

Large diffs are not rendered by default.

601 changes: 451 additions & 150 deletions api/src/main/java/io/minio/MinioClient.java

Large diffs are not rendered by default.

14 changes: 11 additions & 3 deletions api/src/main/java/io/minio/Result.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit ed78986

Please sign in to comment.