Azure
@@ -1031,7 +1030,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.
@@ -1040,9 +1039,9 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @return A string that represents the SAS token
*/
public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, String accountName,
- BlobSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
- SASProtocol sasProtocol, IPRange ipRange, String cacheControl, String contentDisposition,
- String contentEncoding, String contentLanguage, String contentType) {
+ BlobSasPermission 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,
@@ -1093,12 +1092,12 @@ 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
* @throws NullPointerException if {@code sharedKeyCredential} is null
*/
public String generateSAS(String identifier, BlobSasPermission 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 /* contentLanguage*/, null /* contentEncoding */, null /* contentLanguage */,
null /* contentType */);
@@ -1109,7 +1108,7 @@ public String generateSAS(String identifier, BlobSasPermission permissions, Offs
*
* Code Samples
*
- * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
+ * {@codesnippet com.azure.storage.blob.specialized.BlobAsyncClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* For more information, see the
* Azure Docs
@@ -1120,7 +1119,7 @@ public String generateSAS(String identifier, BlobSasPermission permissions, Offs
* @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.
@@ -1130,8 +1129,8 @@ public String generateSAS(String identifier, BlobSasPermission permissions, Offs
* @throws NullPointerException if {@code sharedKeyCredential} is null
*/
public String generateSAS(String identifier, BlobSasPermission 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,
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java
index 6cbea51e8576..1af4ac625d7f 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobClientBase.java
@@ -26,7 +26,7 @@
import com.azure.storage.blob.models.StorageAccountInfo;
import com.azure.storage.blob.models.StorageException;
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;
@@ -808,12 +808,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,
BlobSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
- SASProtocol sasProtocol, IPRange ipRange) {
+ SASProtocol sasProtocol, IpRange ipRange) {
return this.client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange);
}
@@ -823,7 +823,7 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
*
* Code Samples
*
- * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
+ * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* For more information, see the
* Azure
@@ -836,7 +836,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.
@@ -845,9 +845,9 @@ public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, Str
* @return A string that represents the SAS token
*/
public String generateUserDelegationSAS(UserDelegationKey userDelegationKey, String accountName,
- BlobSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
- SASProtocol sasProtocol, IPRange ipRange, String cacheControl, String contentDisposition,
- String contentEncoding, String contentLanguage, String contentType) {
+ BlobSasPermission permissions, OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
+ SASProtocol sasProtocol, IpRange ipRange, String cacheControl, String contentDisposition,
+ String contentEncoding, String contentLanguage, String contentType) {
return this.client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
@@ -883,11 +883,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, BlobSasPermission permissions, OffsetDateTime expiryTime,
- OffsetDateTime startTime, String version, SASProtocol sasProtocol, IPRange ipRange) {
+ OffsetDateTime startTime, String version, SASProtocol sasProtocol, IpRange ipRange) {
return this.client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol,
ipRange);
}
@@ -897,7 +897,7 @@ public String generateSAS(String identifier, BlobSasPermission permissions, Offs
*
* Code Samples
*
- * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String}
+ * {@codesnippet com.azure.storage.blob.specialized.BlobClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String}
*
* For more information, see the
* Azure Docs
@@ -908,7 +908,7 @@ public String generateSAS(String identifier, BlobSasPermission permissions, Offs
* @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.
@@ -917,8 +917,8 @@ public String generateSAS(String identifier, BlobSasPermission permissions, Offs
* @return A string that represents the SAS token
*/
public String generateSAS(String identifier, BlobSasPermission 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.client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol,
ipRange, cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
}
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasQueryParameters.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasQueryParameters.java
index a08f7baf11cf..7e4cdafa92cb 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasQueryParameters.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasQueryParameters.java
@@ -7,7 +7,7 @@
import com.azure.storage.blob.BlobClientBuilder;
import com.azure.storage.common.BaseSasQueryParameters;
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;
@@ -95,7 +95,7 @@ public BlobServiceSasQueryParameters(Map queryParamsMap, boole
* @param protocol A {@code String} representing the allowed HTTP protocol(s) or {@code null}.
* @param startTime A {@code java.util.Date} representing the start time for this SAS token or {@code null}.
* @param expiryTime A {@code java.util.Date} representing the expiry time for this SAS token.
- * @param ipRange A {@link IPRange} representing the range of valid IP addresses for this SAS token or
+ * @param ipRange A {@link IpRange} representing the range of valid IP addresses for this SAS token or
* {@code null}.
* @param identifier A {@code String} representing the signed identifier (only for Service SAS) or {@code null}.
* @param resource A {@code String} representing the storage container or blob (only for Service SAS).
@@ -103,7 +103,7 @@ public BlobServiceSasQueryParameters(Map queryParamsMap, boole
* @param signature A {@code String} representing the signature for the SAS token.
*/
BlobServiceSasQueryParameters(String version, SASProtocol protocol, OffsetDateTime startTime,
- OffsetDateTime expiryTime, IPRange ipRange, String identifier, String resource, String permissions,
+ OffsetDateTime expiryTime, IpRange ipRange, String identifier, String resource, String permissions,
String signature, String cacheControl, String contentDisposition, String contentEncoding,
String contentLanguage, String contentType, UserDelegationKey key) {
super(version, protocol, startTime, expiryTime, ipRange, permissions, signature);
diff --git a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasSignatureValues.java b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasSignatureValues.java
index 191558485be6..2b94450513c7 100644
--- a/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasSignatureValues.java
+++ b/sdk/storage/azure-storage-blob/src/main/java/com/azure/storage/blob/specialized/BlobServiceSasSignatureValues.java
@@ -8,7 +8,7 @@
import com.azure.storage.blob.BlobSasPermission;
import com.azure.storage.blob.models.UserDelegationKey;
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;
@@ -47,7 +47,7 @@ public final class BlobServiceSasSignatureValues {
private String permissions;
- private IPRange ipRange;
+ private IpRange ipRange;
private String canonicalName;
@@ -94,8 +94,8 @@ public BlobServiceSasSignatureValues() {
}
public BlobServiceSasSignatureValues(String version, SASProtocol sasProtocol, OffsetDateTime startTime,
- OffsetDateTime expiryTime, String permission, IPRange ipRange, String identifier, String cacheControl,
- String contentDisposition, String contentEncoding, String contentLanguage, String contentType) {
+ OffsetDateTime expiryTime, String permission, IpRange ipRange, String identifier, String cacheControl,
+ String contentDisposition, String contentEncoding, String contentLanguage, String contentType) {
if (version != null) {
this.version = version;
}
@@ -207,19 +207,19 @@ public BlobServiceSasSignatureValues setPermissions(String permissions) {
}
/**
- * @return the {@link IPRange} which determines the IP ranges that are allowed to use the SAS.
+ * @return the {@link IpRange} which determines the IP ranges that are allowed to use the SAS.
*/
- public IPRange getIpRange() {
+ public IpRange getIpRange() {
return ipRange;
}
/**
- * Sets the {@link IPRange} which determines the IP ranges that are allowed to use the SAS.
+ * Sets the {@link IpRange} which determines the IP ranges that are allowed to use the SAS.
*
* @param ipRange Allowed IP range to set
* @return the updated BlobServiceSASSignatureValues object
*/
- public BlobServiceSasSignatureValues setIpRange(IPRange ipRange) {
+ public BlobServiceSasSignatureValues setIpRange(IpRange ipRange) {
this.ipRange = ipRange;
return this;
}
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobAsyncClientJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobAsyncClientJavaDocCodeSnippets.java
index ad04d0df49c8..34da7ccad6d2 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobAsyncClientJavaDocCodeSnippets.java
@@ -16,7 +16,7 @@
import com.azure.storage.blob.models.UserDelegationKey;
import com.azure.storage.blob.specialized.BlobAsyncClientBase;
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 reactor.core.publisher.Flux;
@@ -413,10 +413,10 @@ public void getAccountInfoWithResponseCodeSnippets() {
/**
* Code snippet for {@link BlobAsyncClient#generateUserDelegationSAS(UserDelegationKey, String, BlobSasPermission,
- * OffsetDateTime, OffsetDateTime, String, SASProtocol, IPRange, String, String, String, String, String)}
+ * OffsetDateTime, OffsetDateTime, String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateUserDelegationSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -425,7 +425,7 @@ public void generateUserDelegationSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -441,15 +441,15 @@ public void generateUserDelegationSASCodeSnippets() {
String sas = client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
* Code snippet for {@link BlobAsyncClient#generateSAS(String, BlobSasPermission, OffsetDateTime, OffsetDateTime,
- * String, SASProtocol, IPRange, String, String, String, String, String)}
+ * String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobAsyncClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobAsyncClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -458,7 +458,7 @@ public void generateSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -473,7 +473,7 @@ public void generateSASCodeSnippets() {
// Note either "identifier", or "expiryTime and permissions" are required to be set
String sas = client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange,
cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobAsyncClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobAsyncClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobClientJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobClientJavaDocCodeSnippets.java
index cff0b909f69e..2f2b9b403ef0 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobClientJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobClientJavaDocCodeSnippets.java
@@ -18,7 +18,7 @@
import com.azure.storage.blob.models.UserDelegationKey;
import com.azure.storage.blob.specialized.BlobClientBase;
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 java.io.ByteArrayOutputStream;
@@ -390,10 +390,10 @@ public void getAccountInfoWithResponseCodeSnippets() {
/**
* Code snippet for {@link BlobClient#generateUserDelegationSAS(UserDelegationKey, String, BlobSasPermission,
- * OffsetDateTime, OffsetDateTime, String, SASProtocol, IPRange, String, String, String, String, String)}
+ * OffsetDateTime, OffsetDateTime, String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateUserDelegationSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -402,7 +402,7 @@ public void generateUserDelegationSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -418,15 +418,15 @@ public void generateUserDelegationSASCodeSnippets() {
String sas = client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobClient.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
* Code snippet for {@link BlobClient#generateSAS(String, BlobSasPermission, OffsetDateTime, OffsetDateTime, String,
- * SASProtocol, IPRange, String, String, String, String, String)}
+ * SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -435,7 +435,7 @@ public void generateSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -450,7 +450,7 @@ public void generateSASCodeSnippets() {
// Note either "identifier", or "expiryTime and permissions" are required to be set
String sas = client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange,
cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobClient.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerAsyncClientJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerAsyncClientJavaDocCodeSnippets.java
index ffa9e4cb9644..79b7b0aa6773 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerAsyncClientJavaDocCodeSnippets.java
@@ -14,7 +14,7 @@
import com.azure.storage.blob.models.SignedIdentifier;
import com.azure.storage.blob.models.UserDelegationKey;
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 java.time.Duration;
@@ -38,11 +38,11 @@ public class BlobContainerAsyncClientJavaDocCodeSnippets {
/**
* Code snippet for {@link BlobContainerAsyncClient#generateUserDelegationSAS(UserDelegationKey, String,
- * BlobContainerSasPermission, OffsetDateTime, OffsetDateTime, String, SASProtocol, IPRange, String, String, String,
+ * BlobContainerSasPermission, OffsetDateTime, OffsetDateTime, String, SASProtocol, IpRange, String, String, String,
* String, String)}
*/
public void generateUserDelegationSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobContainerAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobContainerAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobContainerSasPermission permissions = new BlobContainerSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -52,7 +52,7 @@ public void generateUserDelegationSASCodeSnippets() {
.setListPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -68,15 +68,15 @@ public void generateUserDelegationSASCodeSnippets() {
String sas = client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobContainerAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobContainerAsyncClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
* Code snippet for {@link BlobContainerAsyncClient#generateSAS(String, BlobContainerSasPermission, OffsetDateTime,
- * OffsetDateTime, String, SASProtocol, IPRange, String, String, String, String, String)}
+ * OffsetDateTime, String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobContainerAsyncClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobContainerAsyncClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobContainerSasPermission permissions = new BlobContainerSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -86,7 +86,7 @@ public void generateSASCodeSnippets() {
.setListPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -101,7 +101,7 @@ public void generateSASCodeSnippets() {
// Note either "identifier", or "expiryTime and permissions" are required to be set
String sas = client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange,
cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobContainerAsyncClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobContainerAsyncClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerClientJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerClientJavaDocCodeSnippets.java
index 418ad1076a5b..a26cdc9c76cc 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerClientJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobContainerClientJavaDocCodeSnippets.java
@@ -18,7 +18,7 @@
import com.azure.storage.blob.models.StorageException;
import com.azure.storage.blob.models.UserDelegationKey;
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 java.time.Duration;
@@ -40,11 +40,11 @@ public class BlobContainerClientJavaDocCodeSnippets {
/**
* Code snippet for {@link BlobContainerClient#generateUserDelegationSAS(UserDelegationKey, String,
- * BlobContainerSasPermission, OffsetDateTime, OffsetDateTime, String, SASProtocol, IPRange, String, String, String,
+ * BlobContainerSasPermission, OffsetDateTime, OffsetDateTime, String, SASProtocol, IpRange, String, String, String,
* String, String)}
*/
public void generateUserDelegationSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobContainerClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobContainerClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobContainerSasPermission permissions = new BlobContainerSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -54,7 +54,7 @@ public void generateUserDelegationSASCodeSnippets() {
.setListPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -70,15 +70,15 @@ public void generateUserDelegationSASCodeSnippets() {
String sas = client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobContainerClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobContainerClient.generateUserDelegationSAS#UserDelegationKey-String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
* Code snippet for {@link BlobContainerClient#generateSAS(String, BlobContainerSasPermission, OffsetDateTime,
- * OffsetDateTime, String, SASProtocol, IPRange, String, String, String, String, String)}
+ * OffsetDateTime, String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.BlobContainerClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.BlobContainerClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobContainerSasPermission permissions = new BlobContainerSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -88,7 +88,7 @@ public void generateSASCodeSnippets() {
.setListPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -103,7 +103,7 @@ public void generateSASCodeSnippets() {
// Note either "identifier", or "expiryTime and permissions" are required to be set
String sas = client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange,
cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
- // END: com.azure.storage.blob.BlobContainerClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.BlobContainerClient.generateSAS#String-BlobContainerSasPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceAsyncClientJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceAsyncClientJavaDocCodeSnippets.java
index b69a8f78b78c..1473724a4806 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceAsyncClientJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceAsyncClientJavaDocCodeSnippets.java
@@ -15,7 +15,7 @@
import com.azure.storage.common.AccountSASResourceType;
import com.azure.storage.common.AccountSASService;
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 java.time.OffsetDateTime;
import java.util.Collections;
@@ -31,10 +31,10 @@ public class BlobServiceAsyncClientJavaDocCodeSnippets {
/**
* Generates a code sample for using {@link BlobServiceAsyncClient#generateAccountSAS(AccountSASService,
- * AccountSASResourceType, AccountSASPermission, OffsetDateTime, OffsetDateTime, String, IPRange, SASProtocol)}
+ * AccountSASResourceType, AccountSASPermission, OffsetDateTime, OffsetDateTime, String, IpRange, SASProtocol)}
*/
public void generateAccountSAS() {
- // BEGIN: com.azure.storage.blob.blobServiceAsyncClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IPRange-SASProtocol
+ // BEGIN: com.azure.storage.blob.blobServiceAsyncClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IpRange-SASProtocol
AccountSASService service = new AccountSASService()
.setBlob(true)
.setFile(true)
@@ -55,7 +55,7 @@ public void generateAccountSAS() {
.setUpdatePermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -63,7 +63,7 @@ public void generateAccountSAS() {
String sas = client.generateAccountSAS(service, resourceType, permission, expiryTime, startTime, version,
ipRange, sasProtocol);
- // END: com.azure.storage.blob.blobServiceAsyncClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IPRange-SASProtocol
+ // END: com.azure.storage.blob.blobServiceAsyncClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IpRange-SASProtocol
}
/**
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceClientJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceClientJavaDocCodeSnippets.java
index 3ff6426b52dc..8ee24a5b5b23 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceClientJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/BlobServiceClientJavaDocCodeSnippets.java
@@ -16,7 +16,7 @@
import com.azure.storage.common.AccountSASResourceType;
import com.azure.storage.common.AccountSASService;
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 java.time.Duration;
import java.time.OffsetDateTime;
@@ -33,10 +33,10 @@ public class BlobServiceClientJavaDocCodeSnippets {
/**
* Generates a code sample for using {@link BlobServiceClient#generateAccountSAS(AccountSASService,
- * AccountSASResourceType, AccountSASPermission, OffsetDateTime, OffsetDateTime, String, IPRange, SASProtocol)}
+ * AccountSASResourceType, AccountSASPermission, OffsetDateTime, OffsetDateTime, String, IpRange, SASProtocol)}
*/
public void generateAccountSAS() {
- // BEGIN: com.azure.storage.blob.blobServiceClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IPRange-SASProtocol
+ // BEGIN: com.azure.storage.blob.blobServiceClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IpRange-SASProtocol
AccountSASService service = new AccountSASService()
.setBlob(true)
.setFile(true)
@@ -57,7 +57,7 @@ public void generateAccountSAS() {
.setUpdatePermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -65,7 +65,7 @@ public void generateAccountSAS() {
String sas = client.generateAccountSAS(service, resourceType, permission, expiryTime, startTime, version,
ipRange, sasProtocol);
- // END: com.azure.storage.blob.blobServiceClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IPRange-SASProtocol
+ // END: com.azure.storage.blob.blobServiceClient.generateAccountSAS#AccountSASService-AccountSASResourceType-AccountSASPermission-OffsetDateTime-OffsetDateTime-String-IpRange-SASProtocol
}
/**
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java
index 9e72080226dd..d8c17072416a 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobAsyncClientBaseJavaDocCodeSnippets.java
@@ -16,7 +16,7 @@
import com.azure.storage.blob.models.ReliableDownloadOptions;
import com.azure.storage.blob.models.UserDelegationKey;
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 java.io.ByteArrayOutputStream;
@@ -410,10 +410,10 @@ public void getAccountInfoWithResponseCodeSnippets() {
/**
* Code snippet for {@link BlobAsyncClientBase#generateUserDelegationSAS(UserDelegationKey, String, BlobSasPermission,
- * OffsetDateTime, OffsetDateTime, String, SASProtocol, IPRange, String, String, String, String, String)}
+ * OffsetDateTime, OffsetDateTime, String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateUserDelegationSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setAddPermission(true)
.setWritePermission(true)
@@ -422,7 +422,7 @@ public void generateUserDelegationSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -438,15 +438,15 @@ public void generateUserDelegationSASCodeSnippets() {
String sas = client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
- // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
* Code snippet for {@link BlobAsyncClientBase#generateSAS(String, BlobSasPermission, OffsetDateTime, OffsetDateTime,
- * String, SASProtocol, IPRange, String, String, String, String, String)}
+ * String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -455,7 +455,7 @@ public void generateSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -470,6 +470,6 @@ public void generateSASCodeSnippets() {
// Note either "identifier", or "expiryTime and permissions" are required to be set
String sas = client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange,
cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
- // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.specialized.BlobAsyncClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
}
diff --git a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java
index 03b383ca7f5f..87fd7533d2a6 100644
--- a/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java
+++ b/sdk/storage/azure-storage-blob/src/samples/java/com/azure/storage/blob/specialized/BlobClientBaseJavaDocCodeSnippets.java
@@ -19,7 +19,7 @@
import com.azure.storage.blob.models.StorageAccountInfo;
import com.azure.storage.blob.models.UserDelegationKey;
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 java.io.ByteArrayOutputStream;
@@ -396,10 +396,10 @@ public void getAccountInfoWithResponseCodeSnippets() {
/**
* Code snippet for {@link BlobClientBase#generateUserDelegationSAS(UserDelegationKey, String, BlobSasPermission,
- * OffsetDateTime, OffsetDateTime, String, SASProtocol, IPRange, String, String, String, String, String)}
+ * OffsetDateTime, OffsetDateTime, String, SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateUserDelegationSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -408,7 +408,7 @@ public void generateUserDelegationSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -424,15 +424,15 @@ public void generateUserDelegationSASCodeSnippets() {
String sas = client.generateUserDelegationSAS(userDelegationKey, accountName, permissions, expiryTime,
startTime, version, sasProtocol, ipRange, cacheControl, contentDisposition, contentEncoding,
contentLanguage, contentType);
- // END: com.azure.storage.blob.specialized.BlobClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.specialized.BlobClientBase.generateUserDelegationSAS#UserDelegationKey-String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
/**
* Code snippet for {@link BlobClientBase#generateSAS(String, BlobSasPermission, OffsetDateTime, OffsetDateTime, String,
- * SASProtocol, IPRange, String, String, String, String, String)}
+ * SASProtocol, IpRange, String, String, String, String, String)}
*/
public void generateSASCodeSnippets() {
- // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // BEGIN: com.azure.storage.blob.specialized.BlobClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
BlobSasPermission permissions = new BlobSasPermission()
.setReadPermission(true)
.setWritePermission(true)
@@ -441,7 +441,7 @@ public void generateSASCodeSnippets() {
.setAddPermission(true);
OffsetDateTime startTime = OffsetDateTime.now().minusDays(1);
OffsetDateTime expiryTime = OffsetDateTime.now().plusDays(1);
- IPRange ipRange = new IPRange()
+ IpRange ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255");
SASProtocol sasProtocol = SASProtocol.HTTPS_HTTP;
@@ -456,6 +456,6 @@ public void generateSASCodeSnippets() {
// Note either "identifier", or "expiryTime and permissions" are required to be set
String sas = client.generateSAS(identifier, permissions, expiryTime, startTime, version, sasProtocol, ipRange,
cacheControl, contentDisposition, contentEncoding, contentLanguage, contentType);
- // END: com.azure.storage.blob.specialized.BlobClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IPRange-String-String-String-String-String
+ // END: com.azure.storage.blob.specialized.BlobClientBase.generateSAS#String-BlobSASPermission-OffsetDateTime-OffsetDateTime-String-SASProtocol-IpRange-String-String-String-String-String
}
}
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SASTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SASTest.groovy
index 354e352b0a06..cf1f8af8d974 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SASTest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/SASTest.groovy
@@ -15,7 +15,7 @@ import com.azure.storage.common.AccountSASResourceType
import com.azure.storage.common.AccountSASService
import com.azure.storage.common.AccountSASSignatureValues
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.SASTokenCredential
@@ -109,7 +109,7 @@ class SASTest extends APISpec {
.setAddPermission(true)
def startTime = getUTCNow().minusDays(1)
def expiryTime = getUTCNow().plusDays(1)
- def ipRange = new IPRange()
+ def ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255")
def sasProtocol = SASProtocol.HTTPS_HTTP
@@ -156,7 +156,7 @@ class SASTest extends APISpec {
.setAddPermission(true)
def startTime = getUTCNow().minusDays(1)
def expiryTime = getUTCNow().plusDays(1)
- def ipRange = new IPRange()
+ def ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255")
def sasProtocol = SASProtocol.HTTPS_HTTP
@@ -239,7 +239,7 @@ class SASTest extends APISpec {
def startTime = getUTCNow().minusDays(1)
def expiryTime = getUTCNow().plusDays(1)
- def ipRange = new IPRange()
+ def ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255")
@@ -292,7 +292,7 @@ class SASTest extends APISpec {
.setAddPermission(true)
def startTime = getUTCNow().minusDays(1)
def expiryTime = getUTCNow().plusDays(1)
- def ipRange = new IPRange()
+ def ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255")
def sasProtocol = SASProtocol.HTTPS_HTTP
@@ -354,7 +354,7 @@ class SASTest extends APISpec {
def startTime = getUTCNow().minusDays(1)
def expiryTime = getUTCNow().plusDays(1)
- def ipRange = new IPRange()
+ def ipRange = new IpRange()
.setIpMin("0.0.0.0")
.setIpMax("255.255.255.255")
@@ -545,7 +545,7 @@ class SASTest extends APISpec {
v.setCanonicalName("containerName/blobName")
.setSnapshotId(snapId)
if (ipRange != null) {
- def ipR = new IPRange()
+ def ipR = new IpRange()
ipR.setIpMin("ip")
v.setIpRange(ipR)
}
@@ -571,9 +571,9 @@ class SASTest extends APISpec {
where:
startTime | identifier | ipRange | protocol | snapId | cacheControl | disposition | encoding | language | type || expectedStringToSign
OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC) | null | null | null | null | null | null | null | null | null || "r\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
- null | "id" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\nid\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
- null | null | new IPRange() | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
- null | null | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
+ null | "id" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\nid\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
+ null | null | new IpRange() | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
+ null | null | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
null | null | null | null | "snapId" | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\nsnapId\n\n\n\n\n"
null | null | null | null | null | "control" | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\ncontrol\n\n\n\n"
null | null | null | null | null | null | "disposition" | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\ndisposition\n\n\n"
@@ -598,7 +598,7 @@ class SASTest extends APISpec {
v.setCanonicalName("containerName/blobName")
.setSnapshotId(snapId)
if (ipRange != null) {
- def ipR = new IPRange()
+ def ipR = new IpRange()
ipR.setIpMin("ip")
v.setIpRange(ipR)
}
@@ -633,9 +633,9 @@ class SASTest extends APISpec {
null | null | null | OffsetDateTime.of(LocalDateTime.of(2018, 1, 1, 0, 0), ZoneOffset.UTC) | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n2018-01-01T00:00:00Z\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
null | null | null | null | OffsetDateTime.of(LocalDateTime.of(2018, 1, 1, 0, 0), ZoneOffset.UTC) | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n2018-01-01T00:00:00Z\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
null | null | null | null | null | "b" | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\nb\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
- null | null | null | null | null | null | "2018-06-17" | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n2018-06-17\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
- null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | new IPRange() | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
- null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
+ null | null | null | null | null | null | "2018-06-17" | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n2018-06-17\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
+ null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | new IpRange() | null | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
+ null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\n\n\n\n"
null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | "snapId" | null | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\nsnapId\n\n\n\n\n"
null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | "control" | null | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\ncontrol\n\n\n\n"
null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | "disposition" | null | null | null || "r\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\ncontainerName/blobName\n\n\n\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\n\n\ndisposition\n\n\n"
@@ -779,7 +779,7 @@ class SASTest extends APISpec {
@Unroll
def "IPRange toString"() {
setup:
- def ip = new IPRange()
+ def ip = new IpRange()
.setIpMin(min)
.setIpMax(max)
@@ -796,7 +796,7 @@ class SASTest extends APISpec {
@Unroll
def "IPRange parse"() {
when:
- def ip = IPRange.parse(rangeStr)
+ def ip = IpRange.parse(rangeStr)
then:
ip.getIpMin() == min
@@ -871,7 +871,7 @@ class SASTest extends APISpec {
.setStartTime(startTime)
.setExpiryTime(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC))
if (ipRange != null) {
- def ipR = new IPRange()
+ def ipR = new IpRange()
ipR.setIpMin("ip")
v.setIpRange(ipR)
}
@@ -885,7 +885,7 @@ class SASTest extends APISpec {
where:
startTime | ipRange | protocol || expectedStringToSign
OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC) | null | null || "%s" + "\nr\nb\no\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
- null | new IPRange() | null || "%s" + "\nr\nb\no\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
+ null | new IpRange() | null || "%s" + "\nr\nb\no\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
null | null | SASProtocol.HTTPS_ONLY || "%s" + "\nr\nb\no\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
}
diff --git a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/HelperTest.groovy b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/HelperTest.groovy
index 940f42e86bb4..7fa416b9809d 100644
--- a/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/HelperTest.groovy
+++ b/sdk/storage/azure-storage-blob/src/test/java/com/azure/storage/blob/specialized/HelperTest.groovy
@@ -14,7 +14,7 @@ import com.azure.storage.common.AccountSASPermission
import com.azure.storage.common.AccountSASResourceType
import com.azure.storage.common.AccountSASSignatureValues
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
@@ -110,7 +110,7 @@ class HelperTest extends APISpec {
}
if (ipRange != null) {
- v.setIpRange(new IPRange().setIpMin("ip"))
+ v.setIpRange(new IpRange().setIpMin("ip"))
}
v.setIdentifier(identifier)
@@ -148,9 +148,9 @@ class HelperTest extends APISpec {
new BlobSasPermission() | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | null | null | null | null | null | null | null || "r\n\n%s\n" + "/blob/%s/containerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
null | OffsetDateTime.now(ZoneOffset.UTC).minusDays(1) | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | null | null | null | null | null | null | null || "\n%s\n%s\n/blob/%s/containerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
- null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | "id" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\nid\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
- null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | new IPRange() | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
- null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
+ null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | "id" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\nid\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
+ null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | new IpRange() | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
+ null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | null | "snapId" | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\nsnapId\n\n\n\n\n"
null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | null | null | "control" | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\ncontrol\n\n\n\n"
null | null | OffsetDateTime.now(ZoneOffset.UTC).plusDays(1) | null | null | null | null | null | "disposition" | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\ndisposition\n\n\n"
@@ -186,7 +186,7 @@ class HelperTest extends APISpec {
}
if (ipRange != null) {
- v.setIpRange(new IPRange().setIpMin("ip"))
+ v.setIpRange(new IpRange().setIpMin("ip"))
}
v.setProtocol(protocol)
@@ -225,9 +225,9 @@ class HelperTest extends APISpec {
null | null | null | null | null | OffsetDateTime.of(LocalDateTime.of(2018, 1, 1, 0, 0), ZoneOffset.UTC) | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n2018-01-01T00:00:00Z\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
null | null | null | null | null | null | OffsetDateTime.of(LocalDateTime.of(2018, 1, 1, 0, 0), ZoneOffset.UTC) | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n2018-01-01T00:00:00Z\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
null | null | null | null | null | null | null | "b" | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\nb\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
- null | null | null | null | null | null | null | null | "2018-06-17" | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n2018-06-17\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
- null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | new IPRange() | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
- null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
+ null | null | null | null | null | null | null | null | "2018-06-17" | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n2018-06-17\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
+ null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | new IpRange() | null | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
+ null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | SASProtocol.HTTPS_ONLY | null | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\n\n\n\n"
null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | "snapId" | null | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nbs\nsnapId\n\n\n\n\n"
null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | "control" | null | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\ncontrol\n\n\n\n"
null | null | null | null | null | null | null | null | null | "3hd4LRwrARVGbeMRQRfTLIsGMkCPuZJnvxZDU7Gak8c=" | null | null | null | null | "disposition" | null | null | null || "\n\n%s\n/blob/%s/containerName/blobName\n\n\n\n\n\n\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\nb\n\n\ndisposition\n\n\n"
@@ -409,7 +409,7 @@ class HelperTest extends APISpec {
@Unroll
def "IPRange toString"() {
setup:
- def ip = new IPRange()
+ def ip = new IpRange()
.setIpMin(min)
.setIpMax(max)
@@ -426,7 +426,7 @@ class HelperTest extends APISpec {
@Unroll
def "IPRange parse"() {
when:
- IPRange ip = IPRange.parse(rangeStr)
+ IpRange ip = IpRange.parse(rangeStr)
then:
ip.getIpMin() == min
@@ -468,7 +468,7 @@ class HelperTest extends APISpec {
.setProtocol(protocol)
if (ipRange != null) {
- v.setIpRange(new IPRange().setIpMin("ip"))
+ v.setIpRange(new IpRange().setIpMin("ip"))
}
def token = v.generateSASQueryParameters(primaryCredential)
@@ -481,7 +481,7 @@ class HelperTest extends APISpec {
where:
startTime | ipRange | protocol || expectedStringToSign
OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC) | null | null || "%s\nr\nb\no\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
- null | new IPRange() | null || "%s\nr\nb\no\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
+ null | new IpRange() | null || "%s\nr\nb\no\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\nip\n\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
null | null | SASProtocol.HTTPS_ONLY || "%s\nr\nb\no\n\n" + Utility.ISO_8601_UTC_DATE_FORMATTER.format(OffsetDateTime.of(2017, 1, 1, 0, 0, 0, 0, ZoneOffset.UTC)) + "\n\n" + SASProtocol.HTTPS_ONLY + "\n" + Constants.HeaderConstants.TARGET_STORAGE_VERSION + "\n"
}
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSASSignatureValues.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSASSignatureValues.java
index 669eb32cdec3..c8b6fa5fad49 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSASSignatureValues.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSASSignatureValues.java
@@ -39,7 +39,7 @@ public final class AccountSASSignatureValues {
private String permissions;
- private IPRange ipRange;
+ private IpRange ipRange;
private String services;
@@ -62,7 +62,7 @@ public AccountSASSignatureValues() {
* @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 any of {@code sharedKeyCredentials}, {@code services}, {@code resourceTypes},
@@ -70,7 +70,8 @@ public AccountSASSignatureValues() {
*/
public static String generateAccountSAS(SharedKeyCredential sharedKeyCredential, AccountSASService
accountSASService, AccountSASResourceType accountSASResourceType, AccountSASPermission accountSASPermission,
- OffsetDateTime expiryTime, OffsetDateTime startTime, String version, IPRange ipRange, SASProtocol sasProtocol) {
+ OffsetDateTime expiryTime, OffsetDateTime startTime, String version,
+ IpRange ipRange, SASProtocol sasProtocol) {
AccountSASSignatureValues values = new AccountSASSignatureValues();
@@ -187,19 +188,19 @@ public AccountSASSignatureValues setPermissions(String permissions) {
}
/**
- * @return the {@link IPRange} which determines the IP ranges that are allowed to use the SAS.
+ * @return the {@link IpRange} which determines the IP ranges that are allowed to use the SAS.
*/
- public IPRange getIpRange() {
+ public IpRange getIpRange() {
return ipRange;
}
/**
- * Sets the {@link IPRange} which determines the IP ranges that are allowed to use the SAS.
+ * Sets the {@link IpRange} which determines the IP ranges that are allowed to use the SAS.
*
* @param ipRange Allowed IP range to set
* @return the updated AccountSASSignatureValues object.
*/
- public AccountSASSignatureValues setIpRange(IPRange ipRange) {
+ public AccountSASSignatureValues setIpRange(IpRange ipRange) {
this.ipRange = ipRange;
return this;
}
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSasQueryParameters.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSasQueryParameters.java
index 07f21db9667f..11f727c7ae3b 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSasQueryParameters.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/AccountSasQueryParameters.java
@@ -46,13 +46,14 @@ public AccountSasQueryParameters(Map queryParamsMap, boolean r
* @param protocol A {@code String} representing the allowed HTTP protocol(s) or {@code null}.
* @param startTime A {@code java.util.Date} representing the start time for this SAS token or {@code null}.
* @param expiryTime A {@code java.util.Date} representing the expiry time for this SAS token.
- * @param ipRange A {@link IPRange} representing the range of valid IP addresses for this SAS token or
+ * @param ipRange A {@link IpRange} representing the range of valid IP addresses for this SAS token or
* {@code null}.
* @param permissions A {@code String} representing the storage permissions or {@code null}.
* @param signature A {@code String} representing the signature for the SAS token.
*/
AccountSasQueryParameters(String version, String services, String resourceTypes, SASProtocol protocol,
- OffsetDateTime startTime, OffsetDateTime expiryTime, IPRange ipRange, String permissions, String signature) {
+ OffsetDateTime startTime, OffsetDateTime expiryTime, IpRange ipRange,
+ String permissions, String signature) {
super(version, protocol, startTime, expiryTime, ipRange, permissions, signature);
this.services = services;
this.resourceTypes = resourceTypes;
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/BaseSasQueryParameters.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/BaseSasQueryParameters.java
index 11b44c393ceb..bd0b280f1c5d 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/BaseSasQueryParameters.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/BaseSasQueryParameters.java
@@ -24,7 +24,7 @@ public abstract class BaseSasQueryParameters {
protected OffsetDateTime expiryTime;
- protected IPRange ipRange;
+ protected IpRange ipRange;
protected String permissions;
@@ -47,7 +47,7 @@ public BaseSasQueryParameters(Map queryParamsMap, boolean remo
this.expiryTime = getQueryParameter(queryParamsMap, Constants.UrlConstants.SAS_EXPIRY_TIME,
removeSASParametersFromMap, Utility::parseDate);
this.ipRange = getQueryParameter(queryParamsMap, Constants.UrlConstants.SAS_IP_RANGE,
- removeSASParametersFromMap, IPRange::parse);
+ removeSASParametersFromMap, IpRange::parse);
this.permissions = getQueryParameter(queryParamsMap, Constants.UrlConstants.SAS_SIGNED_PERMISSIONS,
removeSASParametersFromMap);
this.signature = getQueryParameter(queryParamsMap, Constants.UrlConstants.SAS_SIGNATURE,
@@ -98,13 +98,13 @@ protected T getQueryParameter(Map parameters, String name,
* @param protocol A {@code String} representing the allowed HTTP protocol(s) or {@code null}.
* @param startTime A {@code java.util.Date} representing the start time for this SAS token or {@code null}.
* @param expiryTime A {@code java.util.Date} representing the expiry time for this SAS token.
- * @param ipRange A {@link IPRange} representing the range of valid IP addresses for this SAS token or
+ * @param ipRange A {@link IpRange} representing the range of valid IP addresses for this SAS token or
* {@code null}.
* @param permissions A {@code String} representing the storage permissions or {@code null}.
* @param signature A {@code String} representing the signature for the SAS token.
*/
public BaseSasQueryParameters(String version, SASProtocol protocol, OffsetDateTime startTime,
- OffsetDateTime expiryTime, IPRange ipRange, String permissions, String signature) {
+ OffsetDateTime expiryTime, IpRange ipRange, String permissions, String signature) {
this.version = version;
this.protocol = protocol;
this.startTime = startTime;
@@ -143,9 +143,9 @@ public OffsetDateTime getExpiryTime() {
}
/**
- * @return {@link IPRange}
+ * @return {@link IpRange}
*/
- public IPRange getIpRange() {
+ public IpRange getIpRange() {
return ipRange;
}
diff --git a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/IPRange.java b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/IpRange.java
similarity index 77%
rename from sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/IPRange.java
rename to sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/IpRange.java
index 5e79fb3eb9b2..e747edc6e427 100644
--- a/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/IPRange.java
+++ b/sdk/storage/azure-storage-common/src/main/java/com/azure/storage/common/IpRange.java
@@ -7,26 +7,26 @@
* This type specifies a continuous range of IP addresses. It is used to limit permissions on SAS tokens. Null may be
* set if it is not desired to confine the sas permissions to an IP range.
*/
-public final class IPRange {
+public final class IpRange {
private String ipMin;
private String ipMax;
/**
- * Constructs an IPRange object.
+ * Constructs an IpRange object.
*/
- public IPRange() {
+ public IpRange() {
}
/**
- * Creates a {@code IPRange} from the specified string.
+ * Creates a {@code IpRange} from the specified string.
*
- * @param rangeStr The {@code String} representation of the {@code IPRange}.
- * @return The {@code IPRange} generated from the {@code String}.
+ * @param rangeStr The {@code String} representation of the {@code IpRange}.
+ * @return The {@code IpRange} generated from the {@code String}.
*/
- public static IPRange parse(String rangeStr) {
+ public static IpRange parse(String rangeStr) {
String[] addrs = rangeStr.split("-");
- IPRange range = new IPRange().setIpMin(addrs[0]);
+ IpRange range = new IpRange().setIpMin(addrs[0]);
if (addrs.length > 1) {
range.setIpMax(addrs[1]);
}
@@ -45,9 +45,9 @@ public String getIpMin() {
* Sets the minimum IP address of the range.
*
* @param ipMin IP address to set as the minimum
- * @return the updated IPRange object
+ * @return the updated IpRange object
*/
- public IPRange setIpMin(String ipMin) {
+ public IpRange setIpMin(String ipMin) {
this.ipMin = ipMin;
return this;
}
@@ -63,9 +63,9 @@ public String getIpMax() {
* Sets the maximum IP address of the range.
*
* @param ipMax IP address to set as the maximum
- * @return the updated IPRange object
+ * @return the updated IpRange object
*/
- public IPRange setIpMax(String ipMax) {
+ public IpRange setIpMax(String ipMax) {
this.ipMax = ipMax;
return this;
}
diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryAsyncClient.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryAsyncClient.java
index 4d7291eda3f3..75b24c890530 100644
--- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryAsyncClient.java
+++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryAsyncClient.java
@@ -26,7 +26,7 @@
import com.azure.storage.file.models.DirectoryProperties;
import com.azure.storage.file.models.DirectorySetMetadataInfo;
import com.azure.storage.file.models.FileHTTPHeaders;
-import com.azure.storage.file.models.FileRef;
+import com.azure.storage.file.models.FileReference;
import com.azure.storage.file.models.HandleItem;
import com.azure.storage.file.models.StorageException;
import reactor.core.publisher.Mono;
@@ -98,12 +98,12 @@ public class DirectoryAsyncClient {
* @return the URL of the storage directory client
*/
public String getDirectoryUrl() {
- StringBuilder directoryURLString = new StringBuilder(azureFileStorageClient.getUrl()).append("/")
+ StringBuilder directoryUrlString = new StringBuilder(azureFileStorageClient.getUrl()).append("/")
.append(shareName).append("/").append(directoryPath);
if (snapshot != null) {
- directoryURLString.append("?snapshot=").append(snapshot);
+ directoryUrlString.append("?snapshot=").append(snapshot);
}
- return directoryURLString.toString();
+ return directoryUrlString.toString();
}
/**
@@ -423,9 +423,9 @@ Mono> setMetadataWithResponse(MapAzure
* Docs.
*
- * @return {@link FileRef File info} in the storage directory
+ * @return {@link FileReference File info} in the storage directory
*/
- public PagedFlux listFilesAndDirectories() {
+ public PagedFlux listFilesAndDirectories() {
return listFilesAndDirectories(null, null);
}
@@ -446,15 +446,15 @@ public PagedFlux listFilesAndDirectories() {
* with.
* @param maxResults Optional maximum number of files and/or directories to return per page. If the request does not
* specify maxresults or specifies a value greater than 5,000, the server will return up to 5,000 items.
- * @return {@link FileRef File info} in this directory with prefix and max number of return results.
+ * @return {@link FileReference File info} in this directory with prefix and max number of return results.
*/
- public PagedFlux listFilesAndDirectories(String prefix, Integer maxResults) {
+ public PagedFlux listFilesAndDirectories(String prefix, Integer maxResults) {
return listFilesAndDirectoriesWithOptionalTimeout(prefix, maxResults, null, Context.NONE);
}
- PagedFlux listFilesAndDirectoriesWithOptionalTimeout(String prefix, Integer maxResults, Duration timeout,
- Context context) {
- Function>> retriever =
+ PagedFlux listFilesAndDirectoriesWithOptionalTimeout(String prefix, Integer maxResults,
+ Duration timeout, Context context) {
+ Function>> retriever =
marker -> postProcessResponse(Utility.applyOptionalTimeout(this.azureFileStorageClient.directorys()
.listFilesAndDirectoriesSegmentWithRestResponseAsync(shareName, directoryPath, prefix, snapshot,
marker, maxResults, null, context), timeout)
@@ -563,7 +563,8 @@ PagedFlux forceCloseHandlesWithOptionalTimeout(String handleId, boolean
* directory is an invalid resource name.
*/
public Mono createSubDirectory(String subDirectoryName) {
- return createSubDirectoryWithResponse(subDirectoryName, null, null, null).flatMap(FluxUtil::toMono);
+ return createSubDirectoryWithResponse(subDirectoryName, null, null, null)
+ .flatMap(FluxUtil::toMono);
}
/**
@@ -667,7 +668,8 @@ Mono> deleteSubDirectoryWithResponse(String subDirectoryName, Con
* invalid resource name.
*/
public Mono createFile(String fileName, long maxSize) {
- return createFileWithResponse(fileName, maxSize, null, null, null, null).flatMap(FluxUtil::toMono);
+ return createFileWithResponse(fileName, maxSize, null, null, null, null)
+ .flatMap(FluxUtil::toMono);
}
/**
@@ -830,15 +832,18 @@ private Response setMetadataResponse(final DirectorysS
return new SimpleResponse<>(response, directorySetMetadataInfo);
}
- private List convertResponseAndGetNumOfResults(DirectorysListFilesAndDirectoriesSegmentResponse response) {
- Set fileRefs = new TreeSet<>(Comparator.comparing(FileRef::getName));
+ private List convertResponseAndGetNumOfResults(
+ DirectorysListFilesAndDirectoriesSegmentResponse response) {
+ Set fileReferences = new TreeSet<>(Comparator.comparing(FileReference::getName));
if (response.getValue().getSegment() != null) {
response.getValue().getSegment().getDirectoryItems()
- .forEach(directoryItem -> fileRefs.add(new FileRef(directoryItem.getName(), true, null)));
+ .forEach(directoryItem -> fileReferences.add(new FileReference(directoryItem.getName(),
+ true, null)));
response.getValue().getSegment().getFileItems()
- .forEach(fileItem -> fileRefs.add(new FileRef(fileItem.getName(), false, fileItem.getProperties())));
+ .forEach(fileItem -> fileReferences.add(new FileReference(fileItem.getName(), false,
+ fileItem.getProperties())));
}
- return new ArrayList<>(fileRefs);
+ return new ArrayList<>(fileReferences);
}
}
diff --git a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryClient.java b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryClient.java
index c053d517d3e4..5bcd44864e08 100644
--- a/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryClient.java
+++ b/sdk/storage/azure-storage-file/src/main/java/com/azure/storage/file/DirectoryClient.java
@@ -16,7 +16,7 @@
import com.azure.storage.file.models.DirectorySetMetadataInfo;
import com.azure.storage.file.models.FileHTTPHeaders;
import com.azure.storage.file.models.FileInfo;
-import com.azure.storage.file.models.FileRef;
+import com.azure.storage.file.models.FileReference;
import com.azure.storage.file.models.HandleItem;
import com.azure.storage.file.models.StorageException;
import reactor.core.publisher.Mono;
@@ -343,9 +343,9 @@ public Response setMetadataWithResponse(MapAzure
* Docs.