Skip to content

API review changes. #5681

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

Merged
sima-zhu merged 3 commits into from
Oct 3, 2019
Merged

API review changes. #5681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43f5485
API review changes.
sima-zhu Oct 3, 2019
bd7e1f8
Addrssed feedback
sima-zhu Oct 3, 2019
b242372
Fix linting
sima-zhu Oct 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions ...age/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import com.azure.storage.blob.specialized.BlobServiceSasQueryParameters;
import com.azure.storage.blob.specialized.BlobServiceSasSignatureValues;
import com.azure.storage.common.Constants;
import com.azure.storage.common.IPRange;
import com.azure.storage.common.IpRange;
import com.azure.storage.common.SASProtocol;
import com.azure.storage.common.Utility;
import com.azure.storage.common.credentials.SharedKeyCredential;
Expand Down Expand Up @@ -817,12 +817,12 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @return A string that represents the SAS token
*/
public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, String accountName,
BlobContainerSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
SASProtocol sasProtocol, IPRange ipRange) {
SASProtocol sasProtocol, IpRange ipRange) {
return this.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime, startTime,
version, sasProtocol, ipRange, null /* cacheControl */, null /* contentDisposition */, null /*
contentEncoding */, null /* contentLanguage */, null /* contentType */);
Expand All @@ -833,7 +833,7 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
*
* <p><strong>Code Samples</strong></p>
*
* {@codesnippet com.azure.storage.blob.BlobContainerAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
* {@codesnippet com.azure.storage.blob.BlobContainerAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* <p>For more information, see the
* <a href="https://docs.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas">Azure
Expand All @@ -846,7 +846,7 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @param cacheControl An optional {@code String} cache-control header for the SAS.
* @param contentDisposition An optional {@code String} content-disposition header for the SAS.
* @param contentEncoding An optional {@code String} content-encoding header for the SAS.
Expand All @@ -855,9 +855,9 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @return A string that represents the SAS token
*/
public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, String accountName,
BlobContainerSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
SASProtocol sasProtocol, IPRange ipRange, String cacheControl, String contentDisposition,
String contentEncoding, String contentLanguage, String contentType) {
BlobContainerSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
SASProtocol sasProtocol, IpRange ipRange, String cacheControl, String contentDisposition,
String contentEncoding, String contentLanguage, String contentType) {
BlobServiceSasSignatureValues blobServiceSASSignatureValues = new BlobServiceSasSignatureValues(version,
sasProtocol, startTime, expiryTime, permissions == null ? null : permissions.toString(), ipRange,
null /* identifier*/, cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
Expand Down Expand Up @@ -905,11 +905,11 @@ public String generateSAS(String identifier) {
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @return A string that represents the SAS token
*/
public String generateSAS(String identifier, BlobContainerSasPermission permissions, OffsetDateTime expiryTime,
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IPRange ipRange) {
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IpRange ipRange) {
return this.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange, null
/* cacheControl */, null /* contentDisposition */, null /* contentEncoding */, null /* contentLanguage */,
null /*contentType*/);
Expand All @@ -920,7 +920,7 @@ public String generateSAS(String identifier, BlobContainerSasPermission permissi
*
* <p><strong>Code Samples</strong></p>
*
* {@codesnippet com.azure.storage.blob.BlobContainerAsyncClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
* {@codesnippet com.azure.storage.blob.BlobContainerAsyncClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* <p>For more information, see the
* <a href="https://docs.microsoft.com/en-us/rest/api/storageservices/create-service-sas">Azure Docs</a></p>
Expand All @@ -931,7 +931,7 @@ public String generateSAS(String identifier, BlobContainerSasPermission permissi
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @param cacheControl An optional {@code String} cache-control header for the SAS.
* @param contentDisposition An optional {@code String} content-disposition header for the SAS.
* @param contentEncoding An optional {@code String} content-encoding header for the SAS.
Expand All @@ -940,8 +940,8 @@ public String generateSAS(String identifier, BlobContainerSasPermission permissi
* @return A string that represents the SAS token
*/
public String generateSAS(String identifier, BlobContainerSasPermission permissions, OffsetDateTime expiryTime,
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IPRange ipRange, String cacheControl,
String contentDisposition, String contentEncoding, String contentLanguage, String contentType) {
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IpRange ipRange, String cacheControl,
String contentDisposition, String contentEncoding, String contentLanguage, String contentType) {
BlobServiceSasSignatureValues blobServiceSASSignatureValues = new BlobServiceSasSignatureValues(version,
sasProtocol, startTime, expiryTime, permissions == null ? null : permissions.toString(), ipRange,
identifier, cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
Expand Down
28 changes: 14 additions & 14 deletions sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobContainerClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.azure.storage.blob.models.SignedIdentifier;
import com.azure.storage.blob.models.StorageAccountInfo;
import com.azure.storage.blob.models.UserDelegationKey;
import com.azure.storage.common.IPRange;
import com.azure.storage.common.IpRange;
import com.azure.storage.common.SASProtocol;
import com.azure.storage.common.Utility;
import reactor.core.publisher.Mono;
Expand Down Expand Up @@ -558,12 +558,12 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @return A string that represents the SAS token
*/
public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, String accountName,
BlobContainerSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
SASProtocol sasProtocol, IPRange ipRange) {
SASProtocol sasProtocol, IpRange ipRange) {
return this.blobContainerAsyncClient.generateUserDelegationSAS(userDelegationKey, accountName, permissions,
expiryTime, startTime, version, sasProtocol, ipRange);
}
Expand All @@ -573,7 +573,7 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
*
* <p><strong>Code Samples</strong></p>
*
* {@codesnippet com.azure.storage.blob.BlobContainerClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
* {@codesnippet com.azure.storage.blob.BlobContainerClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* <p>For more information, see the
* <a href="https://docs.microsoft.com/en-us/rest/api/storageservices/create-user-delegation-sas">Azure
Expand All @@ -586,7 +586,7 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @param cacheControl An optional {@code String} cache-control header for the SAS.
* @param contentDisposition An optional {@code String} content-disposition header for the SAS.
* @param contentEncoding An optional {@code String} content-encoding header for the SAS.
Expand All @@ -595,9 +595,9 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @return A string that represents the SAS token
*/
public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, String accountName,
BlobContainerSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
SASProtocol sasProtocol, IPRange ipRange, String cacheControl, String contentDisposition,
String contentEncoding, String contentLanguage, String contentType) {
BlobContainerSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
SASProtocol sasProtocol, IpRange ipRange, String cacheControl, String contentDisposition,
String contentEncoding, String contentLanguage, String contentType) {
return this.blobContainerAsyncClient.generateUserDelegationSAS(userDelegationKey, accountName, permissions,
expiryTime, startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
Expand Down Expand Up @@ -633,11 +633,11 @@ public String generateSAS(String identifier) {
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @return A string that represents the SAS token
*/
public String generateSAS(String identifier, BlobContainerSasPermission permissions, OffsetDateTime expiryTime,
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IPRange ipRange) {
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IpRange ipRange) {
return this.blobContainerAsyncClient.generateSAS(identifier, permissions, expiryTime, startTime, version,
sasProtocol, ipRange);
}
Expand All @@ -647,7 +647,7 @@ public String generateSAS(String identifier, BlobContainerSasPermission permissi
*
* <p><strong>Code Samples</strong></p>
*
* {@codesnippet com.azure.storage.blob.BlobContainerClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
* {@codesnippet com.azure.storage.blob.BlobContainerClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* <p>For more information, see the
* <a href="https://docs.microsoft.com/en-us/rest/api/storageservices/create-service-sas">Azure Docs</a></p>
Expand All @@ -658,7 +658,7 @@ public String generateSAS(String identifier, BlobContainerSasPermission permissi
* @param startTime An optional {@code OffsetDateTime} start time for the SAS
* @param version An optional {@code String} version for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @param cacheControl An optional {@code String} cache-control header for the SAS.
* @param contentDisposition An optional {@code String} content-disposition header for the SAS.
* @param contentEncoding An optional {@code String} content-encoding header for the SAS.
Expand All @@ -667,8 +667,8 @@ public String generateSAS(String identifier, BlobContainerSasPermission permissi
* @return A string that represents the SAS token
*/
public String generateSAS(String identifier, BlobContainerSasPermission permissions, OffsetDateTime expiryTime,
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IPRange ipRange, String cacheControl,
String contentDisposition, String contentEncoding, String contentLanguage, String contentType) {
OffsetDateTime startTime, String version, SASProtocol sasProtocol, IpRange ipRange, String cacheControl,
String contentDisposition, String contentEncoding, String contentLanguage, String contentType) {
return this.blobContainerAsyncClient.generateSAS(identifier, permissions, expiryTime, startTime, version,
sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
}
Expand Down
10 changes: 5 additions & 5 deletions ...orage/azure-storage-blob/src/main/java/com/azure/storage/blob/BlobServiceAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import com.azure.storage.common.AccountSASResourceType;
import com.azure.storage.common.AccountSASService;
import com.azure.storage.common.AccountSASSignatureValues;
import com.azure.storage.common.IPRange;
import com.azure.storage.common.IpRange;
import com.azure.storage.common.SASProtocol;
import com.azure.storage.common.Utility;
import com.azure.storage.common.credentials.SharedKeyCredential;
Expand Down Expand Up @@ -475,7 +475,7 @@ public String generateAccountSAS(AccountSASService accountSASService, AccountSAS
*
* <p><strong>Code Samples</strong></p>
*
* {@codesnippet com.azure.storage.blob.blobServiceAsyncClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IPRange-SASProtocol}
* {@codesnippet com.azure.storage.blob.blobServiceAsyncClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IpRange-SASProtocol}
*
* <p>For more information, see the
* <a href="https://docs.microsoft.com/en-us/rest/api/storageservices/create-account-sas">Azure Docs</a></p>
Expand All @@ -486,14 +486,14 @@ public String generateAccountSAS(AccountSASService accountSASService, AccountSAS
* @param expiryTime The {@code OffsetDateTime} expiry time for the account SAS
* @param startTime The {@code OffsetDateTime} start time for the account SAS
* @param version The {@code String} version for the account SAS
* @param ipRange An optional {@code IPRange} ip address range for the SAS
* @param ipRange An optional {@code IpRange} ip address range for the SAS
* @param sasProtocol An optional {@code SASProtocol} protocol for the SAS
* @return A string that represents the SAS token
* @throws NullPointerException if {@code sharedKeyCredential} is null
*/
public String generateAccountSAS(AccountSASService accountSASService, AccountSASResourceType accountSASResourceType,
AccountSASPermission accountSASPermission, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
IPRange ipRange, SASProtocol sasProtocol) {
AccountSASPermission accountSASPermission, OffsetDateTime expiryTime, OffsetDateTime startTime,
String version, IpRange ipRange, SASProtocol sasProtocol) {

SharedKeyCredential sharedKeyCredential =
Utility.getSharedKeyCredential(this.azureBlobStorage.getHttpPipeline());
Expand Down
Loading