Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

[ReleasePR sdk/storage/mgmt-v2016_01_01] Revert "[SRP] Add default response status code" #7220

Closed
wants to merge 1 commit into from
Closed

[ReleasePR sdk/storage/mgmt-v2016_01_01] Revert "[SRP] Add default response status code" #7220

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions sdk/storage/mgmt-v2016_01_01/pom.xml
View file
Open in desktop
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.2.0</version>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-storage</artifactId>
<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:[email protected]:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:[email protected]: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 ..._01_01/src/main/java/com/microsoft/azure/management/storage/v2016_01_01/CustomDomain.java
View file
Open in desktop
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
36 changes: 27 additions & 9 deletions ...1_01/src/main/java/com/microsoft/azure/management/storage/v2016_01_01/StorageAccount.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,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', 'BlobStorage'
* @return the next definition stage
*/
WithSku withKind(Kind kind);
}

Expand All @@ -133,36 +135,44 @@ interface WithKind {
interface WithSku {
/**
* Specifies sku.
*/
* @param sku Required. Gets or sets the sku name
* @return the next definition stage
*/
WithCreate withSku(Sku 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 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);
}
Expand All @@ -186,41 +196,49 @@ 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 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 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(Sku sku);
}
Expand Down
20 changes: 10 additions & 10 deletions ...soft/azure/management/storage/v2016_01_01/implementation/StorageManagementClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public String apiVersion() {
return this.apiVersion;
}

/** Gets or sets the preferred language for the response. */
/** The preferred language for the response. */
private String acceptLanguage;

/**
* Gets Gets or sets the preferred language for the response.
* Gets The preferred language for the response.
*
* @return the acceptLanguage value.
*/
Expand All @@ -76,7 +76,7 @@ public String acceptLanguage() {
}

/**
* Sets Gets or sets the preferred language for the response.
* Sets The preferred language for the response.
*
* @param acceptLanguage the acceptLanguage value.
* @return the service client itself
Expand All @@ -86,11 +86,11 @@ public StorageManagementClientImpl withAcceptLanguage(String acceptLanguage) {
return this;
}

/** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */
/** The retry timeout in seconds for Long Running Operations. Default value is 30. */
private int longRunningOperationRetryTimeout;

/**
* Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
* Gets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @return the longRunningOperationRetryTimeout value.
*/
Expand All @@ -99,7 +99,7 @@ public int longRunningOperationRetryTimeout() {
}

/**
* Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30.
* Sets The retry timeout in seconds for Long Running Operations. Default value is 30.
*
* @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value.
* @return the service client itself
Expand All @@ -109,11 +109,11 @@ public StorageManagementClientImpl withLongRunningOperationRetryTimeout(int long
return this;
}

/** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
/** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */
private boolean generateClientRequestId;

/**
* Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
* Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @return the generateClientRequestId value.
*/
Expand All @@ -122,7 +122,7 @@ public boolean generateClientRequestId() {
}

/**
* Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
* Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
*
* @param generateClientRequestId the generateClientRequestId value.
* @return the service client itself
Expand Down Expand Up @@ -205,6 +205,6 @@ protected void initialize() {
*/
@Override
public String userAgent() {
return String.format("%s (%s, %s)", super.userAgent(), "StorageManagementClient", "2016-01-01");
return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "StorageManagementClient", "2016-01-01");
}
}