Skip to content

Commit

Permalink
Generated from a350d52d322fba519eef055faee263d52a71b445
Browse files Browse the repository at this point in the history 
Fix x-ms-enum name conflict
  • Loading branch information
SDK Automation committed Feb 21, 2020
1 parent 1177942 commit a66735b
Show file tree
Hide file tree
Showing 11 changed files with 86 additions and 52 deletions.
12 changes: 7 additions & 5 deletions sdk/storage/mgmt-v2017_10_01/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.3.0</version>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta-1</version>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Storage Management</name>
<description>This package contains Microsoft Storage Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down Expand Up @@ -71,6 +71,8 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
16 changes: 8 additions & 8 deletions ..._10_01/src/main/java/com/microsoft/azure/management/storage/v2017_10_01/CustomDomain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ public class CustomDomain {
* Indicates whether indirect CName validation is enabled. Default value is
* false. This should only be set on updates.
*/
@JsonProperty(value = "useSubDomain")
private Boolean useSubDomain;
@JsonProperty(value = "useSubDomainName")
private Boolean useSubDomainName;

/**
* Get gets or sets the custom domain name assigned to the storage account. Name is the CNAME source.
Expand All @@ -52,20 +52,20 @@ public CustomDomain withName(String name) {
/**
* Get indicates whether indirect CName validation is enabled. Default value is false. This should only be set on updates.
*
* @return the useSubDomain value
* @return the useSubDomainName value
*/
public Boolean useSubDomain() {
return this.useSubDomain;
public Boolean useSubDomainName() {
return this.useSubDomainName;
}

/**
* Set indicates whether indirect CName validation is enabled. Default value is false. This should only be set on updates.
*
* @param useSubDomain the useSubDomain value to set
* @param useSubDomainName the useSubDomainName value to set
* @return the CustomDomain object itself.
*/
public CustomDomain withUseSubDomain(Boolean useSubDomain) {
this.useSubDomain = useSubDomain;
public CustomDomain withUseSubDomainName(Boolean useSubDomainName) {
this.useSubDomainName = useSubDomainName;
return this;
}

Expand Down
2 changes: 1 addition & 1 deletion ...017_10_01/src/main/java/com/microsoft/azure/management/storage/v2017_10_01/Dimension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Dimension of blobs, possiblly be blob type or access tier.
* Dimension of blobs, possibly be blob type or access tier.
*/
public class Dimension {
/**
Expand Down
2 changes: 1 addition & 1 deletion ...rc/main/java/com/microsoft/azure/management/storage/v2017_10_01/ServiceSasParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* The parameters to list service SAS credentials of a speicific resource.
* The parameters to list service SAS credentials of a specific resource.
*/
public class ServiceSasParameters {
/**
Expand Down
64 changes: 48 additions & 16 deletions ...0_01/src/main/java/com/microsoft/azure/management/storage/v2017_10_01/StorageAccount.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
interface WithKind {
/**
* Specifies kind.
*/
* @param kind Required. Indicates the type of storage account. Possible values include: 'Storage', 'StorageV2', 'BlobStorage'
* @return the next definition stage
*/
WithSku withKind(Kind kind);
}

Expand All @@ -149,66 +151,80 @@ interface WithKind {
interface WithSku {
/**
* Specifies sku.
*/
* @param sku Required. Gets or sets the sku name
* @return the next definition stage
*/
WithCreate withSku(SkuInner sku);
}

/**
* The stage of the storageaccount update allowing to specify AccessTier.
* The stage of the storageaccount definition allowing to specify AccessTier.
*/
interface WithAccessTier {
/**
* Specifies accessTier.
* @param accessTier Required for storage accounts where kind = BlobStorage. The access tier used for billing. Possible values include: 'Hot', 'Cool'
* @return the next definition stage
*/
WithCreate withAccessTier(AccessTier accessTier);
}

/**
* The stage of the storageaccount update allowing to specify CustomDomain.
* The stage of the storageaccount definition allowing to specify CustomDomain.
*/
interface WithCustomDomain {
/**
* Specifies customDomain.
* @param customDomain User domain assigned to the storage account. Name is the CNAME source. Only one custom domain is supported per storage account at this time. To clear the existing custom domain, use an empty string for the custom domain name property
* @return the next definition stage
*/
WithCreate withCustomDomain(CustomDomain customDomain);
}

/**
* The stage of the storageaccount update allowing to specify EnableHttpsTrafficOnly.
* The stage of the storageaccount definition allowing to specify EnableHttpsTrafficOnly.
*/
interface WithEnableHttpsTrafficOnly {
/**
* Specifies enableHttpsTrafficOnly.
* @param enableHttpsTrafficOnly Allows https traffic only to storage service if sets to true
* @return the next definition stage
*/
WithCreate withEnableHttpsTrafficOnly(Boolean enableHttpsTrafficOnly);
}

/**
* The stage of the storageaccount update allowing to specify Encryption.
* The stage of the storageaccount definition allowing to specify Encryption.
*/
interface WithEncryption {
/**
* Specifies encryption.
* @param encryption Provides the encryption settings on the account. If left unspecified the account encryption settings will remain the same. The default setting is unencrypted
* @return the next definition stage
*/
WithCreate withEncryption(Encryption encryption);
}

/**
* The stage of the storageaccount update allowing to specify Identity.
* The stage of the storageaccount definition allowing to specify Identity.
*/
interface WithIdentity {
/**
* Specifies identity.
* @param identity The identity of the resource
* @return the next definition stage
*/
WithCreate withIdentity(Identity identity);
}

/**
* The stage of the storageaccount update allowing to specify NetworkRuleSet.
* The stage of the storageaccount definition allowing to specify NetworkRuleSet.
*/
interface WithNetworkRuleSet {
/**
* Specifies networkRuleSet.
* @param networkRuleSet Network rule set
* @return the next definition stage
*/
WithCreate withNetworkRuleSet(NetworkRuleSet networkRuleSet);
}
Expand All @@ -232,81 +248,97 @@ interface Update extends Appliable<StorageAccount>, Resource.UpdateWithTags<Upda
*/
interface UpdateStages {
/**
* The stage of the storageaccount {0} allowing to specify AccessTier.
* The stage of the storageaccount update allowing to specify AccessTier.
*/
interface WithAccessTier {
/**
* Specifies accessTier.
* @param accessTier Required for storage accounts where kind = BlobStorage. The access tier used for billing. Possible values include: 'Hot', 'Cool'
* @return the next update stage
*/
Update withAccessTier(AccessTier accessTier);
}

/**
* The stage of the storageaccount {0} allowing to specify CustomDomain.
* The stage of the storageaccount update allowing to specify CustomDomain.
*/
interface WithCustomDomain {
/**
* Specifies customDomain.
* @param customDomain Custom domain assigned to the storage account by the user. Name is the CNAME source. Only one custom domain is supported per storage account at this time. To clear the existing custom domain, use an empty string for the custom domain name property
* @return the next update stage
*/
Update withCustomDomain(CustomDomain customDomain);
}

/**
* The stage of the storageaccount {0} allowing to specify EnableHttpsTrafficOnly.
* The stage of the storageaccount update allowing to specify EnableHttpsTrafficOnly.
*/
interface WithEnableHttpsTrafficOnly {
/**
* Specifies enableHttpsTrafficOnly.
* @param enableHttpsTrafficOnly Allows https traffic only to storage service if sets to true
* @return the next update stage
*/
Update withEnableHttpsTrafficOnly(Boolean enableHttpsTrafficOnly);
}

/**
* The stage of the storageaccount {0} allowing to specify Encryption.
* The stage of the storageaccount update allowing to specify Encryption.
*/
interface WithEncryption {
/**
* Specifies encryption.
* @param encryption Provides the encryption settings on the account. The default setting is unencrypted
* @return the next update stage
*/
Update withEncryption(Encryption encryption);
}

/**
* The stage of the storageaccount {0} allowing to specify Identity.
* The stage of the storageaccount update allowing to specify Identity.
*/
interface WithIdentity {
/**
* Specifies identity.
* @param identity The identity of the resource
* @return the next update stage
*/
Update withIdentity(Identity identity);
}

/**
* The stage of the storageaccount {0} allowing to specify Kind.
* The stage of the storageaccount update allowing to specify Kind.
*/
interface WithKind {
/**
* Specifies kind.
* @param kind Optional. Indicates the type of storage account. Currently only StorageV2 value supported by server. Possible values include: 'Storage', 'StorageV2', 'BlobStorage'
* @return the next update stage
*/
Update withKind(Kind kind);
}

/**
* The stage of the storageaccount {0} allowing to specify NetworkRuleSet.
* The stage of the storageaccount update allowing to specify NetworkRuleSet.
*/
interface WithNetworkRuleSet {
/**
* Specifies networkRuleSet.
* @param networkRuleSet Network rule set
* @return the next update stage
*/
Update withNetworkRuleSet(NetworkRuleSet networkRuleSet);
}

/**
* The stage of the storageaccount {0} allowing to specify Sku.
* The stage of the storageaccount update allowing to specify Sku.
*/
interface WithSku {
/**
* Specifies sku.
* @param sku Gets or sets the SKU name. Note that the SKU name cannot be updated to Standard_ZRS or Premium_LRS, nor can accounts of those sku names be updated to any other value
* @return the next update stage
*/
Update withSku(SkuInner sku);
}
Expand Down
2 changes: 1 addition & 1 deletion ...t/azure/management/storage/v2017_10_01/StorageAccountCheckNameAvailabilityParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* The parameters used to check the availabity of the storage account name.
* The parameters used to check the availability of the storage account name.
*/
public class StorageAccountCheckNameAvailabilityParameters {
/**
Expand Down
6 changes: 3 additions & 3 deletions ...microsoft/azure/management/storage/v2017_10_01/StorageAccountRegenerateKeyParameters.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
*/
public class StorageAccountRegenerateKeyParameters {
/**
* The name of storage keys that want to be regenerated, possible vaules
* The name of storage keys that want to be regenerated, possible values
* are key1, key2.
*/
@JsonProperty(value = "keyName", required = true)
private String keyName;

/**
* Get the name of storage keys that want to be regenerated, possible vaules are key1, key2.
* Get the name of storage keys that want to be regenerated, possible values are key1, key2.
*
* @return the keyName value
*/
Expand All @@ -31,7 +31,7 @@ public String keyName() {
}

/**
* Set the name of storage keys that want to be regenerated, possible vaules are key1, key2.
* Set the name of storage keys that want to be regenerated, possible values are key1, key2.
*
* @param keyName the keyName value to set
* @return the StorageAccountRegenerateKeyParameters object itself.
Expand Down
2 changes: 1 addition & 1 deletion ..._01/src/main/java/com/microsoft/azure/management/storage/v2017_10_01/StorageAccounts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public interface StorageAccounts extends SupportsCreating<StorageAccount.Definit
*
* @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 keyName The name of storage keys that want to be regenerated, possible vaules are key1, key2.
* @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Expand Down
4 changes: 2 additions & 2 deletions ...soft/azure/management/storage/v2017_10_01/implementation/ListServiceSasResponseInner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*/
public class ListServiceSasResponseInner {
/**
* List service SAS credentials of speicific resource.
* List service SAS credentials of specific resource.
*/
@JsonProperty(value = "serviceSasToken", access = JsonProperty.Access.WRITE_ONLY)
private String serviceSasToken;

/**
* Get list service SAS credentials of speicific resource.
* Get list service SAS credentials of specific resource.
*
* @return the serviceSasToken value
*/
Expand Down
8 changes: 4 additions & 4 deletions ...m/microsoft/azure/management/storage/v2017_10_01/implementation/StorageAccountsInner.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ private ServiceResponse<StorageAccountListKeysResultInner> listKeysDelegate(Resp
*
* @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 keyName The name of storage keys that want to be regenerated, possible vaules are key1, key2.
* @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2.
* @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
Expand All @@ -913,7 +913,7 @@ public StorageAccountListKeysResultInner regenerateKey(String resourceGroupName,
*
* @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 keyName The name of storage keys that want to be regenerated, possible vaules are key1, key2.
* @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2.
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the {@link ServiceFuture} object
Expand All @@ -927,7 +927,7 @@ public ServiceFuture<StorageAccountListKeysResultInner> regenerateKeyAsync(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 keyName The name of storage keys that want to be regenerated, possible vaules are key1, key2.
* @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the StorageAccountListKeysResultInner object
*/
Expand All @@ -945,7 +945,7 @@ public StorageAccountListKeysResultInner call(ServiceResponse<StorageAccountList
*
* @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 keyName The name of storage keys that want to be regenerated, possible vaules are key1, key2.
* @param keyName The name of storage keys that want to be regenerated, possible values are key1, key2.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable to the StorageAccountListKeysResultInner object
*/
Expand Down
Loading

0 comments on commit a66735b

Please sign in to comment.