diff --git a/recoveryservices/resource-manager/v2016_06_01/pom.xml b/recoveryservices/resource-manager/v2016_06_01/pom.xml index a36577d2228f..9bb327e82fc5 100644 --- a/recoveryservices/resource-manager/v2016_06_01/pom.xml +++ b/recoveryservices/resource-manager/v2016_06_01/pom.xml @@ -1,133 +1,133 @@ - - - 4.0.0 - com.microsoft.azure.recoveryservices.v2016_06_01 - - com.microsoft.azure - azure-arm-parent - 0.0.3-beta - ../../../pom.xml - - azure-mgmt-recoveryservices - 1.0.0-beta - jar - Microsoft Azure SDK for RecoveryServices Management - This package contains Microsoft RecoveryServices Management SDK. - https://github.com/Azure/azure-libraries-for-java - - - The MIT License (MIT) - http://opensource.org/licenses/MIT - repo - - - - scm:git:https://github.com/Azure/azure-libraries-for-java - scm:git:git@github.com:Azure/azure-libraries-for-java.git - HEAD - - - UTF-8 - - - - - microsoft - Microsoft - - - - - com.microsoft.azure - azure-client-runtime - - - com.microsoft.azure - azure-arm-client-runtime - - - junit - junit - test - - - com.microsoft.azure - azure-client-authentication - test - - - com.microsoft.azure - azure-mgmt-resources - test - - - com.microsoft.azure - azure-arm-client-runtime - test-jar - test - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.7 - 1.7 - - - com.microsoft.azure.management.apigeneration.LangDefinitionProcessor - - - true - true - - true - true - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.8 - - *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search - - - /** -
* Copyright (c) Microsoft Corporation. All rights reserved. -
* Licensed under the MIT License. See License.txt in the project root for -
* license information. -
*/ - ]]> - - - - - - + + + 4.0.0 + com.microsoft.azure.recoveryservices.v2016_06_01 + + com.microsoft.azure + azure-arm-parent + 0.0.3-beta + ../../../pom.xml + + azure-mgmt-recoveryservices + 1.0.0-beta + jar + Microsoft Azure SDK for RecoveryServices Management + This package contains Microsoft RecoveryServices Management SDK. + https://github.com/Azure/azure-sdk-for-java + + + The MIT License (MIT) + http://opensource.org/licenses/MIT + repo + + + + scm:git:https://github.com/Azure/azure-sdk-for-java + scm:git:git@github.com:Azure/azure-sdk-for-java.git + HEAD + + + UTF-8 + + + + + microsoft + Microsoft + + + + + com.microsoft.azure + azure-client-runtime + + + com.microsoft.azure + azure-arm-client-runtime + + + junit + junit + test + + + com.microsoft.azure + azure-client-authentication + test + + + com.microsoft.azure + azure-mgmt-resources + test + + + com.microsoft.azure + azure-arm-client-runtime + test-jar + test + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.7 + 1.7 + + + com.microsoft.azure.management.apigeneration.LangDefinitionProcessor + + + true + true + + true + true + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + *.implementation.*;*.utils.*;com.microsoft.schemas._2003._10.serialization;*.blob.core.search + + + /** +
* Copyright (c) Microsoft Corporation. All rights reserved. +
* Licensed under the MIT License. See License.txt in the project root for +
* license information. +
*/ + ]]> + + + + + + diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/ResourceCertificateDetails.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/ResourceCertificateDetails.java index d7976adb96e3..cd1dc90ef85c 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/ResourceCertificateDetails.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/ResourceCertificateDetails.java @@ -31,7 +31,7 @@ public class ResourceCertificateDetails { private byte[] certificate; /** - * Certificate friendlyname. + * Certificate friendly name. */ @JsonProperty(value = "friendlyName") private String friendlyName; @@ -93,7 +93,7 @@ public ResourceCertificateDetails withCertificate(byte[] certificate) { } /** - * Get certificate friendlyname. + * Get certificate friendly name. * * @return the friendlyName value */ @@ -102,7 +102,7 @@ public String friendlyName() { } /** - * Set certificate friendlyname. + * Set certificate friendly name. * * @param friendlyName the friendlyName value to set * @return the ResourceCertificateDetails object itself. diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/UpgradeDetails.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/UpgradeDetails.java index d65626f6252d..7fd2ed9c8cef 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/UpgradeDetails.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/UpgradeDetails.java @@ -53,7 +53,7 @@ public class UpgradeDetails { private String message; /** - * The way the vault upgradation was triggered. Possible values include: + * The way the vault upgrade was triggered. Possible values include: * 'UserTriggered', 'ForcedUpgrade'. */ @JsonProperty(value = "triggerType", access = JsonProperty.Access.WRITE_ONLY) @@ -126,7 +126,7 @@ public String message() { } /** - * Get the way the vault upgradation was triggered. Possible values include: 'UserTriggered', 'ForcedUpgrade'. + * Get the way the vault upgrade was triggered. Possible values include: 'UserTriggered', 'ForcedUpgrade'. * * @return the triggerType value */ diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java index 114d51e27347..053efdcd466b 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java @@ -62,31 +62,37 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup, Resource.UpdateWithTags, Upda */ interface UpdateStages { /** - * The stage of the vault {0} allowing to specify ETag. + * The stage of the vault update allowing to specify ETag. */ interface WithETag { /** * Specifies eTag. + * @param eTag Optional ETag + * @return the next update stage */ Update withETag(String eTag); } /** - * 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 the properties parameter value + * @return the next update stage */ Update withProperties(VaultProperties properties); } /** - * The stage of the vault {0} allowing to specify Sku. + * The stage of the vault update allowing to specify Sku. */ interface WithSku { /** * Specifies sku. + * @param sku the sku parameter value + * @return the next update stage */ Update withSku(Sku sku); } diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/VaultCertificateResponse.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/VaultCertificateResponse.java index 61973435f2e0..fb4b71876b93 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/VaultCertificateResponse.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/VaultCertificateResponse.java @@ -44,7 +44,7 @@ public interface VaultCertificateResponse extends HasInner { /** * The template for a VaultCertificateResponse update operation, containing all the settings that can be modified. */ - interface Update extends Appliable { + interface Update extends Appliable, UpdateStages.WithProperties { } /** * Grouping of VaultCertificateResponse update stages. */ interface UpdateStages { + /** + * The stage of the vaultcertificateresponse update allowing to specify Properties. + */ + interface WithProperties { + /** + * Specifies properties. + * @param properties the properties parameter value + * @return the next update stage + */ + Update withProperties(RawCertificateData properties); + } + } } diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RecoveryServicesClientImpl.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RecoveryServicesClientImpl.java index c7f90b674e0a..065037274761 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RecoveryServicesClientImpl.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RecoveryServicesClientImpl.java @@ -275,6 +275,6 @@ protected void initialize() { */ @Override public String userAgent() { - return String.format("%s (%s, %s)", super.userAgent(), "RecoveryServicesClient", "2016-06-01"); + return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "RecoveryServicesClient", "2016-06-01"); } } diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java index 23402a36a912..cc0948487ec4 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java @@ -11,7 +11,6 @@ import com.microsoft.azure.arm.model.implementation.WrapperImpl; import com.microsoft.azure.management.recoveryservices.v2016_06_01.RegisteredIdentities; -import rx.Completable; class RegisteredIdentitiesImpl extends WrapperImpl implements RegisteredIdentities { private final RecoveryServicesManager manager; @@ -25,8 +24,4 @@ public RecoveryServicesManager manager() { return this.manager; } - @Override - public Completable deleteAsync(String resourceGroupName, String vaultName, String identityName) { - return this.inner().deleteAsync(resourceGroupName, vaultName, identityName).toCompletable(); - } } diff --git a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultCertificateResponseImpl.java b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultCertificateResponseImpl.java index 3ddab86fb080..37ff8f3b21d1 100644 --- a/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultCertificateResponseImpl.java +++ b/recoveryservices/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultCertificateResponseImpl.java @@ -11,13 +11,17 @@ import com.microsoft.azure.management.recoveryservices.v2016_06_01.VaultCertificateResponse; import com.microsoft.azure.arm.model.implementation.CreatableUpdatableImpl; import rx.Observable; +import com.microsoft.azure.management.recoveryservices.v2016_06_01.RawCertificateData; import com.microsoft.azure.management.recoveryservices.v2016_06_01.ResourceCertificateDetails; +import rx.functions.Func1; class VaultCertificateResponseImpl extends CreatableUpdatableImpl implements VaultCertificateResponse, VaultCertificateResponse.Definition, VaultCertificateResponse.Update { private final RecoveryServicesManager manager; private String resourceGroupName; private String vaultName; private String certificateName; + private RawCertificateData cproperties; + private RawCertificateData uproperties; VaultCertificateResponseImpl(String name, RecoveryServicesManager manager) { super(name, new VaultCertificateResponseInner()); @@ -25,6 +29,8 @@ class VaultCertificateResponseImpl extends CreatableUpdatableImpl createResourceAsync() { VaultCertificatesInner client = this.manager().inner().vaultCertificates(); - return client.createAsync(this.resourceGroupName, this.vaultName, this.certificateName) + return client.createAsync(this.resourceGroupName, this.vaultName, this.certificateName, this.cproperties) + .map(new Func1() { + @Override + public VaultCertificateResponseInner call(VaultCertificateResponseInner resource) { + resetCreateUpdateParameters(); + return resource; + } + }) .map(innerToFluentMap(this)); } @Override public Observable updateResourceAsync() { VaultCertificatesInner client = this.manager().inner().vaultCertificates(); - return client.createAsync(this.resourceGroupName, this.vaultName, this.certificateName) + return client.createAsync(this.resourceGroupName, this.vaultName, this.certificateName, this.uproperties) + .map(new Func1() { + @Override + public VaultCertificateResponseInner call(VaultCertificateResponseInner resource) { + resetCreateUpdateParameters(); + return resource; + } + }) .map(innerToFluentMap(this)); } @@ -69,6 +91,10 @@ public boolean isInCreateMode() { return this.inner().id() == null; } + private void resetCreateUpdateParameters() { + this.cproperties = new RawCertificateData(); + this.uproperties = new RawCertificateData(); + } @Override public String id() { @@ -97,4 +123,14 @@ public VaultCertificateResponseImpl withExistingVault(String resourceGroupName, return this; } + @Override + public VaultCertificateResponseImpl withProperties(RawCertificateData properties) { + if (isInCreateMode()) { + this.cproperties = properties; + } else { + this.uproperties = properties; + } + return this; + } + }