From 59395fea638343b114d1508da1441f01afb3d2ac Mon Sep 17 00:00:00 2001 From: Chuang Xie Date: Mon, 2 Dec 2019 12:24:15 +0800 Subject: [PATCH] Storage: regenerate package-2019-06 --- sdk/storage/mgmt-v2019_06_01/pom.xml | 2 +- .../v2019_06_01/BlobServiceProperties.java | 10 +- .../v2019_06_01/DeleteRetentionPolicy.java | 14 +- .../storage/v2019_06_01/Endpoints.java | 52 ++++++ .../v2019_06_01/FileServiceProperties.java | 43 ++++- .../storage/v2019_06_01/FileShare.java | 4 +- .../storage/v2019_06_01/RoutingChoice.java | 41 +++++ .../v2019_06_01/RoutingPreference.java | 100 +++++++++++ .../{Sku.java => SkuInformation.java} | 6 +- .../management/storage/v2019_06_01/Skus.java | 2 +- .../storage/v2019_06_01/StorageAccount.java | 35 +++- .../StorageAccountCreateParameters.java | 27 +++ .../StorageAccountInternetEndpoints.java | 78 ++++++++ .../StorageAccountMicrosoftEndpoints.java | 108 +++++++++++ .../StorageAccountUpdateParameters.java | 27 +++ .../BlobServicePropertiesImpl.java | 5 + .../BlobServicePropertiesInner.java | 21 ++- .../FileServicePropertiesImpl.java | 33 +++- .../FileServicePropertiesInner.java | 42 +++++ .../implementation/FileServicesInner.java | 23 ++- .../implementation/FileShareInner.java | 7 +- .../implementation/FileShareItemInner.java | 7 +- .../implementation/FileSharesInner.java | 16 +- .../{SkuImpl.java => SkuInformationImpl.java} | 6 +- .../implementation/SkuInformationInner.java | 169 ++++++++++++++++++ .../v2019_06_01/implementation/SkuInner.java | 106 +---------- .../v2019_06_01/implementation/SkusImpl.java | 26 +-- .../v2019_06_01/implementation/SkusInner.java | 42 ++--- .../implementation/StorageAccountImpl.java | 26 ++- .../implementation/StorageAccountInner.java | 28 +++ .../implementation/StorageAccountsInner.java | 2 - .../StorageManagementClientImpl.java | 2 + 32 files changed, 917 insertions(+), 193 deletions(-) create mode 100644 sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingChoice.java create mode 100644 sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingPreference.java rename sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/{Sku.java => SkuInformation.java} (87%) create mode 100644 sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountInternetEndpoints.java create mode 100644 sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountMicrosoftEndpoints.java rename sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/{SkuImpl.java => SkuInformationImpl.java} (86%) create mode 100644 sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationInner.java diff --git a/sdk/storage/mgmt-v2019_06_01/pom.xml b/sdk/storage/mgmt-v2019_06_01/pom.xml index bd48345d1206..2d88e668c503 100644 --- a/sdk/storage/mgmt-v2019_06_01/pom.xml +++ b/sdk/storage/mgmt-v2019_06_01/pom.xml @@ -15,7 +15,7 @@ ../../../pom.management.xml azure-mgmt-storage - 1.0.0-beta + 1.0.0-beta-1 jar Microsoft Azure SDK for Storage Management This package contains Microsoft Storage Management SDK. diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/BlobServiceProperties.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/BlobServiceProperties.java index c202f7f71c7a..a17747a01972 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/BlobServiceProperties.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/BlobServiceProperties.java @@ -17,6 +17,7 @@ import com.microsoft.azure.arm.model.Creatable; import com.microsoft.azure.arm.resources.models.HasManager; import com.microsoft.azure.management.storage.v2019_06_01.implementation.StorageManager; +import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner; /** * Type representing BlobServiceProperties. @@ -57,6 +58,11 @@ public interface BlobServiceProperties extends HasInner { /** * The template for a FileServiceProperties update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, UpdateStages.WithCors { + interface Update extends Appliable, UpdateStages.WithCors, UpdateStages.WithShareDeleteRetentionPolicy { } /** @@ -114,5 +137,17 @@ interface WithCors { Update withCors(CorsRules cors); } + /** + * The stage of the fileserviceproperties update allowing to specify ShareDeleteRetentionPolicy. + */ + interface WithShareDeleteRetentionPolicy { + /** + * Specifies shareDeleteRetentionPolicy. + * @param shareDeleteRetentionPolicy The file service properties for share soft delete + * @return the next update stage + */ + Update withShareDeleteRetentionPolicy(DeleteRetentionPolicy shareDeleteRetentionPolicy); + } + } } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/FileShare.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/FileShare.java index be94cfa0562a..2a8e133a9006 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/FileShare.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/FileShare.java @@ -105,7 +105,7 @@ interface WithMetadata { interface WithShareQuota { /** * Specifies shareQuota. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120) + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000 * @return the next definition stage */ WithCreate withShareQuota(Integer shareQuota); @@ -147,7 +147,7 @@ interface WithMetadata { interface WithShareQuota { /** * Specifies shareQuota. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120) + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000 * @return the next update stage */ Update withShareQuota(Integer shareQuota); diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingChoice.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingChoice.java new file mode 100644 index 000000000000..4ed73ed0236d --- /dev/null +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingChoice.java @@ -0,0 +1,41 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.storage.v2019_06_01; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for RoutingChoice. + */ +public final class RoutingChoice extends ExpandableStringEnum { + /** Static value MicrosoftRouting for RoutingChoice. */ + public static final RoutingChoice MICROSOFT_ROUTING = fromString("MicrosoftRouting"); + + /** Static value InternetRouting for RoutingChoice. */ + public static final RoutingChoice INTERNET_ROUTING = fromString("InternetRouting"); + + /** + * Creates or finds a RoutingChoice from its string representation. + * @param name a name to look for + * @return the corresponding RoutingChoice + */ + @JsonCreator + public static RoutingChoice fromString(String name) { + return fromString(name, RoutingChoice.class); + } + + /** + * @return known RoutingChoice values + */ + public static Collection values() { + return values(RoutingChoice.class); + } +} diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingPreference.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingPreference.java new file mode 100644 index 000000000000..10be2d34b505 --- /dev/null +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/RoutingPreference.java @@ -0,0 +1,100 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.storage.v2019_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Routing preference defines the type of network, either microsoft or internet + * routing to be used to deliver the user data, the default option is microsoft + * routing. + */ +public class RoutingPreference { + /** + * Routing Choice defines the kind of network routing opted by the user. + * Possible values include: 'MicrosoftRouting', 'InternetRouting'. + */ + @JsonProperty(value = "routingChoice") + private RoutingChoice routingChoice; + + /** + * A boolean flag which indicates whether microsoft routing storage + * endpoints are to be published. + */ + @JsonProperty(value = "publishMicrosoftEndpoints") + private Boolean publishMicrosoftEndpoints; + + /** + * A boolean flag which indicates whether internet routing storage + * endpoints are to be published. + */ + @JsonProperty(value = "publishInternetEndpoints") + private Boolean publishInternetEndpoints; + + /** + * Get routing Choice defines the kind of network routing opted by the user. Possible values include: 'MicrosoftRouting', 'InternetRouting'. + * + * @return the routingChoice value + */ + public RoutingChoice routingChoice() { + return this.routingChoice; + } + + /** + * Set routing Choice defines the kind of network routing opted by the user. Possible values include: 'MicrosoftRouting', 'InternetRouting'. + * + * @param routingChoice the routingChoice value to set + * @return the RoutingPreference object itself. + */ + public RoutingPreference withRoutingChoice(RoutingChoice routingChoice) { + this.routingChoice = routingChoice; + return this; + } + + /** + * Get a boolean flag which indicates whether microsoft routing storage endpoints are to be published. + * + * @return the publishMicrosoftEndpoints value + */ + public Boolean publishMicrosoftEndpoints() { + return this.publishMicrosoftEndpoints; + } + + /** + * Set a boolean flag which indicates whether microsoft routing storage endpoints are to be published. + * + * @param publishMicrosoftEndpoints the publishMicrosoftEndpoints value to set + * @return the RoutingPreference object itself. + */ + public RoutingPreference withPublishMicrosoftEndpoints(Boolean publishMicrosoftEndpoints) { + this.publishMicrosoftEndpoints = publishMicrosoftEndpoints; + return this; + } + + /** + * Get a boolean flag which indicates whether internet routing storage endpoints are to be published. + * + * @return the publishInternetEndpoints value + */ + public Boolean publishInternetEndpoints() { + return this.publishInternetEndpoints; + } + + /** + * Set a boolean flag which indicates whether internet routing storage endpoints are to be published. + * + * @param publishInternetEndpoints the publishInternetEndpoints value to set + * @return the RoutingPreference object itself. + */ + public RoutingPreference withPublishInternetEndpoints(Boolean publishInternetEndpoints) { + this.publishInternetEndpoints = publishInternetEndpoints; + return this; + } + +} diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Sku.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/SkuInformation.java similarity index 87% rename from sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Sku.java rename to sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/SkuInformation.java index 51107bce4c90..38f3118d6cb3 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Sku.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/SkuInformation.java @@ -9,15 +9,15 @@ package com.microsoft.azure.management.storage.v2019_06_01; import com.microsoft.azure.arm.model.HasInner; -import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner; +import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInformationInner; import com.microsoft.azure.arm.resources.models.HasManager; import com.microsoft.azure.management.storage.v2019_06_01.implementation.StorageManager; import java.util.List; /** - * Type representing Sku. + * Type representing SkuInformation. */ -public interface Sku extends HasInner, HasManager { +public interface SkuInformation extends HasInner, HasManager { /** * @return the capabilities value. */ diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Skus.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Skus.java index 87b163436bc5..743f792ce88d 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Skus.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/Skus.java @@ -15,5 +15,5 @@ /** * Type representing Skus. */ -public interface Skus extends SupportsListing, HasInner { +public interface Skus extends SupportsListing, HasInner { } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccount.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccount.java index 2777882766f8..f267ead85fef 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccount.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccount.java @@ -117,6 +117,11 @@ public interface StorageAccount extends HasInner, Resource, */ ProvisioningState provisioningState(); + /** + * @return the routingPreference value. + */ + RoutingPreference routingPreference(); + /** * @return the secondaryEndpoints value. */ @@ -130,7 +135,7 @@ public interface StorageAccount extends HasInner, Resource, /** * @return the sku value. */ - Sku sku(); + SkuInner sku(); /** * @return the statusOfPrimary value. @@ -296,18 +301,30 @@ interface WithNetworkRuleSet { WithCreate withNetworkRuleSet(NetworkRuleSet networkRuleSet); } + /** + * The stage of the storageaccount definition allowing to specify RoutingPreference. + */ + interface WithRoutingPreference { + /** + * Specifies routingPreference. + * @param routingPreference Maintains information about the network routing choice opted by the user for data transfer + * @return the next definition stage + */ + WithCreate withRoutingPreference(RoutingPreference routingPreference); + } + /** * The stage of the definition which contains all the minimum required inputs for * the resource to be created (via {@link WithCreate#create()}), but also allows * for any other optional settings to be specified. */ - interface WithCreate extends Creatable, Resource.DefinitionWithTags, DefinitionStages.WithAccessTier, DefinitionStages.WithAzureFilesIdentityBasedAuthentication, DefinitionStages.WithCustomDomain, DefinitionStages.WithEnableHttpsTrafficOnly, DefinitionStages.WithEncryption, DefinitionStages.WithIdentity, DefinitionStages.WithIsHnsEnabled, DefinitionStages.WithLargeFileSharesState, DefinitionStages.WithNetworkRuleSet { + interface WithCreate extends Creatable, Resource.DefinitionWithTags, DefinitionStages.WithAccessTier, DefinitionStages.WithAzureFilesIdentityBasedAuthentication, DefinitionStages.WithCustomDomain, DefinitionStages.WithEnableHttpsTrafficOnly, DefinitionStages.WithEncryption, DefinitionStages.WithIdentity, DefinitionStages.WithIsHnsEnabled, DefinitionStages.WithLargeFileSharesState, DefinitionStages.WithNetworkRuleSet, DefinitionStages.WithRoutingPreference { } } /** * The template for a StorageAccount update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithAccessTier, UpdateStages.WithAzureFilesIdentityBasedAuthentication, UpdateStages.WithCustomDomain, UpdateStages.WithEnableHttpsTrafficOnly, UpdateStages.WithEncryption, UpdateStages.WithIdentity, UpdateStages.WithKind, UpdateStages.WithLargeFileSharesState, UpdateStages.WithNetworkRuleSet, UpdateStages.WithSku { + interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithAccessTier, UpdateStages.WithAzureFilesIdentityBasedAuthentication, UpdateStages.WithCustomDomain, UpdateStages.WithEnableHttpsTrafficOnly, UpdateStages.WithEncryption, UpdateStages.WithIdentity, UpdateStages.WithKind, UpdateStages.WithLargeFileSharesState, UpdateStages.WithNetworkRuleSet, UpdateStages.WithRoutingPreference, UpdateStages.WithSku { } /** @@ -422,6 +439,18 @@ interface WithNetworkRuleSet { Update withNetworkRuleSet(NetworkRuleSet networkRuleSet); } + /** + * The stage of the storageaccount update allowing to specify RoutingPreference. + */ + interface WithRoutingPreference { + /** + * Specifies routingPreference. + * @param routingPreference Maintains information about the network routing choice opted by the user for data transfer + * @return the next update stage + */ + Update withRoutingPreference(RoutingPreference routingPreference); + } + /** * The stage of the storageaccount update allowing to specify Sku. */ diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountCreateParameters.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountCreateParameters.java index 188f9f264127..18eca991e871 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountCreateParameters.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountCreateParameters.java @@ -113,6 +113,13 @@ public class StorageAccountCreateParameters { @JsonProperty(value = "properties.largeFileSharesState") private LargeFileSharesState largeFileSharesState; + /** + * Maintains information about the network routing choice opted by the user + * for data transfer. + */ + @JsonProperty(value = "properties.routingPreference") + private RoutingPreference routingPreference; + /** * Get required. Gets or sets the SKU name. * @@ -373,4 +380,24 @@ public StorageAccountCreateParameters withLargeFileSharesState(LargeFileSharesSt return this; } + /** + * Get maintains information about the network routing choice opted by the user for data transfer. + * + * @return the routingPreference value + */ + public RoutingPreference routingPreference() { + return this.routingPreference; + } + + /** + * Set maintains information about the network routing choice opted by the user for data transfer. + * + * @param routingPreference the routingPreference value to set + * @return the StorageAccountCreateParameters object itself. + */ + public StorageAccountCreateParameters withRoutingPreference(RoutingPreference routingPreference) { + this.routingPreference = routingPreference; + return this; + } + } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountInternetEndpoints.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountInternetEndpoints.java new file mode 100644 index 000000000000..a615a54f631f --- /dev/null +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountInternetEndpoints.java @@ -0,0 +1,78 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.storage.v2019_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The URIs that are used to perform a retrieval of a public blob, file, web or + * dfs object via a internet routing endpoint. + */ +public class StorageAccountInternetEndpoints { + /** + * Gets the blob endpoint. + */ + @JsonProperty(value = "blob", access = JsonProperty.Access.WRITE_ONLY) + private String blob; + + /** + * Gets the file endpoint. + */ + @JsonProperty(value = "file", access = JsonProperty.Access.WRITE_ONLY) + private String file; + + /** + * Gets the web endpoint. + */ + @JsonProperty(value = "web", access = JsonProperty.Access.WRITE_ONLY) + private String web; + + /** + * Gets the dfs endpoint. + */ + @JsonProperty(value = "dfs", access = JsonProperty.Access.WRITE_ONLY) + private String dfs; + + /** + * Get gets the blob endpoint. + * + * @return the blob value + */ + public String blob() { + return this.blob; + } + + /** + * Get gets the file endpoint. + * + * @return the file value + */ + public String file() { + return this.file; + } + + /** + * Get gets the web endpoint. + * + * @return the web value + */ + public String web() { + return this.web; + } + + /** + * Get gets the dfs endpoint. + * + * @return the dfs value + */ + public String dfs() { + return this.dfs; + } + +} diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountMicrosoftEndpoints.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountMicrosoftEndpoints.java new file mode 100644 index 000000000000..7037fab43fa1 --- /dev/null +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountMicrosoftEndpoints.java @@ -0,0 +1,108 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.storage.v2019_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The URIs that are used to perform a retrieval of a public blob, queue, + * table, web or dfs object via a microsoft routing endpoint. + */ +public class StorageAccountMicrosoftEndpoints { + /** + * Gets the blob endpoint. + */ + @JsonProperty(value = "blob", access = JsonProperty.Access.WRITE_ONLY) + private String blob; + + /** + * Gets the queue endpoint. + */ + @JsonProperty(value = "queue", access = JsonProperty.Access.WRITE_ONLY) + private String queue; + + /** + * Gets the table endpoint. + */ + @JsonProperty(value = "table", access = JsonProperty.Access.WRITE_ONLY) + private String table; + + /** + * Gets the file endpoint. + */ + @JsonProperty(value = "file", access = JsonProperty.Access.WRITE_ONLY) + private String file; + + /** + * Gets the web endpoint. + */ + @JsonProperty(value = "web", access = JsonProperty.Access.WRITE_ONLY) + private String web; + + /** + * Gets the dfs endpoint. + */ + @JsonProperty(value = "dfs", access = JsonProperty.Access.WRITE_ONLY) + private String dfs; + + /** + * Get gets the blob endpoint. + * + * @return the blob value + */ + public String blob() { + return this.blob; + } + + /** + * Get gets the queue endpoint. + * + * @return the queue value + */ + public String queue() { + return this.queue; + } + + /** + * Get gets the table endpoint. + * + * @return the table value + */ + public String table() { + return this.table; + } + + /** + * Get gets the file endpoint. + * + * @return the file value + */ + public String file() { + return this.file; + } + + /** + * Get gets the web endpoint. + * + * @return the web value + */ + public String web() { + return this.web; + } + + /** + * Get gets the dfs endpoint. + * + * @return the dfs value + */ + public String dfs() { + return this.dfs; + } + +} diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountUpdateParameters.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountUpdateParameters.java index b07420060af8..bd416a923f65 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountUpdateParameters.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/StorageAccountUpdateParameters.java @@ -91,6 +91,13 @@ public class StorageAccountUpdateParameters { @JsonProperty(value = "properties.largeFileSharesState") private LargeFileSharesState largeFileSharesState; + /** + * Maintains information about the network routing choice opted by the user + * for data transfer. + */ + @JsonProperty(value = "properties.routingPreference") + private RoutingPreference routingPreference; + /** * Optional. Indicates the type of storage account. Currently only * StorageV2 value supported by server. Possible values include: 'Storage', @@ -299,6 +306,26 @@ public StorageAccountUpdateParameters withLargeFileSharesState(LargeFileSharesSt return this; } + /** + * Get maintains information about the network routing choice opted by the user for data transfer. + * + * @return the routingPreference value + */ + public RoutingPreference routingPreference() { + return this.routingPreference; + } + + /** + * Set maintains information about the network routing choice opted by the user for data transfer. + * + * @param routingPreference the routingPreference value to set + * @return the StorageAccountUpdateParameters object itself. + */ + public StorageAccountUpdateParameters withRoutingPreference(RoutingPreference routingPreference) { + this.routingPreference = routingPreference; + return this; + } + /** * Get optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage'. * diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesImpl.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesImpl.java index 39345d01013a..0526306ae443 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesImpl.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesImpl.java @@ -105,6 +105,11 @@ public String name() { return this.inner().name(); } + @Override + public SkuInner sku() { + return this.inner().sku(); + } + @Override public String type() { return this.inner().type(); diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesInner.java index b34a35e06266..44d7a9080569 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/BlobServicePropertiesInner.java @@ -38,7 +38,7 @@ public class BlobServicePropertiesInner extends ProxyResource { private String defaultServiceVersion; /** - * The blob service properties for soft delete. + * The blob service properties for blob soft delete. */ @JsonProperty(value = "properties.deleteRetentionPolicy") private DeleteRetentionPolicy deleteRetentionPolicy; @@ -55,6 +55,12 @@ public class BlobServicePropertiesInner extends ProxyResource { @JsonProperty(value = "properties.changeFeed") private ChangeFeed changeFeed; + /** + * Sku name and tier. + */ + @JsonProperty(value = "sku", access = JsonProperty.Access.WRITE_ONLY) + private SkuInner sku; + /** * Get specifies CORS rules for the Blob service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the Blob service. * @@ -96,7 +102,7 @@ public BlobServicePropertiesInner withDefaultServiceVersion(String defaultServic } /** - * Get the blob service properties for soft delete. + * Get the blob service properties for blob soft delete. * * @return the deleteRetentionPolicy value */ @@ -105,7 +111,7 @@ public DeleteRetentionPolicy deleteRetentionPolicy() { } /** - * Set the blob service properties for soft delete. + * Set the blob service properties for blob soft delete. * * @param deleteRetentionPolicy the deleteRetentionPolicy value to set * @return the BlobServicePropertiesInner object itself. @@ -155,4 +161,13 @@ public BlobServicePropertiesInner withChangeFeed(ChangeFeed changeFeed) { return this; } + /** + * Get sku name and tier. + * + * @return the sku value + */ + public SkuInner sku() { + return this.sku; + } + } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesImpl.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesImpl.java index 8ccf1f0b8ae3..c5d95c29ac64 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesImpl.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesImpl.java @@ -13,6 +13,7 @@ import rx.Observable; import com.microsoft.azure.management.storage.v2019_06_01.CorsRules; import java.util.List; +import com.microsoft.azure.management.storage.v2019_06_01.DeleteRetentionPolicy; import rx.functions.Func1; class FileServicePropertiesImpl extends CreatableUpdatableImpl implements FileServiceProperties, FileServiceProperties.Definition, FileServiceProperties.Update { @@ -20,7 +21,9 @@ class FileServicePropertiesImpl extends CreatableUpdatableImpl createResourceAsync() { FileServicesInner client = this.manager().inner().fileServices(); - return client.setServicePropertiesAsync(this.resourceGroupName, this.accountName, this.ccors) + return client.setServicePropertiesAsync(this.resourceGroupName, this.accountName, this.ccors, this.cshareDeleteRetentionPolicy) .map(new Func1() { @Override public FileServicePropertiesInner call(FileServicePropertiesInner resource) { @@ -67,7 +74,7 @@ public FileServicePropertiesInner call(FileServicePropertiesInner resource) { @Override public Observable updateResourceAsync() { FileServicesInner client = this.manager().inner().fileServices(); - return client.setServicePropertiesAsync(this.resourceGroupName, this.accountName, this.ucors) + return client.setServicePropertiesAsync(this.resourceGroupName, this.accountName, this.ucors, this.ushareDeleteRetentionPolicy) .map(new Func1() { @Override public FileServicePropertiesInner call(FileServicePropertiesInner resource) { @@ -91,7 +98,9 @@ public boolean isInCreateMode() { private void resetCreateUpdateParameters() { this.ccors = new CorsRules(); + this.cshareDeleteRetentionPolicy = new DeleteRetentionPolicy(); this.ucors = new CorsRules(); + this.ushareDeleteRetentionPolicy = new DeleteRetentionPolicy(); } @Override @@ -109,6 +118,16 @@ public String name() { return this.inner().name(); } + @Override + public DeleteRetentionPolicy shareDeleteRetentionPolicy() { + return this.inner().shareDeleteRetentionPolicy(); + } + + @Override + public SkuInner sku() { + return this.inner().sku(); + } + @Override public String type() { return this.inner().type(); @@ -131,4 +150,14 @@ public FileServicePropertiesImpl withCors(CorsRules cors) { return this; } + @Override + public FileServicePropertiesImpl withShareDeleteRetentionPolicy(DeleteRetentionPolicy shareDeleteRetentionPolicy) { + if (isInCreateMode()) { + this.cshareDeleteRetentionPolicy = shareDeleteRetentionPolicy; + } else { + this.ushareDeleteRetentionPolicy = shareDeleteRetentionPolicy; + } + return this; + } + } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesInner.java index efeae6a6fc3c..4e00adae5061 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicePropertiesInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.storage.v2019_06_01.implementation; import com.microsoft.azure.management.storage.v2019_06_01.CorsRules; +import com.microsoft.azure.management.storage.v2019_06_01.DeleteRetentionPolicy; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.ProxyResource; @@ -27,6 +28,18 @@ public class FileServicePropertiesInner extends ProxyResource { @JsonProperty(value = "properties.cors") private CorsRules cors; + /** + * The file service properties for share soft delete. + */ + @JsonProperty(value = "properties.shareDeleteRetentionPolicy") + private DeleteRetentionPolicy shareDeleteRetentionPolicy; + + /** + * Sku name and tier. + */ + @JsonProperty(value = "sku", access = JsonProperty.Access.WRITE_ONLY) + private SkuInner sku; + /** * Get specifies CORS rules for the File service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the File service. * @@ -47,4 +60,33 @@ public FileServicePropertiesInner withCors(CorsRules cors) { return this; } + /** + * Get the file service properties for share soft delete. + * + * @return the shareDeleteRetentionPolicy value + */ + public DeleteRetentionPolicy shareDeleteRetentionPolicy() { + return this.shareDeleteRetentionPolicy; + } + + /** + * Set the file service properties for share soft delete. + * + * @param shareDeleteRetentionPolicy the shareDeleteRetentionPolicy value to set + * @return the FileServicePropertiesInner object itself. + */ + public FileServicePropertiesInner withShareDeleteRetentionPolicy(DeleteRetentionPolicy shareDeleteRetentionPolicy) { + this.shareDeleteRetentionPolicy = shareDeleteRetentionPolicy; + return this; + } + + /** + * Get sku name and tier. + * + * @return the sku value + */ + public SkuInner sku() { + return this.sku; + } + } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicesInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicesInner.java index d498d05dfd43..0060a3540cdf 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicesInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileServicesInner.java @@ -12,6 +12,7 @@ import com.google.common.reflect.TypeToken; import com.microsoft.azure.CloudException; import com.microsoft.azure.management.storage.v2019_06_01.CorsRules; +import com.microsoft.azure.management.storage.v2019_06_01.DeleteRetentionPolicy; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceFuture; import com.microsoft.rest.ServiceResponse; @@ -222,8 +223,10 @@ public Observable> setServicePropert } final String fileServicesName = "default"; final CorsRules cors = null; + final DeleteRetentionPolicy shareDeleteRetentionPolicy = null; FileServicePropertiesInner parameters = new FileServicePropertiesInner(); parameters.withCors(null); + parameters.withShareDeleteRetentionPolicy(null); return service.setServiceProperties(resourceGroupName, accountName, this.client.subscriptionId(), fileServicesName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -244,13 +247,14 @@ public Observable> call(Response setServicePropertiesAsync(String resourceGroupName, String accountName, CorsRules cors, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(setServicePropertiesWithServiceResponseAsync(resourceGroupName, accountName, cors), serviceCallback); + public ServiceFuture setServicePropertiesAsync(String resourceGroupName, String accountName, CorsRules cors, DeleteRetentionPolicy shareDeleteRetentionPolicy, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(setServicePropertiesWithServiceResponseAsync(resourceGroupName, accountName, cors, shareDeleteRetentionPolicy), serviceCallback); } /** @@ -273,11 +278,12 @@ public ServiceFuture setServicePropertiesAsync(Strin * @param resourceGroupName The name of the resource group within the user's subscription. The name is case insensitive. * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param cors Specifies CORS rules for the File service. You can include up to five CorsRule elements in the request. If no CorsRule elements are included in the request body, all CORS rules will be deleted, and CORS will be disabled for the File service. + * @param shareDeleteRetentionPolicy The file service properties for share soft delete. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the FileServicePropertiesInner object */ - public Observable setServicePropertiesAsync(String resourceGroupName, String accountName, CorsRules cors) { - return setServicePropertiesWithServiceResponseAsync(resourceGroupName, accountName, cors).map(new Func1, FileServicePropertiesInner>() { + public Observable setServicePropertiesAsync(String resourceGroupName, String accountName, CorsRules cors, DeleteRetentionPolicy shareDeleteRetentionPolicy) { + return setServicePropertiesWithServiceResponseAsync(resourceGroupName, accountName, cors, shareDeleteRetentionPolicy).map(new Func1, FileServicePropertiesInner>() { @Override public FileServicePropertiesInner call(ServiceResponse response) { return response.body(); @@ -291,10 +297,11 @@ public FileServicePropertiesInner call(ServiceResponse> setServicePropertiesWithServiceResponseAsync(String resourceGroupName, String accountName, CorsRules cors) { + public Observable> setServicePropertiesWithServiceResponseAsync(String resourceGroupName, String accountName, CorsRules cors, DeleteRetentionPolicy shareDeleteRetentionPolicy) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -308,9 +315,11 @@ public Observable> setServicePropert throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } Validator.validate(cors); + Validator.validate(shareDeleteRetentionPolicy); final String fileServicesName = "default"; FileServicePropertiesInner parameters = new FileServicePropertiesInner(); parameters.withCors(cors); + parameters.withShareDeleteRetentionPolicy(shareDeleteRetentionPolicy); return service.setServiceProperties(resourceGroupName, accountName, this.client.subscriptionId(), fileServicesName, this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareInner.java index 491cd8b548d4..da66c6178021 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareInner.java @@ -34,7 +34,8 @@ public class FileShareInner extends AzureEntityResource { /** * The maximum size of the share, in gigabytes. Must be greater than 0, and - * less than or equal to 5TB (5120). + * less than or equal to 5TB (5120). For Large File Shares, the maximum + * size is 100000. */ @JsonProperty(value = "properties.shareQuota") private Integer shareQuota; @@ -69,7 +70,7 @@ public FileShareInner withMetadata(Map metadata) { } /** - * Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * * @return the shareQuota value */ @@ -78,7 +79,7 @@ public Integer shareQuota() { } /** - * Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * * @param shareQuota the shareQuota value to set * @return the FileShareInner object itself. diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareItemInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareItemInner.java index 4db854637865..786d60581fc9 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareItemInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileShareItemInner.java @@ -33,7 +33,8 @@ public class FileShareItemInner extends AzureEntityResource { /** * The maximum size of the share, in gigabytes. Must be greater than 0, and - * less than or equal to 5TB (5120). + * less than or equal to 5TB (5120). For Large File Shares, the maximum + * size is 100000. */ @JsonProperty(value = "properties.shareQuota") private Integer shareQuota; @@ -68,7 +69,7 @@ public FileShareItemInner withMetadata(Map metadata) { } /** - * Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * Get the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * * @return the shareQuota value */ @@ -77,7 +78,7 @@ public Integer shareQuota() { } /** - * Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * Set the maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * * @param shareQuota the shareQuota value to set * @return the FileShareItemInner object itself. diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileSharesInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileSharesInner.java index 8dc17d834450..1be570e1fd5b 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileSharesInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/FileSharesInner.java @@ -438,7 +438,7 @@ public Observable> call(Response r * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -455,7 +455,7 @@ public FileShareInner create(String resourceGroupName, String accountName, Strin * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -471,7 +471,7 @@ public ServiceFuture createAsync(String resourceGroupName, Strin * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the FileShareInner object */ @@ -491,7 +491,7 @@ public FileShareInner call(ServiceResponse response) { * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the FileShareInner object */ @@ -635,7 +635,7 @@ public Observable> call(Response r * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws CloudException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent @@ -652,7 +652,7 @@ public FileShareInner update(String resourceGroupName, String accountName, Strin * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object @@ -668,7 +668,7 @@ public ServiceFuture updateAsync(String resourceGroupName, Strin * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the FileShareInner object */ @@ -688,7 +688,7 @@ public FileShareInner call(ServiceResponse response) { * @param accountName The name of the storage account within the specified resource group. Storage account names must be between 3 and 24 characters in length and use numbers and lower-case letters only. * @param shareName The name of the file share within the specified storage account. File share names must be between 3 and 63 characters in length and use numbers, lower-case letters and dash (-) only. Every dash (-) character must be immediately preceded and followed by a letter or number. * @param metadata A name-value pair to associate with the share as metadata. - * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). + * @param shareQuota The maximum size of the share, in gigabytes. Must be greater than 0, and less than or equal to 5TB (5120). For Large File Shares, the maximum size is 100000. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the FileShareInner object */ diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuImpl.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationImpl.java similarity index 86% rename from sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuImpl.java rename to sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationImpl.java index 2c4610786d2e..91b7df2f317b 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuImpl.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationImpl.java @@ -9,7 +9,7 @@ package com.microsoft.azure.management.storage.v2019_06_01.implementation; -import com.microsoft.azure.management.storage.v2019_06_01.Sku; +import com.microsoft.azure.management.storage.v2019_06_01.SkuInformation; import com.microsoft.azure.arm.model.implementation.WrapperImpl; import rx.Observable; import java.util.List; @@ -19,10 +19,10 @@ import com.microsoft.azure.management.storage.v2019_06_01.Restriction; import com.microsoft.azure.management.storage.v2019_06_01.SkuTier; -class SkuImpl extends WrapperImpl implements Sku { +class SkuInformationImpl extends WrapperImpl implements SkuInformation { private final StorageManager manager; - SkuImpl(SkuInner inner, StorageManager manager) { + SkuInformationImpl(SkuInformationInner inner, StorageManager manager) { super(inner); this.manager = manager; } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationInner.java new file mode 100644 index 000000000000..54db5f4c852d --- /dev/null +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInformationInner.java @@ -0,0 +1,169 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.storage.v2019_06_01.implementation; + +import com.microsoft.azure.management.storage.v2019_06_01.SkuName; +import com.microsoft.azure.management.storage.v2019_06_01.SkuTier; +import com.microsoft.azure.management.storage.v2019_06_01.Kind; +import java.util.List; +import com.microsoft.azure.management.storage.v2019_06_01.SKUCapability; +import com.microsoft.azure.management.storage.v2019_06_01.Restriction; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Storage SKU and its properties. + */ +public class SkuInformationInner { + /** + * Possible values include: 'Standard_LRS', 'Standard_GRS', + * 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', + * 'Standard_GZRS', 'Standard_RAGZRS'. + */ + @JsonProperty(value = "name", required = true) + private SkuName name; + + /** + * Possible values include: 'Standard', 'Premium'. + */ + @JsonProperty(value = "tier") + private SkuTier tier; + + /** + * The type of the resource, usually it is 'storageAccounts'. + */ + @JsonProperty(value = "resourceType", access = JsonProperty.Access.WRITE_ONLY) + private String resourceType; + + /** + * Indicates the type of storage account. Possible values include: + * 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', + * 'BlockBlobStorage'. + */ + @JsonProperty(value = "kind", access = JsonProperty.Access.WRITE_ONLY) + private Kind kind; + + /** + * The set of locations that the SKU is available. This will be supported + * and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, + * etc.). + */ + @JsonProperty(value = "locations", access = JsonProperty.Access.WRITE_ONLY) + private List locations; + + /** + * The capability information in the specified SKU, including file + * encryption, network ACLs, change notification, etc. + */ + @JsonProperty(value = "capabilities", access = JsonProperty.Access.WRITE_ONLY) + private List capabilities; + + /** + * The restrictions because of which SKU cannot be used. This is empty if + * there are no restrictions. + */ + @JsonProperty(value = "restrictions") + private List restrictions; + + /** + * Get possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS'. + * + * @return the name value + */ + public SkuName name() { + return this.name; + } + + /** + * Set possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS'. + * + * @param name the name value to set + * @return the SkuInformationInner object itself. + */ + public SkuInformationInner withName(SkuName name) { + this.name = name; + return this; + } + + /** + * Get possible values include: 'Standard', 'Premium'. + * + * @return the tier value + */ + public SkuTier tier() { + return this.tier; + } + + /** + * Set possible values include: 'Standard', 'Premium'. + * + * @param tier the tier value to set + * @return the SkuInformationInner object itself. + */ + public SkuInformationInner withTier(SkuTier tier) { + this.tier = tier; + return this; + } + + /** + * Get the type of the resource, usually it is 'storageAccounts'. + * + * @return the resourceType value + */ + public String resourceType() { + return this.resourceType; + } + + /** + * Get indicates the type of storage account. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage'. + * + * @return the kind value + */ + public Kind kind() { + return this.kind; + } + + /** + * Get the set of locations that the SKU is available. This will be supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). + * + * @return the locations value + */ + public List locations() { + return this.locations; + } + + /** + * Get the capability information in the specified SKU, including file encryption, network ACLs, change notification, etc. + * + * @return the capabilities value + */ + public List capabilities() { + return this.capabilities; + } + + /** + * Get the restrictions because of which SKU cannot be used. This is empty if there are no restrictions. + * + * @return the restrictions value + */ + public List restrictions() { + return this.restrictions; + } + + /** + * Set the restrictions because of which SKU cannot be used. This is empty if there are no restrictions. + * + * @param restrictions the restrictions value to set + * @return the SkuInformationInner object itself. + */ + public SkuInformationInner withRestrictions(List restrictions) { + this.restrictions = restrictions; + return this; + } + +} diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInner.java index 16b3eb6451c2..3067bff27300 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkuInner.java @@ -10,10 +10,6 @@ import com.microsoft.azure.management.storage.v2019_06_01.SkuName; import com.microsoft.azure.management.storage.v2019_06_01.SkuTier; -import com.microsoft.azure.management.storage.v2019_06_01.Kind; -import java.util.List; -import com.microsoft.azure.management.storage.v2019_06_01.SKUCapability; -import com.microsoft.azure.management.storage.v2019_06_01.Restriction; import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -21,8 +17,6 @@ */ public class SkuInner { /** - * Gets or sets the SKU name. Required for account creation; optional for - * update. Note that in older versions, SKU name was called accountType. * Possible values include: 'Standard_LRS', 'Standard_GRS', * 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', * 'Standard_GZRS', 'Standard_RAGZRS'. @@ -31,50 +25,13 @@ public class SkuInner { private SkuName name; /** - * Gets the SKU tier. This is based on the SKU name. Possible values - * include: 'Standard', 'Premium'. + * Possible values include: 'Standard', 'Premium'. */ - @JsonProperty(value = "tier", access = JsonProperty.Access.WRITE_ONLY) + @JsonProperty(value = "tier") private SkuTier tier; /** - * The type of the resource, usually it is 'storageAccounts'. - */ - @JsonProperty(value = "resourceType", access = JsonProperty.Access.WRITE_ONLY) - private String resourceType; - - /** - * Indicates the type of storage account. Possible values include: - * 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', - * 'BlockBlobStorage'. - */ - @JsonProperty(value = "kind", access = JsonProperty.Access.WRITE_ONLY) - private Kind kind; - - /** - * The set of locations that the SKU is available. This will be supported - * and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, - * etc.). - */ - @JsonProperty(value = "locations", access = JsonProperty.Access.WRITE_ONLY) - private List locations; - - /** - * The capability information in the specified SKU, including file - * encryption, network ACLs, change notification, etc. - */ - @JsonProperty(value = "capabilities", access = JsonProperty.Access.WRITE_ONLY) - private List capabilities; - - /** - * The restrictions because of which SKU cannot be used. This is empty if - * there are no restrictions. - */ - @JsonProperty(value = "restrictions") - private List restrictions; - - /** - * Get gets or sets the SKU name. Required for account creation; optional for update. Note that in older versions, SKU name was called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS'. + * Get possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS'. * * @return the name value */ @@ -83,7 +40,7 @@ public SkuName name() { } /** - * Set gets or sets the SKU name. Required for account creation; optional for update. Note that in older versions, SKU name was called accountType. Possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS'. + * Set possible values include: 'Standard_LRS', 'Standard_GRS', 'Standard_RAGRS', 'Standard_ZRS', 'Premium_LRS', 'Premium_ZRS', 'Standard_GZRS', 'Standard_RAGZRS'. * * @param name the name value to set * @return the SkuInner object itself. @@ -94,7 +51,7 @@ public SkuInner withName(SkuName name) { } /** - * Get gets the SKU tier. This is based on the SKU name. Possible values include: 'Standard', 'Premium'. + * Get possible values include: 'Standard', 'Premium'. * * @return the tier value */ @@ -103,58 +60,13 @@ public SkuTier tier() { } /** - * Get the type of the resource, usually it is 'storageAccounts'. - * - * @return the resourceType value - */ - public String resourceType() { - return this.resourceType; - } - - /** - * Get indicates the type of storage account. Possible values include: 'Storage', 'StorageV2', 'BlobStorage', 'FileStorage', 'BlockBlobStorage'. - * - * @return the kind value - */ - public Kind kind() { - return this.kind; - } - - /** - * Get the set of locations that the SKU is available. This will be supported and registered Azure Geo Regions (e.g. West US, East US, Southeast Asia, etc.). - * - * @return the locations value - */ - public List locations() { - return this.locations; - } - - /** - * Get the capability information in the specified SKU, including file encryption, network ACLs, change notification, etc. - * - * @return the capabilities value - */ - public List capabilities() { - return this.capabilities; - } - - /** - * Get the restrictions because of which SKU cannot be used. This is empty if there are no restrictions. - * - * @return the restrictions value - */ - public List restrictions() { - return this.restrictions; - } - - /** - * Set the restrictions because of which SKU cannot be used. This is empty if there are no restrictions. + * Set possible values include: 'Standard', 'Premium'. * - * @param restrictions the restrictions value to set + * @param tier the tier value to set * @return the SkuInner object itself. */ - public SkuInner withRestrictions(List restrictions) { - this.restrictions = restrictions; + public SkuInner withTier(SkuTier tier) { + this.tier = tier; return this; } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusImpl.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusImpl.java index 8d6e0b896c08..826c870a0760 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusImpl.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusImpl.java @@ -16,19 +16,19 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.Page; import com.microsoft.azure.arm.utils.PagedListConverter; -import com.microsoft.azure.management.storage.v2019_06_01.Sku; +import com.microsoft.azure.management.storage.v2019_06_01.SkuInformation; class SkusImpl extends WrapperImpl implements Skus { - private PagedListConverter converter; + private PagedListConverter converter; private final StorageManager manager; SkusImpl(StorageManager manager) { super(manager.inner().skus()); this.manager = manager; - this.converter = new PagedListConverter() { + this.converter = new PagedListConverter() { @Override - public Observable typeConvertAsync(SkuInner inner) { - return Observable.just((Sku) wrapModel(inner)); + public Observable typeConvertAsync(SkuInformationInner inner) { + return Observable.just((SkuInformation) wrapModel(inner)); } }; } @@ -37,29 +37,29 @@ public StorageManager manager() { return this.manager; } - private SkuImpl wrapModel(SkuInner inner) { - return new SkuImpl(inner, manager()); + private SkuInformationImpl wrapModel(SkuInformationInner inner) { + return new SkuInformationImpl(inner, manager()); } @Override - public PagedList list() { + public PagedList list() { SkusInner client = this.inner(); return converter.convert(client.list()); } @Override - public Observable listAsync() { + public Observable listAsync() { SkusInner client = this.inner(); return client.listAsync() - .flatMap(new Func1, Observable>() { + .flatMap(new Func1, Observable>() { @Override - public Observable call(Page innerPage) { + public Observable call(Page innerPage) { return Observable.from(innerPage.items()); } }) - .map(new Func1() { + .map(new Func1() { @Override - public Sku call(SkuInner inner) { + public SkuInformation call(SkuInformationInner inner) { return wrapModel(inner); } }); diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusInner.java index bc9477e3e88a..99423df6e98d 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/SkusInner.java @@ -63,15 +63,15 @@ interface SkusService { /** * Lists the available SKUs supported by Microsoft.Storage for given subscription. * - * @return the PagedList object if successful. + * @return the PagedList object if successful. */ - public PagedList list() { - PageImpl page = new PageImpl<>(); + public PagedList list() { + PageImpl page = new PageImpl<>(); page.setItems(listWithServiceResponseAsync().toBlocking().single().body()); page.setNextPageLink(null); - return new PagedList(page) { + return new PagedList(page) { @Override - public Page nextPage(String nextPageLink) { + public Page nextPage(String nextPageLink) { return null; } }; @@ -83,20 +83,20 @@ public Page nextPage(String nextPageLink) { * @param serviceCallback the async ServiceCallback to handle successful and failed responses. * @return the {@link ServiceFuture} object */ - public ServiceFuture> listAsync(final ServiceCallback> serviceCallback) { + public ServiceFuture> listAsync(final ServiceCallback> serviceCallback) { return ServiceFuture.fromResponse(listWithServiceResponseAsync(), serviceCallback); } /** * Lists the available SKUs supported by Microsoft.Storage for given subscription. * - * @return the observable to the List<SkuInner> object + * @return the observable to the List<SkuInformationInner> object */ - public Observable> listAsync() { - return listWithServiceResponseAsync().map(new Func1>, Page>() { + public Observable> listAsync() { + return listWithServiceResponseAsync().map(new Func1>, Page>() { @Override - public Page call(ServiceResponse> response) { - PageImpl page = new PageImpl<>(); + public Page call(ServiceResponse> response) { + PageImpl page = new PageImpl<>(); page.setItems(response.body()); return page; } @@ -106,9 +106,9 @@ public Page call(ServiceResponse> response) { /** * Lists the available SKUs supported by Microsoft.Storage for given subscription. * - * @return the observable to the List<SkuInner> object + * @return the observable to the List<SkuInformationInner> object */ - public Observable>> listWithServiceResponseAsync() { + public Observable>> listWithServiceResponseAsync() { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } @@ -116,16 +116,16 @@ public Observable>> listWithServiceResponseAsync( throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } return service.list(this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { + .flatMap(new Func1, Observable>>>() { @Override - public Observable>> call(Response response) { + public Observable>> call(Response response) { try { - ServiceResponse> result = listDelegate(response); - List items = null; + ServiceResponse> result = listDelegate(response); + List items = null; if (result.body() != null) { items = result.body().items(); } - ServiceResponse> clientResponse = new ServiceResponse>(items, result.response()); + ServiceResponse> clientResponse = new ServiceResponse>(items, result.response()); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -134,9 +134,9 @@ public Observable>> call(Response r }); } - private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountImpl.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountImpl.java index 046f15699868..00dd985713b2 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountImpl.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountImpl.java @@ -28,7 +28,7 @@ import com.microsoft.azure.management.storage.v2019_06_01.PrivateEndpointConnection; import java.util.List; import com.microsoft.azure.management.storage.v2019_06_01.ProvisioningState; -import com.microsoft.azure.management.storage.v2019_06_01.Sku; +import com.microsoft.azure.management.storage.v2019_06_01.RoutingPreference; import com.microsoft.azure.management.storage.v2019_06_01.AccountStatus; import rx.functions.Func1; @@ -183,6 +183,11 @@ public ProvisioningState provisioningState() { return this.inner().provisioningState(); } + @Override + public RoutingPreference routingPreference() { + return this.inner().routingPreference(); + } + @Override public Endpoints secondaryEndpoints() { return this.inner().secondaryEndpoints(); @@ -194,13 +199,8 @@ public String secondaryLocation() { } @Override - public Sku sku() { - SkuInner inner = this.inner().sku(); - if (inner != null) { - return new SkuImpl(inner, manager()); - } else { - return null; - } + public SkuInner sku() { + return this.inner().sku(); } @Override @@ -319,4 +319,14 @@ public StorageAccountImpl withNetworkRuleSet(NetworkRuleSet networkRuleSet) { return this; } + @Override + public StorageAccountImpl withRoutingPreference(RoutingPreference routingPreference) { + if (isInCreateMode()) { + this.createParameter.withRoutingPreference(routingPreference); + } else { + this.updateParameter.withRoutingPreference(routingPreference); + } + return this; + } + } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountInner.java index 0f222411d879..d043744a2032 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountInner.java @@ -22,6 +22,7 @@ import com.microsoft.azure.management.storage.v2019_06_01.GeoReplicationStats; import com.microsoft.azure.management.storage.v2019_06_01.LargeFileSharesState; import java.util.List; +import com.microsoft.azure.management.storage.v2019_06_01.RoutingPreference; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.Resource; @@ -191,6 +192,13 @@ public class StorageAccountInner extends Resource { @JsonProperty(value = "properties.privateEndpointConnections", access = JsonProperty.Access.WRITE_ONLY) private List privateEndpointConnections; + /** + * Maintains information about the network routing choice opted by the user + * for data transfer. + */ + @JsonProperty(value = "properties.routingPreference") + private RoutingPreference routingPreference; + /** * Get gets the SKU. * @@ -453,4 +461,24 @@ public List privateEndpointConnections() { return this.privateEndpointConnections; } + /** + * Get maintains information about the network routing choice opted by the user for data transfer. + * + * @return the routingPreference value + */ + public RoutingPreference routingPreference() { + return this.routingPreference; + } + + /** + * Set maintains information about the network routing choice opted by the user for data transfer. + * + * @param routingPreference the routingPreference value to set + * @return the StorageAccountInner object itself. + */ + public StorageAccountInner withRoutingPreference(RoutingPreference routingPreference) { + this.routingPreference = routingPreference; + return this; + } + } diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountsInner.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountsInner.java index cd3a89468746..0d7fc6552572 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountsInner.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageAccountsInner.java @@ -49,8 +49,6 @@ import rx.Observable; import com.microsoft.azure.LongRunningFinalState; import com.microsoft.azure.LongRunningOperationOptions; -import com.microsoft.azure.LongRunningFinalState; -import com.microsoft.azure.LongRunningOperationOptions; /** * An instance of this class provides access to all the operations defined diff --git a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageManagementClientImpl.java b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageManagementClientImpl.java index 6792784a62ec..f325588fdd1e 100644 --- a/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageManagementClientImpl.java +++ b/sdk/storage/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/storage/v2019_06_01/implementation/StorageManagementClientImpl.java @@ -10,6 +10,8 @@ import com.microsoft.azure.AzureClient; import com.microsoft.azure.AzureServiceClient; +import com.microsoft.azure.LongRunningFinalState; +import com.microsoft.azure.LongRunningOperationOptions; import com.microsoft.rest.credentials.ServiceClientCredentials; import com.microsoft.rest.RestClient;