Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set prefix, delimiter params even when empty #749

Merged
merged 1 commit into from
Feb 10, 2019
Merged

Set prefix, delimiter params even when empty #749

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 29 additions & 5 deletions api/src/main/java/io/minio/MinioClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Minio Java SDK for Amazon S3 Compatible Cloud Storage,
* (C) 2015, 2016, 2017 Minio, Inc.
* (C) 2015, 2016, 2017, 2018, 2019 Minio, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -3019,10 +3019,14 @@ private ListBucketResult listObjectsV2(String bucketName, String continuationTok

if (prefix != null) {
queryParamMap.put("prefix", prefix);
} else {
queryParamMap.put("prefix", "");
}

if (delimiter != null) {
queryParamMap.put("delimiter", delimiter);
} else {
queryParamMap.put("delimiter", "");
}

HttpResponse response = executeGet(bucketName, null, null, queryParamMap);
Expand Down Expand Up @@ -3186,10 +3190,14 @@ private ListBucketResultV1 listObjectsV1(String bucketName, String marker, Strin

if (prefix != null) {
queryParamMap.put("prefix", prefix);
} else {
queryParamMap.put("prefix", "");
}

if (delimiter != null) {
queryParamMap.put("delimiter", delimiter);
} else {
queryParamMap.put("delimiter", "");
}

HttpResponse response = executeGet(bucketName, null, null, queryParamMap);
Expand Down Expand Up @@ -4672,10 +4680,26 @@ private ListMultipartUploadsResult listIncompleteUploads(String bucketName, Stri
Map<String,String> queryParamMap = new HashMap<>();
queryParamMap.put("uploads", "");
queryParamMap.put("max-uploads", Integer.toString(maxUploads));
queryParamMap.put("prefix", prefix);
queryParamMap.put("key-marker", keyMarker);
queryParamMap.put("upload-id-marker", uploadIdMarker);
queryParamMap.put("delimiter", delimiter);

if (prefix != null) {
queryParamMap.put("prefix", prefix);
} else {
queryParamMap.put("prefix", "");
}

if (delimiter != null) {
queryParamMap.put("delimiter", delimiter);
} else {
queryParamMap.put("delimiter", "");
}

if (keyMarker != null) {
queryParamMap.put("key-marker", keyMarker);
}

if (uploadIdMarker != null) {
queryParamMap.put("upload-id-marker", uploadIdMarker);
}

HttpResponse response = executeGet(bucketName, null, null, queryParamMap);

Expand Down