Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion sdk/storage/mgmt-v2019_06_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-storage</artifactId>
<version>1.0.0-beta</version>
<version>1.0.0-beta-1</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Storage Management</name>
<description>This package contains Microsoft Storage Management SDK.</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -57,6 +58,11 @@ public interface BlobServiceProperties extends HasInner<BlobServicePropertiesInn
*/
String name();

/**
* @return the sku value.
*/
SkuInner sku();

/**
* @return the type value.
*/
Expand Down Expand Up @@ -145,7 +151,7 @@ interface WithDefaultServiceVersion {
interface WithDeleteRetentionPolicy {
/**
* Specifies deleteRetentionPolicy.
* @param deleteRetentionPolicy The blob service properties for soft delete
* @param deleteRetentionPolicy The blob service properties for blob soft delete
* @return the next definition stage
*/
WithCreate withDeleteRetentionPolicy(DeleteRetentionPolicy deleteRetentionPolicy);
Expand Down Expand Up @@ -223,7 +229,7 @@ interface WithDefaultServiceVersion {
interface WithDeleteRetentionPolicy {
/**
* Specifies deleteRetentionPolicy.
* @param deleteRetentionPolicy The blob service properties for soft delete
* @param deleteRetentionPolicy The blob service properties for blob soft delete
* @return the next update stage
*/
Update withDeleteRetentionPolicy(DeleteRetentionPolicy deleteRetentionPolicy);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* The blob service properties for soft delete.
* The service properties for soft delete.
*/
public class DeleteRetentionPolicy {
/**
* Indicates whether DeleteRetentionPolicy is enabled for the Blob service.
* Indicates whether DeleteRetentionPolicy is enabled.
*/
@JsonProperty(value = "enabled")
private Boolean enabled;

/**
* Indicates the number of days that the deleted blob should be retained.
* Indicates the number of days that the deleted item should be retained.
* The minimum specified value can be 1 and the maximum value can be 365.
*/
@JsonProperty(value = "days")
private Integer days;

/**
* Get indicates whether DeleteRetentionPolicy is enabled for the Blob service.
* Get indicates whether DeleteRetentionPolicy is enabled.
*
* @return the enabled value
*/
Expand All @@ -37,7 +37,7 @@ public Boolean enabled() {
}

/**
* Set indicates whether DeleteRetentionPolicy is enabled for the Blob service.
* Set indicates whether DeleteRetentionPolicy is enabled.
*
* @param enabled the enabled value to set
* @return the DeleteRetentionPolicy object itself.
Expand All @@ -48,7 +48,7 @@ public DeleteRetentionPolicy withEnabled(Boolean enabled) {
}

/**
* Get indicates the number of days that the deleted blob should be retained. The minimum specified value can be 1 and the maximum value can be 365.
* Get indicates the number of days that the deleted item should be retained. The minimum specified value can be 1 and the maximum value can be 365.
*
* @return the days value
*/
Expand All @@ -57,7 +57,7 @@ public Integer days() {
}

/**
* Set indicates the number of days that the deleted blob should be retained. The minimum specified value can be 1 and the maximum value can be 365.
* Set indicates the number of days that the deleted item should be retained. The minimum specified value can be 1 and the maximum value can be 365.
*
* @param days the days value to set
* @return the DeleteRetentionPolicy object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,18 @@ public class Endpoints {
@JsonProperty(value = "dfs", access = JsonProperty.Access.WRITE_ONLY)
private String dfs;

/**
* Gets the microsoft routing storage endpoints.
*/
@JsonProperty(value = "microsoftEndpoints")
private StorageAccountMicrosoftEndpoints microsoftEndpoints;

/**
* Gets the internet routing storage endpoints.
*/
@JsonProperty(value = "internetEndpoints")
private StorageAccountInternetEndpoints internetEndpoints;

/**
* Get gets the blob endpoint.
*
Expand Down Expand Up @@ -105,4 +117,44 @@ public String dfs() {
return this.dfs;
}

/**
* Get gets the microsoft routing storage endpoints.
*
* @return the microsoftEndpoints value
*/
public StorageAccountMicrosoftEndpoints microsoftEndpoints() {
return this.microsoftEndpoints;
}

/**
* Set gets the microsoft routing storage endpoints.
*
* @param microsoftEndpoints the microsoftEndpoints value to set
* @return the Endpoints object itself.
*/
public Endpoints withMicrosoftEndpoints(StorageAccountMicrosoftEndpoints microsoftEndpoints) {
this.microsoftEndpoints = microsoftEndpoints;
return this;
}

/**
* Get gets the internet routing storage endpoints.
*
* @return the internetEndpoints value
*/
public StorageAccountInternetEndpoints internetEndpoints() {
return this.internetEndpoints;
}

/**
* Set gets the internet routing storage endpoints.
*
* @param internetEndpoints the internetEndpoints value to set
* @return the Endpoints object itself.
*/
public Endpoints withInternetEndpoints(StorageAccountInternetEndpoints internetEndpoints) {
this.internetEndpoints = internetEndpoints;
return this;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
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 java.util.List;
import com.microsoft.azure.management.storage.v2019_06_01.implementation.SkuInner;


/**
* Type representing FileServiceProperties.
Expand All @@ -38,6 +39,16 @@ public interface FileServiceProperties extends HasInner<FileServicePropertiesInn
*/
String name();

/**
* @return the shareDeleteRetentionPolicy value.
*/
DeleteRetentionPolicy shareDeleteRetentionPolicy();

/**
* @return the sku value.
*/
SkuInner sku();

/**
* @return the type value.
*/
Expand All @@ -46,7 +57,7 @@ public interface FileServiceProperties extends HasInner<FileServicePropertiesInn
/**
* The entirety of the FileServiceProperties definition.
*/
interface Definition extends DefinitionStages.Blank, DefinitionStages.WithStorageAccount, DefinitionStages.WithCors, DefinitionStages.WithCreate {
interface Definition extends DefinitionStages.Blank, DefinitionStages.WithStorageAccount, DefinitionStages.WithCors, DefinitionStages.WithShareDeleteRetentionPolicy, DefinitionStages.WithCreate {
}

/**
Expand Down Expand Up @@ -81,7 +92,19 @@ interface WithCors {
* @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
* @return the next definition stage
*/
WithCreate withCors(CorsRules cors);
WithShareDeleteRetentionPolicy withCors(CorsRules cors);
}

/**
* The stage of the fileserviceproperties definition allowing to specify ShareDeleteRetentionPolicy.
*/
interface WithShareDeleteRetentionPolicy {
/**
* Specifies shareDeleteRetentionPolicy.
* @param shareDeleteRetentionPolicy The file service properties for share soft delete
* @return the next definition stage
*/
WithCreate withShareDeleteRetentionPolicy(DeleteRetentionPolicy shareDeleteRetentionPolicy);
}

/**
Expand All @@ -95,7 +118,7 @@ interface WithCreate extends Creatable<FileServiceProperties> {
/**
* The template for a FileServiceProperties update operation, containing all the settings that can be modified.
*/
interface Update extends Appliable<FileServiceProperties>, UpdateStages.WithCors {
interface Update extends Appliable<FileServiceProperties>, UpdateStages.WithCors, UpdateStages.WithShareDeleteRetentionPolicy {
}

/**
Expand All @@ -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);
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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<RoutingChoice> {
/** 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<RoutingChoice> values() {
return values(RoutingChoice.class);
}
}
Loading