From bcb8b1771d21598a817ce44b2ede69a922123095 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 4 Dec 2020 08:26:58 +0000 Subject: [PATCH] CodeGen from PR 11869 in Azure/azure-rest-api-specs Merge 6cb8c9dc811baa1b3c3cea27b3b2145ba7297caf into 13a8cf49fa61ef7d4a4f1c9af4c04ae9b2c1423e --- sdk/keyvault/mgmt-v2016_10_01/pom.xml | 13 +-- .../v2016_10_01/AccessPolicyEntry.java | 16 +-- .../v2016_10_01/DeletedVaultProperties.java | 10 +- .../v2016_10_01/LogSpecification.java | 12 +-- .../v2016_10_01/OperationDisplay.java | 18 ++-- .../keyvault/v2016_10_01/Permissions.java | 16 +-- .../v2016_10_01/ServiceSpecification.java | 4 +- .../management/keyvault/v2016_10_01/Sku.java | 9 +- .../keyvault/v2016_10_01/Vault.java | 10 +- .../VaultAccessPolicyParameters.java | 2 + .../VaultAccessPolicyProperties.java | 4 +- .../VaultCheckNameAvailabilityParameters.java | 11 +- .../VaultCreateOrUpdateParameters.java | 12 +-- .../v2016_10_01/VaultPatchParameters.java | 8 +- .../v2016_10_01/VaultPatchProperties.java | 36 +++---- .../keyvault/v2016_10_01/VaultProperties.java | 43 ++++---- .../CheckNameAvailabilityResultInner.java | 6 +- .../implementation/DeletedVaultImpl.java | 1 + .../implementation/DeletedVaultInner.java | 10 +- .../KeyVaultManagementClientImpl.java | 20 ++-- .../implementation/OperationInner.java | 16 +-- .../implementation/OperationsImpl.java | 3 +- .../VaultAccessPolicyParametersImpl.java | 9 +- .../VaultAccessPolicyParametersInner.java | 8 +- .../implementation/VaultInner.java | 4 +- .../implementation/VaultsImpl.java | 17 +-- .../implementation/VaultsInner.java | 100 +++++++++--------- 27 files changed, 220 insertions(+), 198 deletions(-) diff --git a/sdk/keyvault/mgmt-v2016_10_01/pom.xml b/sdk/keyvault/mgmt-v2016_10_01/pom.xml index 00e9feb2b106..d3e6895d5c65 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/pom.xml +++ b/sdk/keyvault/mgmt-v2016_10_01/pom.xml @@ -11,15 +11,15 @@ com.microsoft.azure azure-arm-parent - 1.3.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-keyvault - 1.0.0-beta-2 + 1.0.0-beta jar Microsoft Azure SDK for KeyVault Management This package contains Microsoft KeyVault Management SDK. - https://github.com/Azure/azure-libraries-for-java + https://github.com/Azure/azure-sdk-for-java The MIT License (MIT) @@ -28,8 +28,8 @@ - scm:git:https://github.com/Azure/azure-libraries-for-java - scm:git:git@github.com:Azure/azure-libraries-for-java.git + scm:git:https://github.com/Azure/azure-sdk-for-java + scm:git:git@github.com:Azure/azure-sdk-for-java.git HEAD @@ -71,6 +71,7 @@ azure-arm-client-runtime test-jar test + 1.6.5 diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/AccessPolicyEntry.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/AccessPolicyEntry.java index d95e674ac313..51d638241c94 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/AccessPolicyEntry.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/AccessPolicyEntry.java @@ -44,7 +44,7 @@ public class AccessPolicyEntry { private Permissions permissions; /** - * Get the tenantId value. + * Get the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. * * @return the tenantId value */ @@ -53,7 +53,7 @@ public UUID tenantId() { } /** - * Set the tenantId value. + * Set the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. * * @param tenantId the tenantId value to set * @return the AccessPolicyEntry object itself. @@ -64,7 +64,7 @@ public AccessPolicyEntry withTenantId(UUID tenantId) { } /** - * Get the objectId value. + * Get the object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies. * * @return the objectId value */ @@ -73,7 +73,7 @@ public String objectId() { } /** - * Set the objectId value. + * Set the object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies. * * @param objectId the objectId value to set * @return the AccessPolicyEntry object itself. @@ -84,7 +84,7 @@ public AccessPolicyEntry withObjectId(String objectId) { } /** - * Get the applicationId value. + * Get application ID of the client making request on behalf of a principal. * * @return the applicationId value */ @@ -93,7 +93,7 @@ public UUID applicationId() { } /** - * Set the applicationId value. + * Set application ID of the client making request on behalf of a principal. * * @param applicationId the applicationId value to set * @return the AccessPolicyEntry object itself. @@ -104,7 +104,7 @@ public AccessPolicyEntry withApplicationId(UUID applicationId) { } /** - * Get the permissions value. + * Get permissions the identity has for keys, secrets and certificates. * * @return the permissions value */ @@ -113,7 +113,7 @@ public Permissions permissions() { } /** - * Set the permissions value. + * Set permissions the identity has for keys, secrets and certificates. * * @param permissions the permissions value to set * @return the AccessPolicyEntry object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/DeletedVaultProperties.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/DeletedVaultProperties.java index aa701a927892..a747a6827aab 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/DeletedVaultProperties.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/DeletedVaultProperties.java @@ -47,7 +47,7 @@ public class DeletedVaultProperties { private Map tags; /** - * Get the vaultId value. + * Get the resource id of the original vault. * * @return the vaultId value */ @@ -56,7 +56,7 @@ public String vaultId() { } /** - * Get the location value. + * Get the location of the original vault. * * @return the location value */ @@ -65,7 +65,7 @@ public String location() { } /** - * Get the deletionDate value. + * Get the deleted date. * * @return the deletionDate value */ @@ -74,7 +74,7 @@ public DateTime deletionDate() { } /** - * Get the scheduledPurgeDate value. + * Get the scheduled purged date. * * @return the scheduledPurgeDate value */ @@ -83,7 +83,7 @@ public DateTime scheduledPurgeDate() { } /** - * Get the tags value. + * Get tags of the original vault. * * @return the tags value */ diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/LogSpecification.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/LogSpecification.java index 8f041c9206bf..5bedcd720486 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/LogSpecification.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/LogSpecification.java @@ -33,7 +33,7 @@ public class LogSpecification { private String blobDuration; /** - * Get the name value. + * Get name of log specification. * * @return the name value */ @@ -42,7 +42,7 @@ public String name() { } /** - * Set the name value. + * Set name of log specification. * * @param name the name value to set * @return the LogSpecification object itself. @@ -53,7 +53,7 @@ public LogSpecification withName(String name) { } /** - * Get the displayName value. + * Get display name of log specification. * * @return the displayName value */ @@ -62,7 +62,7 @@ public String displayName() { } /** - * Set the displayName value. + * Set display name of log specification. * * @param displayName the displayName value to set * @return the LogSpecification object itself. @@ -73,7 +73,7 @@ public LogSpecification withDisplayName(String displayName) { } /** - * Get the blobDuration value. + * Get blob duration of specification. * * @return the blobDuration value */ @@ -82,7 +82,7 @@ public String blobDuration() { } /** - * Set the blobDuration value. + * Set blob duration of specification. * * @param blobDuration the blobDuration value to set * @return the LogSpecification object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/OperationDisplay.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/OperationDisplay.java index bbaa9d25d2bf..c8e8ff9fe6d6 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/OperationDisplay.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/OperationDisplay.java @@ -33,13 +33,13 @@ public class OperationDisplay { private String operation; /** - * Decription of operation. + * Description of operation. */ @JsonProperty(value = "description") private String description; /** - * Get the provider value. + * Get service provider: Microsoft Key Vault. * * @return the provider value */ @@ -48,7 +48,7 @@ public String provider() { } /** - * Set the provider value. + * Set service provider: Microsoft Key Vault. * * @param provider the provider value to set * @return the OperationDisplay object itself. @@ -59,7 +59,7 @@ public OperationDisplay withProvider(String provider) { } /** - * Get the resource value. + * Get resource on which the operation is performed etc. * * @return the resource value */ @@ -68,7 +68,7 @@ public String resource() { } /** - * Set the resource value. + * Set resource on which the operation is performed etc. * * @param resource the resource value to set * @return the OperationDisplay object itself. @@ -79,7 +79,7 @@ public OperationDisplay withResource(String resource) { } /** - * Get the operation value. + * Get type of operation: get, read, delete, etc. * * @return the operation value */ @@ -88,7 +88,7 @@ public String operation() { } /** - * Set the operation value. + * Set type of operation: get, read, delete, etc. * * @param operation the operation value to set * @return the OperationDisplay object itself. @@ -99,7 +99,7 @@ public OperationDisplay withOperation(String operation) { } /** - * Get the description value. + * Get description of operation. * * @return the description value */ @@ -108,7 +108,7 @@ public String description() { } /** - * Set the description value. + * Set description of operation. * * @param description the description value to set * @return the OperationDisplay object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Permissions.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Permissions.java index 2dcadb917d7d..2afe2bbd72d8 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Permissions.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Permissions.java @@ -40,7 +40,7 @@ public class Permissions { private List storage; /** - * Get the keys value. + * Get permissions to keys. * * @return the keys value */ @@ -49,7 +49,7 @@ public List keys() { } /** - * Set the keys value. + * Set permissions to keys. * * @param keys the keys value to set * @return the Permissions object itself. @@ -60,7 +60,7 @@ public Permissions withKeys(List keys) { } /** - * Get the secrets value. + * Get permissions to secrets. * * @return the secrets value */ @@ -69,7 +69,7 @@ public List secrets() { } /** - * Set the secrets value. + * Set permissions to secrets. * * @param secrets the secrets value to set * @return the Permissions object itself. @@ -80,7 +80,7 @@ public Permissions withSecrets(List secrets) { } /** - * Get the certificates value. + * Get permissions to certificates. * * @return the certificates value */ @@ -89,7 +89,7 @@ public List certificates() { } /** - * Set the certificates value. + * Set permissions to certificates. * * @param certificates the certificates value to set * @return the Permissions object itself. @@ -100,7 +100,7 @@ public Permissions withCertificates(List certificates) { } /** - * Get the storage value. + * Get permissions to storage accounts. * * @return the storage value */ @@ -109,7 +109,7 @@ public List storage() { } /** - * Set the storage value. + * Set permissions to storage accounts. * * @param storage the storage value to set * @return the Permissions object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/ServiceSpecification.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/ServiceSpecification.java index ace604ba1c7f..ce7e86272ce1 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/ServiceSpecification.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/ServiceSpecification.java @@ -22,7 +22,7 @@ public class ServiceSpecification { private List logSpecifications; /** - * Get the logSpecifications value. + * Get log specifications of operation. * * @return the logSpecifications value */ @@ -31,7 +31,7 @@ public List logSpecifications() { } /** - * Set the logSpecifications value. + * Set log specifications of operation. * * @param logSpecifications the logSpecifications value to set * @return the ServiceSpecification object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Sku.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Sku.java index b6e8cf43302d..8152238cd195 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Sku.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Sku.java @@ -29,13 +29,14 @@ public class Sku { /** * Creates an instance of Sku class. + * @param name sKU name to specify whether the key vault is a standard vault or a premium vault. Possible values include: 'standard', 'premium'. */ public Sku() { family = "A"; } /** - * Get the family value. + * Get sKU family name. * * @return the family value */ @@ -44,7 +45,7 @@ public String family() { } /** - * Set the family value. + * Set sKU family name. * * @param family the family value to set * @return the Sku object itself. @@ -55,7 +56,7 @@ public Sku withFamily(String family) { } /** - * Get the name value. + * Get sKU name to specify whether the key vault is a standard vault or a premium vault. Possible values include: 'standard', 'premium'. * * @return the name value */ @@ -64,7 +65,7 @@ public SkuName name() { } /** - * Set the name value. + * Set sKU name to specify whether the key vault is a standard vault or a premium vault. Possible values include: 'standard', 'premium'. * * @param name the name value to set * @return the Sku object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Vault.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Vault.java index c25f5c8add6a..d220cd1022ff 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Vault.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/Vault.java @@ -10,12 +10,12 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.Resource; +import com.microsoft.azure.arm.resources.models.GroupableResourceCore; import com.microsoft.azure.arm.resources.models.HasResourceGroup; import com.microsoft.azure.arm.model.Refreshable; import com.microsoft.azure.arm.model.Updatable; import com.microsoft.azure.arm.model.Appliable; import com.microsoft.azure.arm.model.Creatable; -import com.microsoft.azure.arm.resources.models.GroupableResourceCore; import com.microsoft.azure.arm.resources.models.HasManager; import com.microsoft.azure.management.keyvault.v2016_10_01.implementation.KeyVaultManager; import com.microsoft.azure.management.keyvault.v2016_10_01.implementation.VaultInner; @@ -57,7 +57,9 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup, Resource.UpdateWithTags, Upda */ interface UpdateStages { /** - * The stage of the vault {0} allowing to specify Properties. + * The stage of the vault update allowing to specify Properties. */ interface WithProperties { /** * Specifies properties. + * @param properties Properties of the vault + * @return the next update stage */ Update withProperties(VaultPatchProperties properties); } diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyParameters.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyParameters.java index d50149dc9ed3..d3bce11d3b53 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyParameters.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyParameters.java @@ -62,6 +62,8 @@ interface UpdateStages { interface WithProperties { /** * Specifies properties. + * @param properties Properties of the access policy + * @return the next update stage */ Update withProperties(VaultAccessPolicyProperties properties); } diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyProperties.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyProperties.java index f3ae5e5418e9..6dbdbff82f62 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyProperties.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultAccessPolicyProperties.java @@ -24,7 +24,7 @@ public class VaultAccessPolicyProperties { private List accessPolicies; /** - * Get the accessPolicies value. + * Get an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. * * @return the accessPolicies value */ @@ -33,7 +33,7 @@ public List accessPolicies() { } /** - * Set the accessPolicies value. + * Set an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. * * @param accessPolicies the accessPolicies value to set * @return the VaultAccessPolicyProperties object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCheckNameAvailabilityParameters.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCheckNameAvailabilityParameters.java index 6a916aa0d090..045ab4a99a34 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCheckNameAvailabilityParameters.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCheckNameAvailabilityParameters.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** - * The parameters used to check the availabity of the vault name. + * The parameters used to check the availability of the vault name. */ public class VaultCheckNameAvailabilityParameters { /** @@ -28,13 +28,14 @@ public class VaultCheckNameAvailabilityParameters { /** * Creates an instance of VaultCheckNameAvailabilityParameters class. + * @param name the vault name. */ public VaultCheckNameAvailabilityParameters() { type = "Microsoft.KeyVault/vaults"; } /** - * Get the name value. + * Get the vault name. * * @return the name value */ @@ -43,7 +44,7 @@ public String name() { } /** - * Set the name value. + * Set the vault name. * * @param name the name value to set * @return the VaultCheckNameAvailabilityParameters object itself. @@ -54,7 +55,7 @@ public VaultCheckNameAvailabilityParameters withName(String name) { } /** - * Get the type value. + * Get the type of resource, Microsoft.KeyVault/vaults. * * @return the type value */ @@ -63,7 +64,7 @@ public String type() { } /** - * Set the type value. + * Set the type of resource, Microsoft.KeyVault/vaults. * * @param type the type value to set * @return the VaultCheckNameAvailabilityParameters object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCreateOrUpdateParameters.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCreateOrUpdateParameters.java index 203e752ff6b6..e8e60f507484 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCreateOrUpdateParameters.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultCreateOrUpdateParameters.java @@ -34,7 +34,7 @@ public class VaultCreateOrUpdateParameters { private VaultProperties properties; /** - * Get the location value. + * Get the supported Azure location where the key vault should be created. * * @return the location value */ @@ -43,7 +43,7 @@ public String location() { } /** - * Set the location value. + * Set the supported Azure location where the key vault should be created. * * @param location the location value to set * @return the VaultCreateOrUpdateParameters object itself. @@ -54,7 +54,7 @@ public VaultCreateOrUpdateParameters withLocation(String location) { } /** - * Get the tags value. + * Get the tags that will be assigned to the key vault. * * @return the tags value */ @@ -63,7 +63,7 @@ public Map tags() { } /** - * Set the tags value. + * Set the tags that will be assigned to the key vault. * * @param tags the tags value to set * @return the VaultCreateOrUpdateParameters object itself. @@ -74,7 +74,7 @@ public VaultCreateOrUpdateParameters withTags(Map tags) { } /** - * Get the properties value. + * Get properties of the vault. * * @return the properties value */ @@ -83,7 +83,7 @@ public VaultProperties properties() { } /** - * Set the properties value. + * Set properties of the vault. * * @param properties the properties value to set * @return the VaultCreateOrUpdateParameters object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchParameters.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchParameters.java index c0b650636ed5..2e3df46b0b5f 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchParameters.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchParameters.java @@ -28,7 +28,7 @@ public class VaultPatchParameters { private VaultPatchProperties properties; /** - * Get the tags value. + * Get the tags that will be assigned to the key vault. * * @return the tags value */ @@ -37,7 +37,7 @@ public Map tags() { } /** - * Set the tags value. + * Set the tags that will be assigned to the key vault. * * @param tags the tags value to set * @return the VaultPatchParameters object itself. @@ -48,7 +48,7 @@ public VaultPatchParameters withTags(Map tags) { } /** - * Get the properties value. + * Get properties of the vault. * * @return the properties value */ @@ -57,7 +57,7 @@ public VaultPatchProperties properties() { } /** - * Set the properties value. + * Set properties of the vault. * * @param properties the properties value to set * @return the VaultPatchParameters object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchProperties.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchProperties.java index bf743776e5be..ecbe353ebc9f 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchProperties.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultPatchProperties.java @@ -81,7 +81,7 @@ public class VaultPatchProperties { private Boolean enablePurgeProtection; /** - * Get the tenantId value. + * Get the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. * * @return the tenantId value */ @@ -90,7 +90,7 @@ public UUID tenantId() { } /** - * Set the tenantId value. + * Set the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. * * @param tenantId the tenantId value to set * @return the VaultPatchProperties object itself. @@ -101,7 +101,7 @@ public VaultPatchProperties withTenantId(UUID tenantId) { } /** - * Get the sku value. + * Get sKU details. * * @return the sku value */ @@ -110,7 +110,7 @@ public Sku sku() { } /** - * Set the sku value. + * Set sKU details. * * @param sku the sku value to set * @return the VaultPatchProperties object itself. @@ -121,7 +121,7 @@ public VaultPatchProperties withSku(Sku sku) { } /** - * Get the accessPolicies value. + * Get an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. * * @return the accessPolicies value */ @@ -130,7 +130,7 @@ public List accessPolicies() { } /** - * Set the accessPolicies value. + * Set an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. * * @param accessPolicies the accessPolicies value to set * @return the VaultPatchProperties object itself. @@ -141,7 +141,7 @@ public VaultPatchProperties withAccessPolicies(List accessPol } /** - * Get the enabledForDeployment value. + * Get property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault. * * @return the enabledForDeployment value */ @@ -150,7 +150,7 @@ public Boolean enabledForDeployment() { } /** - * Set the enabledForDeployment value. + * Set property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault. * * @param enabledForDeployment the enabledForDeployment value to set * @return the VaultPatchProperties object itself. @@ -161,7 +161,7 @@ public VaultPatchProperties withEnabledForDeployment(Boolean enabledForDeploymen } /** - * Get the enabledForDiskEncryption value. + * Get property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys. * * @return the enabledForDiskEncryption value */ @@ -170,7 +170,7 @@ public Boolean enabledForDiskEncryption() { } /** - * Set the enabledForDiskEncryption value. + * Set property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys. * * @param enabledForDiskEncryption the enabledForDiskEncryption value to set * @return the VaultPatchProperties object itself. @@ -181,7 +181,7 @@ public VaultPatchProperties withEnabledForDiskEncryption(Boolean enabledForDiskE } /** - * Get the enabledForTemplateDeployment value. + * Get property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. * * @return the enabledForTemplateDeployment value */ @@ -190,7 +190,7 @@ public Boolean enabledForTemplateDeployment() { } /** - * Set the enabledForTemplateDeployment value. + * Set property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. * * @param enabledForTemplateDeployment the enabledForTemplateDeployment value to set * @return the VaultPatchProperties object itself. @@ -201,7 +201,7 @@ public VaultPatchProperties withEnabledForTemplateDeployment(Boolean enabledForT } /** - * Get the enableSoftDelete value. + * Get property specifying whether recoverable deletion ('soft' delete) is enabled for this key vault. The property may not be set to false. * * @return the enableSoftDelete value */ @@ -210,7 +210,7 @@ public Boolean enableSoftDelete() { } /** - * Set the enableSoftDelete value. + * Set property specifying whether recoverable deletion ('soft' delete) is enabled for this key vault. The property may not be set to false. * * @param enableSoftDelete the enableSoftDelete value to set * @return the VaultPatchProperties object itself. @@ -221,7 +221,7 @@ public VaultPatchProperties withEnableSoftDelete(Boolean enableSoftDelete) { } /** - * Get the createMode value. + * Get the vault's create mode to indicate whether the vault need to be recovered or not. Possible values include: 'recover', 'default'. * * @return the createMode value */ @@ -230,7 +230,7 @@ public CreateMode createMode() { } /** - * Set the createMode value. + * Set the vault's create mode to indicate whether the vault need to be recovered or not. Possible values include: 'recover', 'default'. * * @param createMode the createMode value to set * @return the VaultPatchProperties object itself. @@ -241,7 +241,7 @@ public VaultPatchProperties withCreateMode(CreateMode createMode) { } /** - * Get the enablePurgeProtection value. + * Get property specifying whether protection against purge is enabled for this vault; it is only effective if soft delete is also enabled. Once activated, the property may no longer be reset to false. * * @return the enablePurgeProtection value */ @@ -250,7 +250,7 @@ public Boolean enablePurgeProtection() { } /** - * Set the enablePurgeProtection value. + * Set property specifying whether protection against purge is enabled for this vault; it is only effective if soft delete is also enabled. Once activated, the property may no longer be reset to false. * * @param enablePurgeProtection the enablePurgeProtection value to set * @return the VaultPatchProperties object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultProperties.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultProperties.java index 2b3004adc5be..e5d4c67d8c13 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultProperties.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/VaultProperties.java @@ -32,7 +32,8 @@ public class VaultProperties { /** * An array of 0 to 16 identities that have access to the key vault. All * identities in the array must use the same tenant ID as the key vault's - * tenant ID. + * tenant ID. When `createMode` is set to `recover`, access policies are + * not required. Otherwise, access policies are required. */ @JsonProperty(value = "accessPolicies") private List accessPolicies; @@ -93,7 +94,7 @@ public class VaultProperties { private Boolean enablePurgeProtection; /** - * Get the tenantId value. + * Get the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. * * @return the tenantId value */ @@ -102,7 +103,7 @@ public UUID tenantId() { } /** - * Set the tenantId value. + * Set the Azure Active Directory tenant ID that should be used for authenticating requests to the key vault. * * @param tenantId the tenantId value to set * @return the VaultProperties object itself. @@ -113,7 +114,7 @@ public VaultProperties withTenantId(UUID tenantId) { } /** - * Get the sku value. + * Get sKU details. * * @return the sku value */ @@ -122,7 +123,7 @@ public Sku sku() { } /** - * Set the sku value. + * Set sKU details. * * @param sku the sku value to set * @return the VaultProperties object itself. @@ -133,7 +134,7 @@ public VaultProperties withSku(Sku sku) { } /** - * Get the accessPolicies value. + * Get an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. When `createMode` is set to `recover`, access policies are not required. Otherwise, access policies are required. * * @return the accessPolicies value */ @@ -142,7 +143,7 @@ public List accessPolicies() { } /** - * Set the accessPolicies value. + * Set an array of 0 to 16 identities that have access to the key vault. All identities in the array must use the same tenant ID as the key vault's tenant ID. When `createMode` is set to `recover`, access policies are not required. Otherwise, access policies are required. * * @param accessPolicies the accessPolicies value to set * @return the VaultProperties object itself. @@ -153,7 +154,7 @@ public VaultProperties withAccessPolicies(List accessPolicies } /** - * Get the vaultUri value. + * Get the URI of the vault for performing operations on keys and secrets. * * @return the vaultUri value */ @@ -162,7 +163,7 @@ public String vaultUri() { } /** - * Set the vaultUri value. + * Set the URI of the vault for performing operations on keys and secrets. * * @param vaultUri the vaultUri value to set * @return the VaultProperties object itself. @@ -173,7 +174,7 @@ public VaultProperties withVaultUri(String vaultUri) { } /** - * Get the enabledForDeployment value. + * Get property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault. * * @return the enabledForDeployment value */ @@ -182,7 +183,7 @@ public Boolean enabledForDeployment() { } /** - * Set the enabledForDeployment value. + * Set property to specify whether Azure Virtual Machines are permitted to retrieve certificates stored as secrets from the key vault. * * @param enabledForDeployment the enabledForDeployment value to set * @return the VaultProperties object itself. @@ -193,7 +194,7 @@ public VaultProperties withEnabledForDeployment(Boolean enabledForDeployment) { } /** - * Get the enabledForDiskEncryption value. + * Get property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys. * * @return the enabledForDiskEncryption value */ @@ -202,7 +203,7 @@ public Boolean enabledForDiskEncryption() { } /** - * Set the enabledForDiskEncryption value. + * Set property to specify whether Azure Disk Encryption is permitted to retrieve secrets from the vault and unwrap keys. * * @param enabledForDiskEncryption the enabledForDiskEncryption value to set * @return the VaultProperties object itself. @@ -213,7 +214,7 @@ public VaultProperties withEnabledForDiskEncryption(Boolean enabledForDiskEncryp } /** - * Get the enabledForTemplateDeployment value. + * Get property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. * * @return the enabledForTemplateDeployment value */ @@ -222,7 +223,7 @@ public Boolean enabledForTemplateDeployment() { } /** - * Set the enabledForTemplateDeployment value. + * Set property to specify whether Azure Resource Manager is permitted to retrieve secrets from the key vault. * * @param enabledForTemplateDeployment the enabledForTemplateDeployment value to set * @return the VaultProperties object itself. @@ -233,7 +234,7 @@ public VaultProperties withEnabledForTemplateDeployment(Boolean enabledForTempla } /** - * Get the enableSoftDelete value. + * Get property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value. * * @return the enableSoftDelete value */ @@ -242,7 +243,7 @@ public Boolean enableSoftDelete() { } /** - * Set the enableSoftDelete value. + * Set property specifying whether recoverable deletion is enabled for this key vault. Setting this property to true activates the soft delete feature, whereby vaults or vault entities can be recovered after deletion. Enabling this functionality is irreversible - that is, the property does not accept false as its value. * * @param enableSoftDelete the enableSoftDelete value to set * @return the VaultProperties object itself. @@ -253,7 +254,7 @@ public VaultProperties withEnableSoftDelete(Boolean enableSoftDelete) { } /** - * Get the createMode value. + * Get the vault's create mode to indicate whether the vault need to be recovered or not. Possible values include: 'recover', 'default'. * * @return the createMode value */ @@ -262,7 +263,7 @@ public CreateMode createMode() { } /** - * Set the createMode value. + * Set the vault's create mode to indicate whether the vault need to be recovered or not. Possible values include: 'recover', 'default'. * * @param createMode the createMode value to set * @return the VaultProperties object itself. @@ -273,7 +274,7 @@ public VaultProperties withCreateMode(CreateMode createMode) { } /** - * Get the enablePurgeProtection value. + * Get property specifying whether protection against purge is enabled for this vault. Setting this property to true activates protection against purge for this vault and its content - only the Key Vault service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible - that is, the property does not accept false as its value. * * @return the enablePurgeProtection value */ @@ -282,7 +283,7 @@ public Boolean enablePurgeProtection() { } /** - * Set the enablePurgeProtection value. + * Set property specifying whether protection against purge is enabled for this vault. Setting this property to true activates protection against purge for this vault and its content - only the Key Vault service may initiate a hard, irrecoverable deletion. The setting is effective only if soft delete is also enabled. Enabling this functionality is irreversible - that is, the property does not accept false as its value. * * @param enablePurgeProtection the enablePurgeProtection value to set * @return the VaultProperties object itself. diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/CheckNameAvailabilityResultInner.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/CheckNameAvailabilityResultInner.java index 8deebfa01c75..4d8e23923694 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/CheckNameAvailabilityResultInner.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/CheckNameAvailabilityResultInner.java @@ -38,7 +38,7 @@ public class CheckNameAvailabilityResultInner { private String message; /** - * Get the nameAvailable value. + * Get a boolean value that indicates whether the name is available for you to use. If true, the name is available. If false, the name has already been taken or is invalid and cannot be used. * * @return the nameAvailable value */ @@ -47,7 +47,7 @@ public Boolean nameAvailable() { } /** - * Get the reason value. + * Get the reason that a vault name could not be used. The Reason element is only returned if NameAvailable is false. Possible values include: 'AccountNameInvalid', 'AlreadyExists'. * * @return the reason value */ @@ -56,7 +56,7 @@ public Reason reason() { } /** - * Get the message value. + * Get an error message explaining the Reason value in more detail. * * @return the message value */ diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/DeletedVaultImpl.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/DeletedVaultImpl.java index 96c350704f79..44a7992f770a 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/DeletedVaultImpl.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/DeletedVaultImpl.java @@ -21,6 +21,7 @@ class DeletedVaultImpl extends IndexableRefreshableWrapperImpl listAsync() { public Iterable call(Page page) { return page.items(); } - }) .map(new Func1() { + }) + .map(new Func1() { @Override public Operation call(OperationInner inner) { return new OperationImpl(inner, manager()); diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultAccessPolicyParametersImpl.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultAccessPolicyParametersImpl.java index 10270bf3bc73..4a345c5f40a7 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultAccessPolicyParametersImpl.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultAccessPolicyParametersImpl.java @@ -8,7 +8,6 @@ package com.microsoft.azure.management.keyvault.v2016_10_01.implementation; -import com.microsoft.azure.management.keyvault.v2016_10_01.AccessPolicyUpdateKind; import com.microsoft.azure.management.keyvault.v2016_10_01.VaultAccessPolicyParameters; import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl; import rx.Observable; @@ -26,6 +25,8 @@ class VaultAccessPolicyParametersImpl extends CreatableUpdatableImpl list() { VaultsInner client = this.inner(); - return this.wrapList(client.listBySubscription()); + return this.wrapList(client.list()); } @Override public Observable listAsync() { VaultsInner client = this.inner(); - return client.listBySubscriptionAsync() + return client.listAsync() .flatMapIterable(new Func1, Iterable>() { @Override public Iterable call(Page page) { @@ -165,10 +165,14 @@ private Observable getDeletedVaultInnerUsingVaultsInnerAsync( public Observable getDeletedAsync(String vaultName, String location) { VaultsInner client = this.inner(); return client.getDeletedAsync(vaultName, location) - .map(new Func1() { + .flatMap(new Func1>() { @Override - public DeletedVault call(DeletedVaultInner inner) { - return wrapDeletedVaultModel(inner); + public Observable call(DeletedVaultInner inner) { + if (inner == null) { + return Observable.empty(); + } else { + return Observable.just((DeletedVault)wrapDeletedVaultModel(inner)); + } } }); } @@ -188,7 +192,8 @@ public Observable listDeletedAsync() { public Iterable call(Page page) { return page.items(); } - }) .map(new Func1() { + }) + .map(new Func1() { @Override public DeletedVault call(DeletedVaultInner inner) { return new DeletedVaultImpl(inner, manager()); diff --git a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultsInner.java b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultsInner.java index 3937a1e44a99..bbf4f407e237 100644 --- a/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultsInner.java +++ b/sdk/keyvault/mgmt-v2016_10_01/src/main/java/com/microsoft/azure/management/keyvault/v2016_10_01/implementation/VaultsInner.java @@ -10,6 +10,7 @@ import com.microsoft.azure.arm.collection.InnerSupportsGet; import com.microsoft.azure.arm.collection.InnerSupportsDelete; +import com.microsoft.azure.arm.collection.InnerSupportsListing; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceFuture; @@ -49,7 +50,7 @@ * An instance of this class provides access to all the operations defined * in Vaults. */ -public class VaultsInner implements InnerSupportsGet, InnerSupportsDelete { +public class VaultsInner implements InnerSupportsGet, InnerSupportsDelete, InnerSupportsListing { /** The Retrofit service to perform REST calls. */ private VaultsService service; /** The service client containing this operation class. */ @@ -95,9 +96,9 @@ interface VaultsService { @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults") Observable> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @Query("$top") Integer top, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.keyvault.v2016_10_01.Vaults listBySubscription" }) + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.keyvault.v2016_10_01.Vaults list" }) @GET("subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/vaults") - Observable> listBySubscription(@Path("subscriptionId") String subscriptionId, @Query("$top") Integer top, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> list(@Path("subscriptionId") String subscriptionId, @Query("$top") Integer top, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.keyvault.v2016_10_01.Vaults listDeleted" }) @GET("subscriptions/{subscriptionId}/providers/Microsoft.KeyVault/deletedVaults") @@ -127,9 +128,9 @@ interface VaultsService { @GET Observable> listByResourceGroupNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.keyvault.v2016_10_01.Vaults listBySubscriptionNext" }) + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.keyvault.v2016_10_01.Vaults listNext" }) @GET - Observable> listBySubscriptionNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.keyvault.v2016_10_01.Vaults listDeletedNext" }) @GET @@ -412,6 +413,7 @@ public Observable> call(Response response) { private ServiceResponse deleteDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) + .register(204, new TypeToken() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -843,12 +845,12 @@ private ServiceResponse> listByResourceGroupDelegate(Respon * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<VaultInner> object if successful. */ - public PagedList listBySubscription() { - ServiceResponse> response = listBySubscriptionSinglePageAsync().toBlocking().single(); + public PagedList list() { + ServiceResponse> response = listSinglePageAsync().toBlocking().single(); return new PagedList(response.body()) { @Override public Page nextPage(String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body(); + return listNextSinglePageAsync(nextPageLink).toBlocking().single().body(); } }; } @@ -860,13 +862,13 @@ public Page nextPage(String nextPageLink) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object */ - public ServiceFuture> listBySubscriptionAsync(final ListOperationCallback serviceCallback) { + public ServiceFuture> listAsync(final ListOperationCallback serviceCallback) { return AzureServiceFuture.fromPageResponse( - listBySubscriptionSinglePageAsync(), + listSinglePageAsync(), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink); + return listNextSinglePageAsync(nextPageLink); } }, serviceCallback); @@ -878,8 +880,8 @@ public Observable>> call(String nextPageLink) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<VaultInner> object */ - public Observable> listBySubscriptionAsync() { - return listBySubscriptionWithServiceResponseAsync() + public Observable> listAsync() { + return listWithServiceResponseAsync() .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -894,8 +896,8 @@ public Page call(ServiceResponse> response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<VaultInner> object */ - public Observable>> listBySubscriptionWithServiceResponseAsync() { - return listBySubscriptionSinglePageAsync() + public Observable>> listWithServiceResponseAsync() { + return listSinglePageAsync() .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -903,7 +905,7 @@ public Observable>> call(ServiceResponse>> call(ServiceResponse>> listBySubscriptionSinglePageAsync() { + public Observable>> listSinglePageAsync() { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } @@ -922,12 +924,12 @@ public Observable>> listBySubscriptionSinglePag throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } final Integer top = null; - return service.listBySubscription(this.client.subscriptionId(), top, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + return service.list(this.client.subscriptionId(), top, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listBySubscriptionDelegate(response); + ServiceResponse> result = listDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -945,12 +947,12 @@ public Observable>> call(Response * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<VaultInner> object if successful. */ - public PagedList listBySubscription(final Integer top) { - ServiceResponse> response = listBySubscriptionSinglePageAsync(top).toBlocking().single(); + public PagedList list(final Integer top) { + ServiceResponse> response = listSinglePageAsync(top).toBlocking().single(); return new PagedList(response.body()) { @Override public Page nextPage(String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body(); + return listNextSinglePageAsync(nextPageLink).toBlocking().single().body(); } }; } @@ -963,13 +965,13 @@ public Page nextPage(String nextPageLink) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object */ - public ServiceFuture> listBySubscriptionAsync(final Integer top, final ListOperationCallback serviceCallback) { + public ServiceFuture> listAsync(final Integer top, final ListOperationCallback serviceCallback) { return AzureServiceFuture.fromPageResponse( - listBySubscriptionSinglePageAsync(top), + listSinglePageAsync(top), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink); + return listNextSinglePageAsync(nextPageLink); } }, serviceCallback); @@ -982,8 +984,8 @@ public Observable>> call(String nextPageLink) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<VaultInner> object */ - public Observable> listBySubscriptionAsync(final Integer top) { - return listBySubscriptionWithServiceResponseAsync(top) + public Observable> listAsync(final Integer top) { + return listWithServiceResponseAsync(top) .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -999,8 +1001,8 @@ public Page call(ServiceResponse> response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<VaultInner> object */ - public Observable>> listBySubscriptionWithServiceResponseAsync(final Integer top) { - return listBySubscriptionSinglePageAsync(top) + public Observable>> listWithServiceResponseAsync(final Integer top) { + return listSinglePageAsync(top) .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -1008,7 +1010,7 @@ public Observable>> call(ServiceResponse>> call(ServiceResponse>> listBySubscriptionSinglePageAsync(final Integer top) { + public Observable>> listSinglePageAsync(final Integer top) { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - return service.listBySubscription(this.client.subscriptionId(), top, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + return service.list(this.client.subscriptionId(), top, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listBySubscriptionDelegate(response); + ServiceResponse> result = listDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -1041,7 +1043,7 @@ public Observable>> call(Response }); } - private ServiceResponse> listBySubscriptionDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + 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) @@ -1807,12 +1809,12 @@ private ServiceResponse> listByResourceGroupNextDelegate(Re * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the PagedList<VaultInner> object if successful. */ - public PagedList listBySubscriptionNext(final String nextPageLink) { - ServiceResponse> response = listBySubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single(); + public PagedList listNext(final String nextPageLink) { + ServiceResponse> response = listNextSinglePageAsync(nextPageLink).toBlocking().single(); return new PagedList(response.body()) { @Override public Page nextPage(String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink).toBlocking().single().body(); + return listNextSinglePageAsync(nextPageLink).toBlocking().single().body(); } }; } @@ -1826,13 +1828,13 @@ public Page nextPage(String nextPageLink) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object */ - public ServiceFuture> listBySubscriptionNextAsync(final String nextPageLink, final ServiceFuture> serviceFuture, final ListOperationCallback serviceCallback) { + public ServiceFuture> listNextAsync(final String nextPageLink, final ServiceFuture> serviceFuture, final ListOperationCallback serviceCallback) { return AzureServiceFuture.fromPageResponse( - listBySubscriptionNextSinglePageAsync(nextPageLink), + listNextSinglePageAsync(nextPageLink), new Func1>>>() { @Override public Observable>> call(String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink); + return listNextSinglePageAsync(nextPageLink); } }, serviceCallback); @@ -1845,8 +1847,8 @@ public Observable>> call(String nextPageLink) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<VaultInner> object */ - public Observable> listBySubscriptionNextAsync(final String nextPageLink) { - return listBySubscriptionNextWithServiceResponseAsync(nextPageLink) + public Observable> listNextAsync(final String nextPageLink) { + return listNextWithServiceResponseAsync(nextPageLink) .map(new Func1>, Page>() { @Override public Page call(ServiceResponse> response) { @@ -1862,8 +1864,8 @@ public Page call(ServiceResponse> response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the PagedList<VaultInner> object */ - public Observable>> listBySubscriptionNextWithServiceResponseAsync(final String nextPageLink) { - return listBySubscriptionNextSinglePageAsync(nextPageLink) + public Observable>> listNextWithServiceResponseAsync(final String nextPageLink) { + return listNextSinglePageAsync(nextPageLink) .concatMap(new Func1>, Observable>>>() { @Override public Observable>> call(ServiceResponse> page) { @@ -1871,7 +1873,7 @@ public Observable>> call(ServiceResponse>> call(ServiceResponse>> listBySubscriptionNextSinglePageAsync(final String nextPageLink) { + public Observable>> listNextSinglePageAsync(final String nextPageLink) { if (nextPageLink == null) { throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); } String nextUrl = String.format("%s", nextPageLink); - return service.listBySubscriptionNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent()) + return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listBySubscriptionNextDelegate(response); + ServiceResponse> result = listNextDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -1902,7 +1904,7 @@ public Observable>> call(Response }); } - private ServiceResponse> listBySubscriptionNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + private ServiceResponse> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class)