From 53a0fd7ef55399787b332eb940a7436a895ba846 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 12 Nov 2020 08:10:37 +0000 Subject: [PATCH] CodeGen from PR 11646 in Azure/azure-rest-api-specs Merge 39f7e17acb8d5a96b90a5e5caa4211bdd8c8f088 into 80db0e5cef00f0e666c2e1e39d23729eb0c0b0d8 --- sdk/recoveryservices/mgmt-v2016_06_01/pom.xml | 6 ++--- .../v2016_06_01/PatchVault.java | 26 +++++++++++++++++++ .../recoveryservices/v2016_06_01/Vault.java | 14 +++++++++- .../RegisteredIdentitiesImpl.java | 7 ----- .../v2016_06_01/implementation/VaultImpl.java | 14 ++++++---- 5 files changed, 51 insertions(+), 16 deletions(-) diff --git a/sdk/recoveryservices/mgmt-v2016_06_01/pom.xml b/sdk/recoveryservices/mgmt-v2016_06_01/pom.xml index 0ae954a2e16f1..4470706bbb16a 100644 --- a/sdk/recoveryservices/mgmt-v2016_06_01/pom.xml +++ b/sdk/recoveryservices/mgmt-v2016_06_01/pom.xml @@ -11,11 +11,11 @@ com.microsoft.azure azure-arm-parent - 1.3.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-recoveryservices - 1.0.0-beta-1 + 1.0.0-beta jar Microsoft Azure SDK for RecoveryServices Management This package contains Microsoft RecoveryServices Management SDK. diff --git a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/PatchVault.java b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/PatchVault.java index 68ff6fb06d8ee..cc400a6a9c3f0 100644 --- a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/PatchVault.java +++ b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/PatchVault.java @@ -14,6 +14,12 @@ * Patch Resource information, as returned by the resource provider. */ public class PatchVault extends PatchTrackedResource { + /** + * The identity property. + */ + @JsonProperty(value = "identity") + private IdentityData identity; + /** * The properties property. */ @@ -26,6 +32,26 @@ public class PatchVault extends PatchTrackedResource { @JsonProperty(value = "sku") private Sku sku; + /** + * Get the identity value. + * + * @return the identity value + */ + public IdentityData identity() { + return this.identity; + } + + /** + * Set the identity value. + * + * @param identity the identity value to set + * @return the PatchVault object itself. + */ + public PatchVault withIdentity(IdentityData identity) { + this.identity = identity; + return this; + } + /** * Get the properties value. * diff --git a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java index 7f80e4fdf5610..1510fe14fc6e5 100644 --- a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java +++ b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/Vault.java @@ -125,7 +125,7 @@ interface WithCreate extends Creatable, Resource.DefinitionWithTags, Resource.UpdateWithTags, UpdateStages.WithETag, UpdateStages.WithProperties, UpdateStages.WithSku { + interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithETag, UpdateStages.WithIdentity, UpdateStages.WithProperties, UpdateStages.WithSku { } /** @@ -144,6 +144,18 @@ interface WithETag { Update withETag(String eTag); } + /** + * The stage of the vault update allowing to specify Identity. + */ + interface WithIdentity { + /** + * Specifies identity. + * @param identity the identity parameter value + * @return the next update stage + */ + Update withIdentity(IdentityData identity); + } + /** * The stage of the vault update allowing to specify Properties. */ diff --git a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java index a4a0e96276ec8..cc0948487ec49 100644 --- a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/RegisteredIdentitiesImpl.java +++ b/sdk/recoveryservices/mgmt-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,10 +24,4 @@ public RecoveryServicesManager manager() { return this.manager; } - @Override - public Completable deleteAsync(String resourceGroupName, String vaultName, String identityName) { - return this.manager.inner().registeredIdentities() - .deleteAsync(resourceGroupName, vaultName, identityName) - .toCompletable(); - } } diff --git a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultImpl.java b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultImpl.java index c9858620d723e..342cccc3a102d 100644 --- a/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultImpl.java +++ b/sdk/recoveryservices/mgmt-v2016_06_01/src/main/java/com/microsoft/azure/management/recoveryservices/v2016_06_01/implementation/VaultImpl.java @@ -88,17 +88,21 @@ public Sku sku() { } @Override - public VaultImpl withIdentity(IdentityData identity) { - this.inner().withIdentity(identity); + public VaultImpl withETag(String eTag) { + if (isInCreateMode()) { + this.inner().withETag(eTag); + } else { + this.updateParameter.withETag(eTag); + } return this; } @Override - public VaultImpl withETag(String eTag) { + public VaultImpl withIdentity(IdentityData identity) { if (isInCreateMode()) { - this.inner().withETag(eTag); + this.inner().withIdentity(identity); } else { - this.updateParameter.withETag(eTag); + this.updateParameter.withIdentity(identity); } return this; }