From 27e312c9b33e10732bc1ddc07012e0d37c8f594f Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Mon, 24 Oct 2016 23:40:50 -0700 Subject: [PATCH 1/4] Support beginDelete and extend generic resources --- .../resources/GenericResources.java | 6 ++- .../management/resources/ResourceGroups.java | 2 + .../collection/SupportsBeginDeleting.java | 47 +++++++++++++++++++ .../implementation/GenericResourcesImpl.java | 28 +++++++++++ .../implementation/ResourceGroupsImpl.java | 25 ++++++++++ .../resources/GenericResourcesTests.java | 7 ++- 6 files changed, 112 insertions(+), 3 deletions(-) create mode 100644 azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java index 093ebedc635ec..ac1ce938ac293 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java @@ -11,6 +11,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingInGroupByTag; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import java.util.List; @@ -24,7 +25,8 @@ public interface GenericResources extends SupportsListingByGroup, SupportsListingInGroupByTag, SupportsGettingById, - SupportsCreating { + SupportsCreating, + SupportsDeleting { /** * Checks if a resource exists in a resource group. * @@ -44,6 +46,8 @@ boolean checkExistence( String resourceName, String apiVersion); + boolean checkExistenceById(String id); + /** * Returns a resource belonging to a resource group. * diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java index 0c54ed0a63c38..48ae7d30b3ced 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java @@ -9,6 +9,7 @@ import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBeginDeleting; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; @@ -24,6 +25,7 @@ public interface ResourceGroups extends SupportsGettingByName, SupportsCreating, SupportsDeleting, + SupportsBeginDeleting, SupportsBatchCreation { /** * Checks whether resource group exists. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java new file mode 100644 index 0000000000000..bd74f4e6915e2 --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java @@ -0,0 +1,47 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ + +package com.microsoft.azure.management.resources.fluentcore.collection; + +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.rest.ServiceCall; +import com.microsoft.rest.ServiceCallback; +import rx.Observable; + +/** + * Provides access to deleting a resource from Azure, identifying it by its resource ID. + *

+ * (Note: this interface is not intended to be implemented by user code) + */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true) +public interface SupportsBeginDeleting { + /** + * Begins deleting a resource from Azure, identifying it by its resource ID. The + * resource will stay until get() returns null. + * + * @param id the resource ID of the resource to delete + */ + void beginDelete(String id); + + /** + * Asynchronously begins deleting a resource from Azure, identifying it by its resource ID. + * The resource will stay until get() returns null. + * + * @param id the resource ID of the resource to delete + * @param callback the callback on success or failure + * @return a handle to cancel the request + */ + ServiceCall beginDeleteAsync(String id, ServiceCallback callback); + + /** + * Asynchronously begins deleting a resource from Azure, identifying it by its resource ID. + * The resource will stay until get() returns null. + * + * @param id the resource ID of the resource to delete + * @return an observable of the request + */ + Observable beginDeleteAsync(String id); +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java index 6fb022b8a7fc6..876b70c1cb501 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java @@ -15,6 +15,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import rx.Observable; +import rx.functions.Func1; import java.util.List; @@ -75,6 +76,12 @@ public boolean checkExistence(String resourceGroupName, String resourceProviderN apiVersion); } + @Override + public boolean checkExistenceById(String id) { + String apiVersion = getApiVersionFromId(id).toBlocking().single(); + return innerCollection.checkExistenceById(id, apiVersion); + } + @Override public GenericResource getById(String id) { Provider provider = myManager.providers().getByName(ResourceUtils.resourceProviderFromResourceId(id)); @@ -193,4 +200,25 @@ public Observable deleteAsync(String groupName, String name) { // Not needed, can't be supported, provided only to satisfy GroupableResourceImpl's requirements throw new UnsupportedOperationException("Delete just by resource group and name is not supported. Please use other overloads."); } + + @Override + public Observable deleteAsync(final String id) { + return getApiVersionFromId(id) + .flatMap(new Func1>() { + @Override + public Observable call(String apiVersion) { + return innerCollection.deleteByIdAsync(id, apiVersion); + } + }); + } + + private Observable getApiVersionFromId(final String id) { + return myManager.providers().getByNameAsync(ResourceUtils.resourceProviderFromResourceId(id)) + .map(new Func1() { + @Override + public String call(Provider provider) { + return ResourceUtils.defaultApiVersion(id, provider); + } + }); + } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java index 4bb0003bdb257..e3f592f3d18f9 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java @@ -11,7 +11,11 @@ import com.microsoft.azure.management.resources.ResourceGroups; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.CreatableResourcesImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; +import com.microsoft.rest.ServiceCall; +import com.microsoft.rest.ServiceCallback; +import com.microsoft.rest.ServiceResponse; import rx.Observable; +import rx.functions.Func1; /** * The implementation for {@link ResourceGroups} and its parent interfaces. @@ -76,4 +80,25 @@ protected ResourceGroupImpl wrapModel(ResourceGroupInner inner) { } return new ResourceGroupImpl(inner, serviceClient); } + + @Override + public void beginDelete(String id) { + beginDeleteAsync(id).toBlocking().subscribe(); + } + + @Override + public ServiceCall beginDeleteAsync(String id, ServiceCallback callback) { + return ServiceCall.create(beginDeleteAsync(id) + .flatMap(new Func1>>() { + @Override + public Observable> call(Void aVoid) { + return null; + } + }), callback); + } + + @Override + public Observable beginDeleteAsync(String name) { + return client.beginDeleteAsync(name); + } } diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java index 2253cd1cce9e6..222d420b26b0c 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java @@ -35,8 +35,8 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceGroups.delete(newRgName); - resourceGroups.delete(rgName); + resourceGroups.beginDelete(newRgName); + resourceGroups.beginDelete(rgName); } @Test @@ -72,5 +72,8 @@ public void canCreateUpdateMoveResource() throws Exception { resource.update() .withProperties(new ObjectMapper().readTree("{\"SiteMode\":\"Limited\",\"ComputeMode\":\"Dynamic\"}")) .apply(); + // Delete + genericResources.delete(resource.id()); + Assert.assertFalse(genericResources.checkExistence(newRgName, resource.resourceProviderNamespace(), resource.parentResourcePath(), resource.resourceType(), resource.name(), resource.apiVersion())); } } From d2c9fdba355758cf6190d27c9be5c8bf2dfe0e10 Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Mon, 24 Oct 2016 23:43:05 -0700 Subject: [PATCH 2/4] missing javadoc on generic resources --- .../azure/management/resources/GenericResources.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java index ac1ce938ac293..becc866dd9b33 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java @@ -46,6 +46,12 @@ boolean checkExistence( String resourceName, String apiVersion); + /** + * Checks if a resource exists. + * + * @param id the ID of the resource. + * @return true if the resource exists; false otherwise + */ boolean checkExistenceById(String id); /** From 9af9215efa1b2316630cbe54f381f5f1866938ea Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Tue, 25 Oct 2016 00:11:12 -0700 Subject: [PATCH 3/4] Rename delete to deleteByBlah to align with getByBlahs --- .../azure/management/batch/BatchAccounts.java | 4 +- .../implementation/BatchAccountsImpl.java | 2 +- .../batch/BatchAccountOperationsTests.java | 7 ++- .../management/compute/AvailabilitySets.java | 4 +- .../compute/VirtualMachineScaleSets.java | 4 +- .../management/compute/VirtualMachines.java | 4 +- .../implementation/AvailabilitySetsImpl.java | 2 +- .../VirtualMachineScaleSetsImpl.java | 2 +- .../implementation/VirtualMachinesImpl.java | 2 +- .../VirtualMachineOperationsTests.java | 4 +- ...VirtualMachineScaleSetOperationsTests.java | 2 +- .../azure/management/graphrbac/Groups.java | 4 +- .../azure/management/keyvault/Vaults.java | 4 +- .../keyvault/implementation/VaultsImpl.java | 2 +- .../management/network/LoadBalancers.java | 4 +- .../management/network/NetworkInterfaces.java | 4 +- .../network/NetworkSecurityGroups.java | 4 +- .../azure/management/network/Networks.java | 4 +- .../management/network/PublicIpAddresses.java | 4 +- .../azure/management/network/RouteTables.java | 4 +- .../implementation/LoadBalancersImpl.java | 2 +- .../implementation/NetworkInterfacesImpl.java | 2 +- .../NetworkSecurityGroupsImpl.java | 2 +- .../network/implementation/NetworksImpl.java | 2 +- .../implementation/PublicIpAddressesImpl.java | 2 +- .../implementation/RouteTablesImpl.java | 2 +- .../NetworkInterfaceOperationsTests.java | 2 +- .../azure/management/redis/RedisCaches.java | 4 +- .../redis/implementation/RedisCachesImpl.java | 2 +- .../redis/RedisCacheOperationsTests.java | 6 +-- .../management/resources/Deployments.java | 4 +- .../resources/GenericResources.java | 4 +- .../resources/PolicyAssignments.java | 4 +- .../resources/PolicyDefinitions.java | 4 +- .../management/resources/ResourceGroups.java | 8 ++-- .../collection/SupportsDeletingByGroup.java | 6 +-- .../collection/SupportsDeletingByParent.java | 6 +-- .../implementation/CreatableWrappersImpl.java | 12 ++--- .../GroupableResourcesImpl.java | 12 ++--- .../IndependentChildResourcesImpl.java | 12 ++--- .../IndependentChildrenImpl.java | 16 +++---- ....java => SupportsBeginDeletingByName.java} | 20 ++++----- ...eleting.java => SupportsDeletingById.java} | 8 ++-- .../collection/SupportsDeletingByName.java | 44 +++++++++++++++++++ .../implementation/DeploymentsImpl.java | 22 +++++----- .../implementation/GenericResourcesImpl.java | 4 +- .../implementation/PolicyAssignmentsImpl.java | 2 +- .../implementation/PolicyDefinitionsImpl.java | 2 +- .../implementation/ResourceGroupsImpl.java | 28 +++++++++--- .../resources/DeploymentsTests.java | 2 +- .../resources/GenericResourcesTests.java | 6 +-- .../management/resources/PolicyTests.java | 6 +-- .../resources/ResourceGroupsTests.java | 2 +- .../azure/management/sql/SqlDatabases.java | 4 +- .../azure/management/sql/SqlElasticPools.java | 4 +- .../management/sql/SqlFirewallRules.java | 4 +- .../azure/management/sql/SqlServers.java | 4 +- .../sql/implementation/SqlDatabasesImpl.java | 2 +- .../implementation/SqlElasticPoolsImpl.java | 2 +- .../implementation/SqlFirewallRulesImpl.java | 2 +- .../sql/implementation/SqlServersImpl.java | 2 +- .../sql/SqlServerOperationsTests.java | 30 ++++++------- .../management/storage/StorageAccounts.java | 4 +- .../implementation/StorageAccountsImpl.java | 2 +- .../StorageAccountOperationsTests.java | 2 +- .../TrafficManagerProfiles.java | 4 +- .../TrafficManagerProfilesImpl.java | 2 +- .../management/website/AppServicePlans.java | 4 +- .../management/website/CertificateOrders.java | 4 +- .../management/website/Certificates.java | 4 +- .../azure/management/website/WebApps.java | 4 +- .../implementation/AppServicePlansImpl.java | 2 +- .../implementation/CertificateOrdersImpl.java | 2 +- .../implementation/CertificatesImpl.java | 2 +- .../website/implementation/WebAppsImpl.java | 2 +- .../website/AppServicePlansTests.java | 2 +- .../website/CertificateOrdersTests.java | 2 +- .../batch/samples/ManageBatchAccount.java | 6 +-- ...hinesUsingCustomImageOrSpecializedVHD.java | 4 +- .../samples/ManageAvailabilitySet.java | 4 +- .../compute/samples/ManageVirtualMachine.java | 4 +- .../ManageVirtualMachineExtension.java | 2 +- .../samples/ManageVirtualMachineScaleSet.java | 2 +- .../ManageVirtualMachinesInParallel.java | 2 +- .../keyvault/samples/ManageKeyVault.java | 6 +-- .../network/samples/ManageIPAddress.java | 4 +- .../samples/ManageInternalLoadBalancer.java | 4 +- .../ManageInternetFacingLoadBalancer.java | 4 +- .../samples/ManageNetworkInterface.java | 6 +-- .../samples/ManageNetworkSecurityGroup.java | 2 +- ...eVirtualMachinesInParallelWithNetwork.java | 2 +- .../network/samples/ManageVirtualNetwork.java | 4 +- .../rediscache/samples/ManageRedisCache.java | 4 +- .../samples/DeployUsingARMTemplate.java | 2 +- .../DeployUsingARMTemplateWithProgress.java | 2 +- .../DeployUsingARMTemplateWithTags.java | 2 +- .../resources/samples/ManageResource.java | 4 +- .../samples/ManageResourceGroup.java | 4 +- .../storage/samples/ManageStorageAccount.java | 4 +- .../azure/management/AzureTests.java | 2 +- .../azure/management/TestTemplate.java | 8 ++-- 101 files changed, 287 insertions(+), 228 deletions(-) rename azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/{SupportsBeginDeleting.java => SupportsBeginDeletingByName.java} (71%) rename azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/{SupportsDeleting.java => SupportsDeletingById.java} (86%) create mode 100644 azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingByName.java diff --git a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccounts.java b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccounts.java index 23ed07eae6ffe..0bb56a5037677 100644 --- a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccounts.java +++ b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/BatchAccounts.java @@ -14,7 +14,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -27,7 +27,7 @@ public interface BatchAccounts extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { /** diff --git a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/implementation/BatchAccountsImpl.java b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/implementation/BatchAccountsImpl.java index 39e0d24ca7c82..1e728e5b01a29 100644 --- a/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/implementation/BatchAccountsImpl.java +++ b/azure-mgmt-batch/src/main/java/com/microsoft/azure/management/batch/implementation/BatchAccountsImpl.java @@ -42,7 +42,7 @@ protected BatchAccountsImpl( } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java b/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java index f240476070198..caec410c9db8f 100644 --- a/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java +++ b/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java @@ -7,7 +7,6 @@ package com.microsoft.azure.management.batch; import com.microsoft.azure.CloudException; -import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import org.joda.time.DateTime; @@ -30,7 +29,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test @@ -165,7 +164,7 @@ public void canCRUDBatchAccount() throws Exception { .withoutApplicationPackage(applicationPackage1Name) .parent() .apply(); - batchManager.batchAccounts().delete(batchAccount.resourceGroupName(), batchAccount.name()); + batchManager.batchAccounts().deleteByGroup(batchAccount.resourceGroupName(), batchAccount.name()); try { batchManager.batchAccounts().getById(batchAccount.id()); Assert.assertTrue(false); @@ -217,7 +216,7 @@ public void canCreateBatchAccountWithApplication() throws Exception { Assert.assertEquals(application.displayName(), applicationDisplayName); Assert.assertEquals(application.updatesAllowed(), allowUpdates); - batchManager.batchAccounts().delete(batchAccount.resourceGroupName(), batchAccount.name()); + batchManager.batchAccounts().deleteByGroup(batchAccount.resourceGroupName(), batchAccount.name()); try { batchManager.batchAccounts().getById(batchAccount.id()); Assert.assertTrue(false); diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java index c43dc03fcf44a..4a1c93a6c66d0 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java @@ -7,7 +7,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -20,7 +20,7 @@ public interface AvailabilitySets extends SupportsGettingById, SupportsListing, SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java index b275e1bd0e91d..61b73992a668f 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java @@ -8,7 +8,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import java.io.IOException; @@ -23,7 +23,7 @@ public interface VirtualMachineScaleSets extends SupportsGettingByGroup, SupportsGettingById, SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { /** diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java index 9824338d673b3..9723dba0dba9d 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachines.java @@ -7,7 +7,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -20,7 +20,7 @@ public interface VirtualMachines extends SupportsGettingByGroup, SupportsGettingById, SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java index e0bb13afd8659..cf96a2981282e 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java @@ -61,7 +61,7 @@ public AvailabilitySetImpl define(String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java index 4fd2ea3d90139..ce54a09aeac5c 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java @@ -56,7 +56,7 @@ public PagedList list() { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java index 8a4c5b788c0a2..be5c56f854ff1 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java @@ -74,7 +74,7 @@ public VirtualMachine getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java index b71949c1fc4fd..f8b2cf3d7fe6c 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java @@ -18,7 +18,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test @@ -62,6 +62,6 @@ public void canCreateVirtualMachine() throws Exception { Assert.assertNotNull(instanceView.statuses().size() > 0); // Delete VM - computeManager.virtualMachines().delete(foundedVM.id()); + computeManager.virtualMachines().deleteById(foundedVM.id()); } } diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java index 149477c5af758..016eb87cc1a44 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java @@ -29,7 +29,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test diff --git a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java index 059c06b0284da..136c65a34ae39 100644 --- a/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java +++ b/azure-mgmt-graph-rbac/src/main/java/com/microsoft/azure/management/graphrbac/Groups.java @@ -9,7 +9,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import java.io.IOException; @@ -22,7 +22,7 @@ public interface Groups extends SupportsCreating, SupportsListing, - SupportsDeleting { + SupportsDeletingById { /** * Gets the information about a group. * diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java index d7cb26fc0fbe2..fbd9385e09cdd 100644 --- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java +++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/Vaults.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -22,7 +22,7 @@ public interface Vaults extends SupportsListing, SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java index cbb5b66374fea..04779d2a5e57d 100644 --- a/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java +++ b/azure-mgmt-keyvault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java @@ -59,7 +59,7 @@ public Vault getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java index a9541b7ea0dec..c1074567616d9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/LoadBalancers.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; @@ -26,7 +26,7 @@ public interface LoadBalancers extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java index 51c61a9f8a164..af3a462ff5292 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java @@ -7,7 +7,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -20,7 +20,7 @@ public interface NetworkInterfaces extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java index 8e47ab56d0d51..cbfade76ed167 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; @@ -26,7 +26,7 @@ public interface NetworkSecurityGroups extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java index f1df7656f1c52..87574f2b64e0d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/Networks.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; @@ -26,7 +26,7 @@ public interface Networks extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java index c5d58c91c44cf..4c501b975e7a9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; @@ -23,7 +23,7 @@ public interface PublicIpAddresses extends SupportsListing, SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteTables.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteTables.java index 7a4f2601cdc9e..e85bdd0c5622c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteTables.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteTables.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -25,7 +25,7 @@ public interface RouteTables extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java index 5a43055892aa2..d2f1d6fb0cd15 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java @@ -47,7 +47,7 @@ public LoadBalancerImpl getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java index 2fcc8bd564b2c..0ef730dc1853b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java @@ -45,7 +45,7 @@ public NetworkInterface getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java index 5731eee4d49fb..5d4c6702d0baa 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java @@ -47,7 +47,7 @@ public NetworkSecurityGroupImpl getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java index 555507c8e4a3a..1883001630c43 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java @@ -51,7 +51,7 @@ public NetworkImpl getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java index abbb4429b0b87..17d284391a050 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java @@ -48,7 +48,7 @@ public PublicIpAddressImpl getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesImpl.java index 788c520e0b57b..a7298b1e4b8e8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesImpl.java @@ -47,7 +47,7 @@ public RouteTableImpl getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java b/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java index 1df082c97874c..17986a598972c 100644 --- a/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java +++ b/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java @@ -24,7 +24,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { if (resourceGroupId != null) { - resourceManager.resourceGroups().delete(resourceGroupId); + resourceManager.resourceGroups().deleteById(resourceGroupId); } } diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java index bd0faae274ce0..9c62b737c668e 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/RedisCaches.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -26,7 +26,7 @@ public interface RedisCaches extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCachesImpl.java b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCachesImpl.java index 373fc5e07f89d..31cdd3a002474 100644 --- a/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCachesImpl.java +++ b/azure-mgmt-redis/src/main/java/com/microsoft/azure/management/redis/implementation/RedisCachesImpl.java @@ -52,7 +52,7 @@ public RedisCache getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java b/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java index 374f7d1882e75..ef80ce1d03a51 100644 --- a/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java +++ b/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java @@ -36,8 +36,8 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); - resourceManager.resourceGroups().delete(RG_NAME_SECOND); + resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME_SECOND); } @Test @@ -148,7 +148,7 @@ public void canCRUDRedisCache() throws Exception { redisCache.refresh(); // delete - redisManager.redisCaches().delete(redisCache.id()); + redisManager.redisCaches().deleteById(redisCache.id()); // Premium SKU Functionality RedisCachePremium premiumCache = redisCachePremium.asPremium(); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java index 5b3c5b294160e..883ea5663f9f6 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/Deployments.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -27,7 +27,7 @@ public interface Deployments extends SupportsGettingByName, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup { /** * Checks if a deployment exists in a resource group. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java index becc866dd9b33..16ace75db3a68 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/GenericResources.java @@ -11,7 +11,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingInGroupByTag; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import java.util.List; @@ -26,7 +26,7 @@ public interface GenericResources extends SupportsListingInGroupByTag, SupportsGettingById, SupportsCreating, - SupportsDeleting { + SupportsDeletingById { /** * Checks if a resource exists in a resource group. * diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyAssignments.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyAssignments.java index 9ad54a0b46b7c..71af545b9911d 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyAssignments.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyAssignments.java @@ -11,7 +11,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -23,7 +23,7 @@ public interface PolicyAssignments extends SupportsListingByGroup, SupportsGettingById, SupportsCreating, - SupportsDeleting { + SupportsDeletingById { /** * List policy assignments of the resource. * diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyDefinitions.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyDefinitions.java index a4439c3aaec70..7d138bf0a9c6c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyDefinitions.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/PolicyDefinitions.java @@ -9,7 +9,7 @@ import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -20,5 +20,5 @@ public interface PolicyDefinitions extends SupportsListing, SupportsGettingByName, SupportsCreating, - SupportsDeleting { + SupportsDeletingById { } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java index 48ae7d30b3ced..2df4335725428 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/ResourceGroups.java @@ -9,9 +9,9 @@ import com.microsoft.azure.management.apigeneration.Fluent; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBeginDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBeginDeletingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingByName; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListingByTag; @@ -24,8 +24,8 @@ public interface ResourceGroups extends SupportsListingByTag, SupportsGettingByName, SupportsCreating, - SupportsDeleting, - SupportsBeginDeleting, + SupportsDeletingByName, + SupportsBeginDeletingByName, SupportsBatchCreation { /** * Checks whether resource group exists. diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java index 8527432921cea..6fefb6054288b 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByGroup.java @@ -25,7 +25,7 @@ public interface SupportsDeletingByGroup { * @param groupName The group the resource is part of * @param name The name of the resource */ - void delete(String groupName, String name); + void deleteByGroup(String groupName, String name); /** * Asynchronously delete a resource from Azure, identifying it by its name and its resource group. @@ -35,7 +35,7 @@ public interface SupportsDeletingByGroup { * @param callback the callback to call on success or failure * @return a handle to cancel the request */ - ServiceCall deleteAsync(String groupName, String name, ServiceCallback callback); + ServiceCall deleteByGroupAsync(String groupName, String name, ServiceCallback callback); /** * Asynchronously delete a resource from Azure, identifying it by its name and its resource group. @@ -44,5 +44,5 @@ public interface SupportsDeletingByGroup { * @param name The name of the resource * @return an observable to the request */ - Observable deleteAsync(String groupName, String name); + Observable deleteByGroupAsync(String groupName, String name); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByParent.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByParent.java index 92eb1a4566a82..cb52ba0cd9332 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByParent.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/SupportsDeletingByParent.java @@ -25,7 +25,7 @@ public interface SupportsDeletingByParent { * @param parentName the name of parent resource. * @param name The name of the resource */ - void delete(String groupName, String parentName, String name); + void deleteByParent(String groupName, String parentName, String name); /** * Asynchronously delete a resource from Azure, identifying it by its name and its resource group. @@ -36,7 +36,7 @@ public interface SupportsDeletingByParent { * @param callback the callback to call on success or failure * @return a handle to cancel the request */ - ServiceCall deleteAsync(String groupName, String parentName, String name, ServiceCallback callback); + ServiceCall deleteByParentAsync(String groupName, String parentName, String name, ServiceCallback callback); /** * Asynchronously delete a resource from Azure, identifying it by its name and its resource group. @@ -46,5 +46,5 @@ public interface SupportsDeletingByParent { * @param name The name of the resource * @return an observable to the request */ - Observable deleteAsync(String groupName, String parentName, String name); + Observable deleteByParentAsync(String groupName, String parentName, String name); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/CreatableWrappersImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/CreatableWrappersImpl.java index 7774c752a2349..496491a3654c0 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/CreatableWrappersImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/CreatableWrappersImpl.java @@ -5,7 +5,7 @@ */ package com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; @@ -22,7 +22,7 @@ public abstract class CreatableWrappersImpl extends ReadableWrappersImpl implements // Assume anything creatable is deletable - SupportsDeleting { + SupportsDeletingById { protected CreatableWrappersImpl() { } @@ -30,13 +30,13 @@ protected CreatableWrappersImpl() { protected abstract ImplT wrapModel(String name); @Override - public void delete(String id) { - deleteAsync(id).toBlocking().subscribe(); + public void deleteById(String id) { + deleteByIdAsync(id).toBlocking().subscribe(); } @Override - public ServiceCall deleteAsync(String id, ServiceCallback callback) { - return ServiceCall.create(deleteAsync(id).map(new Func1>() { + public ServiceCall deleteByIdAsync(String id, ServiceCallback callback) { + return ServiceCall.create(deleteByIdAsync(id).map(new Func1>() { @Override public ServiceResponse call(Void aVoid) { return new ServiceResponse<>(aVoid, null); diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java index 0934806ddc5e6..0b4667fe15c57 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java @@ -56,13 +56,13 @@ public T getById(String id) { } @Override - public void delete(String groupName, String name) { - deleteAsync(groupName, name).toBlocking().subscribe(); + public void deleteByGroup(String groupName, String name) { + deleteByGroupAsync(groupName, name).toBlocking().subscribe(); } @Override - public ServiceCall deleteAsync(String groupName, String name, ServiceCallback callback) { - return ServiceCall.create(deleteAsync(groupName, name).map(new Func1>() { + public ServiceCall deleteByGroupAsync(String groupName, String name, ServiceCallback callback) { + return ServiceCall.create(deleteByGroupAsync(groupName, name).map(new Func1>() { @Override public ServiceResponse call(Void aVoid) { return new ServiceResponse<>(aVoid, null); @@ -71,7 +71,7 @@ public ServiceResponse call(Void aVoid) { } @Override - public Observable deleteAsync(String id) { - return deleteAsync(ResourceUtils.groupFromResourceId(id), ResourceUtils.nameFromResourceId(id)); + public Observable deleteByIdAsync(String id) { + return deleteByGroupAsync(ResourceUtils.groupFromResourceId(id), ResourceUtils.nameFromResourceId(id)); } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildResourcesImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildResourcesImpl.java index f9fa3bb3dccf3..bd9a55eff244c 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildResourcesImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildResourcesImpl.java @@ -70,13 +70,13 @@ public PagedList listByParent(GroupableResource parentResource) { @Override - public void delete(String groupName, String parentName, String name) { - deleteAsync(groupName, parentName, name).toBlocking().subscribe(); + public void deleteByParent(String groupName, String parentName, String name) { + deleteByParentAsync(groupName, parentName, name).toBlocking().subscribe(); } @Override - public ServiceCall deleteAsync(String groupName, String parentName, String name, ServiceCallback callback) { - return ServiceCall.create(deleteAsync(groupName, parentName, name).map(new Func1>() { + public ServiceCall deleteByParentAsync(String groupName, String parentName, String name, ServiceCallback callback) { + return ServiceCall.create(deleteByParentAsync(groupName, parentName, name).map(new Func1>() { @Override public ServiceResponse call(Void aVoid) { return new ServiceResponse<>(aVoid, null); @@ -85,8 +85,8 @@ public ServiceResponse call(Void aVoid) { } @Override - public Observable deleteAsync(String id) { + public Observable deleteByIdAsync(String id) { ResourceId resourceId = ResourceId.parseResourceId(id); - return deleteAsync(resourceId.resourceGroupName(), resourceId.parent().name(), resourceId.name()); + return deleteByParentAsync(resourceId.resourceGroupName(), resourceId.parent().name(), resourceId.name()); } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildrenImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildrenImpl.java index eeaba404b80df..5ed3f1190eeee 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildrenImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/arm/collection/implementation/IndependentChildrenImpl.java @@ -15,7 +15,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.implementation.ManagerBase; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.arm.models.IndependentChild; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.rest.ServiceCall; import com.microsoft.rest.ServiceCallback; import com.microsoft.rest.ServiceResponse; @@ -42,7 +42,7 @@ public abstract class IndependentChildrenImpl< SupportsGettingById, SupportsGettingByParent, SupportsListingByParent, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByParent { protected final InnerCollectionT innerCollection; protected final ManagerT manager; @@ -70,13 +70,13 @@ public PagedList listByParent(GroupableResource parentResource) { } @Override - public void delete(String groupName, String parentName, String name) { - deleteAsync(groupName, parentName, name).toBlocking().subscribe(); + public void deleteByParent(String groupName, String parentName, String name) { + deleteByParentAsync(groupName, parentName, name).toBlocking().subscribe(); } @Override - public ServiceCall deleteAsync(String groupName, String parentName, String name, ServiceCallback callback) { - return ServiceCall.create(deleteAsync(groupName, parentName, name).map(new Func1>() { + public ServiceCall deleteByParentAsync(String groupName, String parentName, String name, ServiceCallback callback) { + return ServiceCall.create(deleteByParentAsync(groupName, parentName, name).map(new Func1>() { @Override public ServiceResponse call(Void aVoid) { return new ServiceResponse<>(aVoid, null); @@ -85,8 +85,8 @@ public ServiceResponse call(Void aVoid) { } @Override - public Observable deleteAsync(String id) { + public Observable deleteByIdAsync(String id) { ResourceId resourceId = ResourceId.parseResourceId(id); - return deleteAsync(resourceId.resourceGroupName(), resourceId.parent().name(), resourceId.name()); + return deleteByParentAsync(resourceId.resourceGroupName(), resourceId.parent().name(), resourceId.name()); } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeletingByName.java similarity index 71% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeletingByName.java index bd74f4e6915e2..f016847532ce4 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeleting.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsBeginDeletingByName.java @@ -17,31 +17,31 @@ * (Note: this interface is not intended to be implemented by user code) */ @LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true) -public interface SupportsBeginDeleting { +public interface SupportsBeginDeletingByName { /** - * Begins deleting a resource from Azure, identifying it by its resource ID. The + * Begins deleting a resource from Azure, identifying it by its resource name. The * resource will stay until get() returns null. * - * @param id the resource ID of the resource to delete + * @param name the name of the resource to delete */ - void beginDelete(String id); + void beginDeleteByName(String name); /** - * Asynchronously begins deleting a resource from Azure, identifying it by its resource ID. + * Asynchronously begins deleting a resource from Azure, identifying it by its resource name. * The resource will stay until get() returns null. * - * @param id the resource ID of the resource to delete + * @param name the name of the resource to delete * @param callback the callback on success or failure * @return a handle to cancel the request */ - ServiceCall beginDeleteAsync(String id, ServiceCallback callback); + ServiceCall beginDeleteByNameAsync(String name, ServiceCallback callback); /** - * Asynchronously begins deleting a resource from Azure, identifying it by its resource ID. + * Asynchronously begins deleting a resource from Azure, identifying it by its resource name. * The resource will stay until get() returns null. * - * @param id the resource ID of the resource to delete + * @param name the name the resource to delete * @return an observable of the request */ - Observable beginDeleteAsync(String id); + Observable beginDeleteByNameAsync(String name); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingById.java similarity index 86% rename from azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java rename to azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingById.java index 79880137bb1bd..21d39608f7373 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeleting.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingById.java @@ -17,13 +17,13 @@ * (Note: this interface is not intended to be implemented by user code) */ @LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true) -public interface SupportsDeleting { +public interface SupportsDeletingById { /** * Deletes a resource from Azure, identifying it by its resource ID. * * @param id the resource ID of the resource to delete */ - void delete(String id); + void deleteById(String id); /** * Asynchronously delete a resource from Azure, identifying it by its resource ID. @@ -32,7 +32,7 @@ public interface SupportsDeleting { * @param callback the callback on success or failure * @return a handle to cancel the request */ - ServiceCall deleteAsync(String id, ServiceCallback callback); + ServiceCall deleteByIdAsync(String id, ServiceCallback callback); /** * Asynchronously delete a resource from Azure, identifying it by its resource ID. @@ -40,5 +40,5 @@ public interface SupportsDeleting { * @param id the resource ID of the resource to delete * @return an observable of the request */ - Observable deleteAsync(String id); + Observable deleteByIdAsync(String id); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingByName.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingByName.java new file mode 100644 index 0000000000000..01377a945e613 --- /dev/null +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/fluentcore/collection/SupportsDeletingByName.java @@ -0,0 +1,44 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + */ + +package com.microsoft.azure.management.resources.fluentcore.collection; + +import com.microsoft.azure.management.apigeneration.LangDefinition; +import com.microsoft.rest.ServiceCall; +import com.microsoft.rest.ServiceCallback; +import rx.Observable; + +/** + * Provides access to deleting a resource from Azure, identifying it by its resource name. + *

+ * (Note: this interface is not intended to be implemented by user code) + */ +@LangDefinition(ContainerName = "CollectionActions", CreateAsyncMethods = true) +public interface SupportsDeletingByName { + /** + * Deletes a resource from Azure, identifying it by its resource name. + * + * @param name the name of the resource to delete + */ + void deleteByName(String name); + + /** + * Asynchronously delete a resource from Azure, identifying it by its resource name. + * + * @param name the name of the resource to delete + * @param callback the callback on success or failure + * @return a handle to cancel the request + */ + ServiceCall deleteByNameAsync(String name, ServiceCallback callback); + + /** + * Asynchronously delete a resource from Azure, identifying it by its resource name. + * + * @param name the name of the resource to delete + * @return an observable of the request + */ + Observable deleteByNameAsync(String name); +} diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java index 137d58be04dde..607b9982c62ec 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/DeploymentsImpl.java @@ -78,13 +78,13 @@ public Deployment getByGroup(String groupName, String name) { } @Override - public void delete(String groupName, String name) { - deleteAsync(groupName, name).toBlocking().subscribe(); + public void deleteByGroup(String groupName, String name) { + deleteByGroupAsync(groupName, name).toBlocking().subscribe(); } @Override - public ServiceCall deleteAsync(String groupName, String name, ServiceCallback callback) { - return ServiceCall.create(deleteAsync(groupName, name).map(new Func1>() { + public ServiceCall deleteByGroupAsync(String groupName, String name, ServiceCallback callback) { + return ServiceCall.create(deleteByGroupAsync(groupName, name).map(new Func1>() { @Override public ServiceResponse call(Void aVoid) { return new ServiceResponse<>(aVoid, null); @@ -93,7 +93,7 @@ public ServiceResponse call(Void aVoid) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return client.deleteAsync(groupName, name); } @@ -127,13 +127,13 @@ public Deployment getById(String id) { } @Override - public void delete(String id) { - deleteAsync(id).toBlocking().subscribe(); + public void deleteById(String id) { + deleteByIdAsync(id).toBlocking().subscribe(); } @Override - public ServiceCall deleteAsync(String id, ServiceCallback callback) { - return ServiceCall.create(deleteAsync(id).map(new Func1>() { + public ServiceCall deleteByIdAsync(String id, ServiceCallback callback) { + return ServiceCall.create(deleteByIdAsync(id).map(new Func1>() { @Override public ServiceResponse call(Void aVoid) { return new ServiceResponse<>(aVoid, null); @@ -142,7 +142,7 @@ public ServiceResponse call(Void aVoid) { } @Override - public Observable deleteAsync(String id) { - return deleteAsync(ResourceUtils.groupFromResourceId(id), ResourceUtils.nameFromResourceId(id)); + public Observable deleteByIdAsync(String id) { + return deleteByGroupAsync(ResourceUtils.groupFromResourceId(id), ResourceUtils.nameFromResourceId(id)); } } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java index 876b70c1cb501..aeb74b6faaff7 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java @@ -196,13 +196,13 @@ public GenericResource getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { // Not needed, can't be supported, provided only to satisfy GroupableResourceImpl's requirements throw new UnsupportedOperationException("Delete just by resource group and name is not supported. Please use other overloads."); } @Override - public Observable deleteAsync(final String id) { + public Observable deleteByIdAsync(final String id) { return getApiVersionFromId(id) .flatMap(new Func1>() { @Override diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyAssignmentsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyAssignmentsImpl.java index 915f8487a3800..db3c490daffc5 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyAssignmentsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyAssignmentsImpl.java @@ -38,7 +38,7 @@ public PagedList list() { } @Override - public Observable deleteAsync(String id) { + public Observable deleteByIdAsync(String id) { return client.deleteByIdAsync(id).map(new Func1() { @Override public Void call(PolicyAssignmentInner policyAssignmentInner) { diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyDefinitionsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyDefinitionsImpl.java index 54c6b05ef5037..281c222053e75 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyDefinitionsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/PolicyDefinitionsImpl.java @@ -42,7 +42,7 @@ public PolicyDefinitionImpl getByName(String name) { } @Override - public Observable deleteAsync(String name) { + public Observable deleteByIdAsync(String name) { return client.deleteAsync(name); } diff --git a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java index e3f592f3d18f9..38d160f8c20bd 100644 --- a/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java +++ b/azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java @@ -9,6 +9,7 @@ import com.microsoft.azure.PagedList; import com.microsoft.azure.management.resources.ResourceGroup; import com.microsoft.azure.management.resources.ResourceGroups; +import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils; import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.CreatableResourcesImpl; import com.microsoft.azure.management.resources.fluentcore.utils.Utils; import com.microsoft.rest.ServiceCall; @@ -52,7 +53,17 @@ public ResourceGroupImpl getByName(String name) { } @Override - public Observable deleteAsync(String name) { + public void deleteByName(String name) { + deleteByNameAsync(name).toBlocking().subscribe(); + } + + @Override + public ServiceCall deleteByNameAsync(String name, ServiceCallback callback) { + return ServiceCall.create(client.deleteWithServiceResponseAsync(name), callback); + } + + @Override + public Observable deleteByNameAsync(String name) { return client.deleteAsync(name); } @@ -82,13 +93,13 @@ protected ResourceGroupImpl wrapModel(ResourceGroupInner inner) { } @Override - public void beginDelete(String id) { - beginDeleteAsync(id).toBlocking().subscribe(); + public void beginDeleteByName(String id) { + beginDeleteByNameAsync(id).toBlocking().subscribe(); } @Override - public ServiceCall beginDeleteAsync(String id, ServiceCallback callback) { - return ServiceCall.create(beginDeleteAsync(id) + public ServiceCall beginDeleteByNameAsync(String name, ServiceCallback callback) { + return ServiceCall.create(beginDeleteByNameAsync(name) .flatMap(new Func1>>() { @Override public Observable> call(Void aVoid) { @@ -98,7 +109,12 @@ public Observable> call(Void aVoid) { } @Override - public Observable beginDeleteAsync(String name) { + public Observable beginDeleteByNameAsync(String name) { return client.beginDeleteAsync(name); } + + @Override + public Observable deleteByIdAsync(String id) { + return deleteByNameAsync(ResourceUtils.nameFromResourceId(id)); + } } diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java index 3e865b1299b57..41a227cbb985c 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java @@ -36,7 +36,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceGroups.delete(rgName); + resourceGroups.deleteById(rgName); } @Test diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java index 222d420b26b0c..da1a9167bdeaa 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/GenericResourcesTests.java @@ -35,8 +35,8 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceGroups.beginDelete(newRgName); - resourceGroups.beginDelete(rgName); + resourceGroups.beginDeleteByName(newRgName); + resourceGroups.beginDeleteByName(rgName); } @Test @@ -73,7 +73,7 @@ public void canCreateUpdateMoveResource() throws Exception { .withProperties(new ObjectMapper().readTree("{\"SiteMode\":\"Limited\",\"ComputeMode\":\"Dynamic\"}")) .apply(); // Delete - genericResources.delete(resource.id()); + genericResources.deleteById(resource.id()); Assert.assertFalse(genericResources.checkExistence(newRgName, resource.resourceProviderNamespace(), resource.parentResourcePath(), resource.resourceType(), resource.name(), resource.apiVersion())); } } diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/PolicyTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/PolicyTests.java index 5972aa58b402d..4795776876b99 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/PolicyTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/PolicyTests.java @@ -61,7 +61,7 @@ public void canCRUDPolicyDefinition() throws Exception { Assert.assertNotNull(definition); Assert.assertEquals("My Policy", definition.displayName()); // Delete - resourceManager.policyDefinitions().delete(definition.id()); + resourceManager.policyDefinitions().deleteById(definition.id()); } @Test @@ -101,7 +101,7 @@ public void canCRUDPolicyAssignment() throws Exception { } // Delete resourceManager.resourceGroups().define(group.name()); - resourceManager.policyAssignments().delete(assignment.id()); - resourceManager.policyDefinitions().delete(definition.id()); + resourceManager.policyAssignments().deleteById(assignment.id()); + resourceManager.policyDefinitions().deleteById(definition.id()); } } diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java index ce8cecbf0dc44..6e82609ea0cc2 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java @@ -47,7 +47,7 @@ public void canCreateResourceGroup() throws Exception { Assert.assertEquals("value1", updatedGroup.tags().get("tag1")); Assert.assertEquals(location, getGroup.regionName()); // Delete - resourceGroups.delete(rgName); + resourceGroups.deleteById(rgName); Assert.assertFalse(resourceGroups.checkExistence(rgName)); } } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlDatabases.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlDatabases.java index 8b49fa4335b76..c49ee35d04238 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlDatabases.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlDatabases.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point to SQL Database management API. @@ -21,7 +21,7 @@ @Fluent public interface SqlDatabases extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsGettingById, SupportsBatchCreation, SupportsDeletingByParent { diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlElasticPools.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlElasticPools.java index b1597f112d43a..b790a7271e4d1 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlElasticPools.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlElasticPools.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point to SQL Elastic Pool management API. @@ -21,7 +21,7 @@ @Fluent public interface SqlElasticPools extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsGettingById, SupportsBatchCreation, SupportsDeletingByParent { diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java index 7014ba118aa86..5c66f705862af 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlFirewallRules.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point to SQL FirewallRule management API. @@ -20,7 +20,7 @@ @Fluent public interface SqlFirewallRules extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsGettingById, SupportsDeletingByParent { diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServers.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServers.java index bec9de3058826..600f7472414ca 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServers.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/SqlServers.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -26,7 +26,7 @@ public interface SqlServers extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlDatabasesImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlDatabasesImpl.java index e441361074b88..358b3fbca43d3 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlDatabasesImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlDatabasesImpl.java @@ -64,7 +64,7 @@ public SqlDatabase.DefinitionStages.Blank define(String name) { } @Override - public Observable deleteAsync(String groupName, String parentName, String name) { + public Observable deleteByParentAsync(String groupName, String parentName, String name) { return this.innerCollection.deleteAsync(groupName, parentName, name); } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlElasticPoolsImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlElasticPoolsImpl.java index 9bd82e4abe04c..9a815404f73a5 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlElasticPoolsImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlElasticPoolsImpl.java @@ -63,7 +63,7 @@ public SqlElasticPool.DefinitionStages.Blank define(String name) { } @Override - public Observable deleteAsync(String groupName, String parentName, String name) { + public Observable deleteByParentAsync(String groupName, String parentName, String name) { return this.innerCollection.deleteAsync(groupName, parentName, name); } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java index af968715b3810..8cbde65ebdf08 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlFirewallRulesImpl.java @@ -63,7 +63,7 @@ public SqlFirewallRule.DefinitionStages.Blank define(String name) { } @Override - public Observable deleteAsync(String groupName, String parentName, String name) { + public Observable deleteByParentAsync(String groupName, String parentName, String name) { return this.innerCollection.deleteFirewallRulesAsync(groupName, parentName, name); } diff --git a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServersImpl.java b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServersImpl.java index 45cc6ee74a149..a9a591ee29509 100644 --- a/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServersImpl.java +++ b/azure-mgmt-sql/src/main/java/com/microsoft/azure/management/sql/implementation/SqlServersImpl.java @@ -22,7 +22,7 @@ protected SqlServersImpl( } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java b/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java index 4a6d2827fe6b2..27b80e54dc2cb 100644 --- a/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java +++ b/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java @@ -35,7 +35,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test @@ -66,7 +66,7 @@ public void canCRUDSqlServer() throws Exception { sqlServer = sqlServerManager.sqlServers().getByGroup(RG_NAME, SQL_SERVER_NAME); Assert.assertNotNull(sqlServer); - sqlServerManager.sqlServers().delete(sqlServer.resourceGroupName(), sqlServer.name()); + sqlServerManager.sqlServers().deleteByGroup(sqlServer.resourceGroupName(), sqlServer.name()); validateSqlServerNotFound(sqlServer); } @@ -102,7 +102,7 @@ public void canCRUDSqlDatabase() throws Exception { validateListSqlDatabase(sqlServerManager.sqlDatabases().listBySqlServer(sqlServer.resourceGroupName(), sqlServer.name())); validateListSqlDatabase(sqlServerManager.sqlDatabases().listBySqlServer(sqlServer)); - sqlServerManager.sqlDatabases().delete(sqlDatabase.id()); + sqlServerManager.sqlDatabases().deleteById(sqlDatabase.id()); // Add another database to the server sqlDatabase = sqlServerManager.sqlDatabases() @@ -111,9 +111,9 @@ public void canCRUDSqlDatabase() throws Exception { .withEdition(DatabaseEditions.STANDARD) .withExistingSqlServer(sqlServer) .createAsync().toBlocking().first(); - sqlServerManager.sqlDatabases().delete(sqlDatabase.resourceGroupName(), sqlDatabase.sqlServerName(), sqlDatabase.name()); + sqlServerManager.sqlDatabases().deleteByParent(sqlDatabase.resourceGroupName(), sqlDatabase.sqlServerName(), sqlDatabase.name()); - sqlServerManager.sqlServers().delete(sqlServer.resourceGroupName(), sqlServer.name()); + sqlServerManager.sqlServers().deleteByGroup(sqlServer.resourceGroupName(), sqlServer.name()); validateSqlServerNotFound(sqlServer); } @@ -161,7 +161,7 @@ public void canCRUDSqlDatabaseWithElasticPool() throws Exception { validateListSqlDatabase(sqlServerManager.sqlDatabases().listBySqlServer(sqlServer.resourceGroupName(), sqlServer.name())); validateListSqlDatabase(sqlServerManager.sqlDatabases().listBySqlServer(sqlServer)); - sqlServerManager.sqlDatabases().delete(sqlDatabase.id()); + sqlServerManager.sqlDatabases().deleteById(sqlDatabase.id()); validateSqlDatabaseNotFound(SQL_DATABASE_NAME); // Add another database to the server @@ -172,10 +172,10 @@ public void canCRUDSqlDatabaseWithElasticPool() throws Exception { .withExistingElasticPoolName(sqlElasticPool) .withExistingSqlServer(sqlServer) .createAsync().toBlocking().first(); - sqlServerManager.sqlDatabases().delete(sqlDatabase.resourceGroupName(), sqlDatabase.sqlServerName(), sqlDatabase.name()); + sqlServerManager.sqlDatabases().deleteByParent(sqlDatabase.resourceGroupName(), sqlDatabase.sqlServerName(), sqlDatabase.name()); validateSqlDatabaseNotFound("newDatabase"); - sqlServerManager.sqlServers().delete(sqlServer.resourceGroupName(), sqlServer.name()); + sqlServerManager.sqlServers().deleteByGroup(sqlServer.resourceGroupName(), sqlServer.name()); validateSqlServerNotFound(sqlServer); } @@ -210,7 +210,7 @@ public void canCRUDSqlElasticPool() throws Exception { validateListSqlElasticPool(sqlServerManager.sqlElasticPools().listBySqlServer(sqlServer.resourceGroupName(), sqlServer.name())); validateListSqlElasticPool(sqlServerManager.sqlElasticPools().listBySqlServer(sqlServer)); - sqlServerManager.sqlElasticPools().delete(sqlElasticPool.id()); + sqlServerManager.sqlElasticPools().deleteById(sqlElasticPool.id()); validateSqlElasticPoolNotFound(SQL_ELASTIC_POOL_NAME); // Add another database to the server @@ -219,10 +219,10 @@ public void canCRUDSqlElasticPool() throws Exception { .withEdition(ElasticPoolEditions.STANDARD) .withExistingSqlServer(sqlServer) .createAsync().toBlocking().first(); - sqlServerManager.sqlElasticPools().delete(sqlElasticPool.resourceGroupName(), sqlElasticPool.sqlServerName(), sqlElasticPool.name()); + sqlServerManager.sqlElasticPools().deleteByParent(sqlElasticPool.resourceGroupName(), sqlElasticPool.sqlServerName(), sqlElasticPool.name()); validateSqlElasticPoolNotFound("newElasticPool"); - sqlServerManager.sqlServers().delete(sqlServer.resourceGroupName(), sqlServer.name()); + sqlServerManager.sqlServers().deleteByGroup(sqlServer.resourceGroupName(), sqlServer.name()); validateSqlServerNotFound(sqlServer); } @@ -260,7 +260,7 @@ public void canCRUDSqlFirewallRule() throws Exception { validateListSqlFirewallRule(sqlServerManager.sqlFirewallRules().listBySqlServer(sqlServer.resourceGroupName(), sqlServer.name())); validateListSqlFirewallRule(sqlServerManager.sqlFirewallRules().listBySqlServer(sqlServer)); - sqlServerManager.sqlFirewallRules().delete(sqlFirewallRule.id()); + sqlServerManager.sqlFirewallRules().deleteById(sqlFirewallRule.id()); validateSqlFirewallRuleNotFound(); // Add firewall rule again with existing server. @@ -270,7 +270,7 @@ public void canCRUDSqlFirewallRule() throws Exception { .withEndIpAddress(END_IPADDRESS) .withExistingSqlServer(sqlServer) .createAsync().toBlocking().first(); - sqlServerManager.sqlFirewallRules().delete(sqlFirewallRule.resourceGroupName(), sqlFirewallRule.sqlServerName(), sqlFirewallRule.name()); + sqlServerManager.sqlFirewallRules().deleteByParent(sqlFirewallRule.resourceGroupName(), sqlFirewallRule.sqlServerName(), sqlFirewallRule.name()); validateSqlFirewallRuleNotFound(); // Add firewall rule again with existing server. @@ -280,10 +280,10 @@ public void canCRUDSqlFirewallRule() throws Exception { .withEndIpAddress(END_IPADDRESS) .withExistingSqlServer(sqlServer.resourceGroupName(), sqlServer.name()) .createAsync().toBlocking().first(); - sqlServerManager.sqlFirewallRules().delete(sqlFirewallRule.resourceGroupName(), sqlFirewallRule.sqlServerName(), sqlFirewallRule.name()); + sqlServerManager.sqlFirewallRules().deleteByParent(sqlFirewallRule.resourceGroupName(), sqlFirewallRule.sqlServerName(), sqlFirewallRule.name()); validateSqlFirewallRuleNotFound(); - sqlServerManager.sqlServers().delete(sqlServer.resourceGroupName(), sqlServer.name()); + sqlServerManager.sqlServers().deleteByGroup(sqlServer.resourceGroupName(), sqlServer.name()); validateSqlServerNotFound(sqlServer); } diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java index 652048cfd6d35..5b3cf372ad5ab 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/StorageAccounts.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -23,7 +23,7 @@ public interface StorageAccounts extends SupportsListing, SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java index 0fe0e41f30922..5badb8a87d37e 100644 --- a/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java +++ b/azure-mgmt-storage/src/main/java/com/microsoft/azure/management/storage/implementation/StorageAccountsImpl.java @@ -53,7 +53,7 @@ public StorageAccount getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java index abf4fba449046..5d9da97542f51 100644 --- a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java +++ b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java @@ -29,7 +29,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test diff --git a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/TrafficManagerProfiles.java b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/TrafficManagerProfiles.java index 3e53d21a96b6a..b30df92e420d5 100644 --- a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/TrafficManagerProfiles.java +++ b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/TrafficManagerProfiles.java @@ -12,7 +12,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsBatchCreation; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; /** @@ -25,7 +25,7 @@ public interface TrafficManagerProfiles extends SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, - SupportsDeleting, + SupportsDeletingById, SupportsDeletingByGroup, SupportsBatchCreation { diff --git a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerProfilesImpl.java b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerProfilesImpl.java index 4bf38a5ff63a2..8e869afa59664 100644 --- a/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerProfilesImpl.java +++ b/azure-mgmt-trafficmanager/src/main/java/com/microsoft/azure/management/trafficmanager/implementation/TrafficManagerProfilesImpl.java @@ -62,7 +62,7 @@ public TrafficManagerProfile getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return this.innerCollection.deleteAsync(groupName, name); } diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java index ad6769e33cf76..d39ff5380b278 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/AppServicePlans.java @@ -11,14 +11,14 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point for storage accounts management API. */ public interface AppServicePlans extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrders.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrders.java index d661ac834a80f..11c820b5b18f4 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrders.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/CertificateOrders.java @@ -11,14 +11,14 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point for storage accounts management API. */ public interface CertificateOrders extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Certificates.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Certificates.java index 809627a7ad733..f354bcdc8a37f 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Certificates.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/Certificates.java @@ -11,14 +11,14 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point for storage accounts management API. */ public interface Certificates extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java index 5b32e48df08f2..66f37bb95b116 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/WebApps.java @@ -11,14 +11,14 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsListingByGroup; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsCreating; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; /** * Entry point for storage accounts management API. */ public interface WebApps extends SupportsCreating, - SupportsDeleting, + SupportsDeletingById, SupportsListingByGroup, SupportsGettingByGroup, SupportsGettingById, diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java index 3d0f053d2a63b..9814c51d577ac 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/AppServicePlansImpl.java @@ -35,7 +35,7 @@ public AppServicePlan getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return innerCollection.deleteAsync(groupName, name) .map(new Func1() { @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersImpl.java index dd1297bbd5cf6..840330b5b6039 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificateOrdersImpl.java @@ -36,7 +36,7 @@ public CertificateOrder getByGroup(String groupName, String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return innerCollection.deleteCertificateOrderAsync(groupName, name) .map(new Func1() { @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesImpl.java index 46a3c37249aa0..f2e9a437d41ad 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/CertificatesImpl.java @@ -59,7 +59,7 @@ public CertificateImpl define(String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return innerCollection.deleteAsync(groupName, name) .map(new Func1() { @Override diff --git a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java index bdb5575d59064..9bfa837cba2d3 100644 --- a/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java +++ b/azure-mgmt-website/src/main/java/com/microsoft/azure/management/website/implementation/WebAppsImpl.java @@ -58,7 +58,7 @@ public WebAppImpl define(String name) { } @Override - public Observable deleteAsync(String groupName, String name) { + public Observable deleteByGroupAsync(String groupName, String name) { return innerCollection.deleteAsync(groupName, name) .map(new Func1() { @Override diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java index 9ef92ce18aae2..ef12a4a3e966e 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java @@ -25,7 +25,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java index a39f2f2c331f5..4efb4210a2690 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java @@ -27,7 +27,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteById(RG_NAME); } @Test diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java index 8bd8762de896b..77fc0872cf077 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java @@ -222,13 +222,13 @@ public static void main(String[] args) { batchAccount.update().withoutApplication(applicationEntry.getKey()).apply(); } - azure.batchAccounts().delete(batchAccount.id()); + azure.batchAccounts().deleteById(batchAccount.id()); System.out.println("Deleted batch account"); if (batchAccount2 != null) { System.out.println("Deleting second batch account - " + batchAccount2.name()); - azure.batchAccounts().delete(batchAccount2.id()); + azure.batchAccounts().deleteById(batchAccount2.id()); System.out.println("Deleted second batch account"); } } catch (Exception f) { @@ -237,7 +237,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java index 7e6c583e5c716..65946941a0173 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java @@ -146,7 +146,7 @@ public static void main(String[] args) { // Deleting the virtual machine System.out.println("Deleting VM: " + linuxVM2.id()); - azure.virtualMachines().delete(linuxVM2.id()); // VM required to be deleted to be able to attach it's + azure.virtualMachines().deleteById(linuxVM2.id()); // VM required to be deleted to be able to attach it's // OS Disk VHD to another VM (Deallocate is not sufficient) System.out.println("Deleted VM"); @@ -178,7 +178,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java index da7fe3d342970..bc29f274833a6 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java @@ -183,7 +183,7 @@ public static void main(String[] args) { System.out.println("Deleting an availability set: " + availSet2.id()); - azure.availabilitySets().delete(availSet2.id()); + azure.availabilitySets().deleteById(availSet2.id()); System.out.println("Deleted availability set: " + availSet2.id()); @@ -196,7 +196,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java index 0ca85430b028d..bd1d004df29c8 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java @@ -240,7 +240,7 @@ public static void main(String[] args) { // Delete the virtual machine System.out.println("Deleting VM: " + windowsVM.id()); - azure.virtualMachines().delete(windowsVM.id()); + azure.virtualMachines().deleteById(windowsVM.id()); System.out.println("Deleted VM: " + windowsVM.id()); @@ -253,7 +253,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java index ea1728c4c0f12..054090b6a61e7 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java @@ -294,7 +294,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java index b46d16fea8dab..8d4fb0f070652 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java @@ -299,7 +299,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java index 60629e054b742..f878b31e25939 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java @@ -120,7 +120,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java b/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java index c5c6a0dc725d3..c1bd959e94df1 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java @@ -142,15 +142,15 @@ public static void main(String[] args) { //============================================================ // Delete key vaults System.out.println("Deleting the key vaults"); - azure.vaults().delete(vault1.id()); - azure.vaults().delete(vault2.id()); + azure.vaults().deleteById(vault1.id()); + azure.vaults().deleteById(vault2.id()); System.out.println("Deleted the key vaults"); } catch (Exception e) { System.err.println(e.getMessage()); } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java index 978aec33b57f0..c9fd57ec8a232 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java @@ -162,14 +162,14 @@ public static void main(String[] args) { //============================================================ // Delete the public ip System.out.println("Deleting the public IP address"); - azure.publicIpAddresses().delete(publicIpAddress.id()); + azure.publicIpAddresses().deleteById(publicIpAddress.id()); System.out.println("Deleted the public IP address"); } catch (Exception e) { System.err.println(e.getMessage()); } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java index 721d8011aeeb4..68192c2f9cf92 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java @@ -450,7 +450,7 @@ public static void main(String[] args) { System.out.println("Deleting load balancer " + loadBalancerName4 + "(" + loadBalancer4.id() + ")"); - azure.loadBalancers().delete(loadBalancer4.id()); + azure.loadBalancers().deleteById(loadBalancer4.id()); System.out.println("Deleted load balancer" + loadBalancerName4); @@ -462,7 +462,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java index 55859b3c06f79..cab5764c7cd46 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java @@ -511,7 +511,7 @@ public static void main(String[] args) { System.out.println("Deleting load balancer " + loadBalancerName2 + "(" + loadBalancer2.id() + ")"); - azure.loadBalancers().delete(loadBalancer2.id()); + azure.loadBalancers().deleteById(loadBalancer2.id()); System.out.println("Deleted load balancer" + loadBalancerName2); @@ -523,7 +523,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java index 03359f1dd791a..ade545053709a 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java @@ -190,9 +190,9 @@ public static void main(String[] args) { System.out.println("Deleting a network interface: " + networkInterface2.id()); System.out.println("First, deleting the vm"); - azure.virtualMachines().delete(vm.id()); + azure.virtualMachines().deleteById(vm.id()); System.out.println("Second, deleting the network interface"); - azure.networkInterfaces().delete(networkInterface2.id()); + azure.networkInterfaces().deleteById(networkInterface2.id()); System.out.println("Deleted network interface"); System.out.println("============================================================"); @@ -210,7 +210,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java index aa3fa968a603f..4e041f4409cb9 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java @@ -302,7 +302,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java index 603b52a4a6770..8bcf6adb17d06 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java @@ -248,7 +248,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java index 164110730cc68..490e68758c0af 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java @@ -256,14 +256,14 @@ public static void main(String[] args) { //============================================================ // Delete a virtual network System.out.println("Deleting the virtual network"); - azure.networks().delete(virtualNetwork2.id()); + azure.networks().deleteById(virtualNetwork2.id()); System.out.println("Deleted the virtual network"); } catch (Exception e) { System.err.println(e.getMessage()); } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java b/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java index c97cbbbf69dba..e603c15927c2b 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java @@ -153,7 +153,7 @@ public static void main(String[] args) { System.out.println("Deleting a Redis Cache - " + redisCache1.name()); - azure.redisCaches().delete(redisCache1.id()); + azure.redisCaches().deleteById(redisCache1.id()); System.out.println("Deleted Redis Cache"); } catch (Exception f) { @@ -162,7 +162,7 @@ public static void main(String[] args) { } finally { if (azure.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java index a157b7993b5d2..69b5106527ffc 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java @@ -91,7 +91,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java index 4344a42e4f89c..67759e2e04624 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java @@ -100,7 +100,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java index fc98de81f3925..5c540b7090644 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java @@ -119,7 +119,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java index 3927d853f435c..80b8866ba6312 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java @@ -120,7 +120,7 @@ public static void main(String[] args) { System.out.println("Deleting storage account: " + resourceName2); - azure.storageAccounts().delete(storageAccount2.id()); + azure.storageAccounts().deleteById(storageAccount2.id()); System.out.println("Deleted storage account: " + resourceName2); @@ -133,7 +133,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java index 83ecb77dec5b1..b74e22b049bf8 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java @@ -109,7 +109,7 @@ public static void main(String[] args) { System.out.println("Deleting resource group: " + rgName2); - azure.resourceGroups().delete(rgName2); + azure.resourceGroups().deleteById(rgName2); System.out.println("Deleted resource group: " + rgName2); @@ -122,7 +122,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java index 563ba67104adc..19a1a60e82795 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java @@ -120,7 +120,7 @@ public static void main(String[] args) { System.out.println("Deleting a storage account - " + storageAccount.name() + " created @ " + storageAccount.creationTime()); - azure.storageAccounts().delete(storageAccount.id()); + azure.storageAccounts().deleteById(storageAccount.id()); System.out.println("Deleted storage account"); } catch (Exception f) { @@ -129,7 +129,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().delete(rgName); + azure.resourceGroups().deleteById(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { diff --git a/azure/src/test/java/com/microsoft/azure/management/AzureTests.java b/azure/src/test/java/com/microsoft/azure/management/AzureTests.java index 01eaa86f72da2..6acc9a0df7e94 100644 --- a/azure/src/test/java/com/microsoft/azure/management/AzureTests.java +++ b/azure/src/test/java/com/microsoft/azure/management/AzureTests.java @@ -111,7 +111,7 @@ public void setup() throws Exception { .create(); System.out.println("Created deployment: " + deployment.correlationId()); - azure.resourceGroups().delete("rg" + testId); + azure.resourceGroups().deleteById("rg" + testId); } diff --git a/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java b/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java index 3e654fec4648f..45ec4827ea59f 100644 --- a/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java @@ -11,7 +11,7 @@ import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingByGroup; import com.microsoft.azure.management.resources.fluentcore.arm.collection.SupportsGettingById; import com.microsoft.azure.management.resources.fluentcore.arm.models.GroupableResource; -import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeleting; +import com.microsoft.azure.management.resources.fluentcore.collection.SupportsDeletingById; import com.microsoft.azure.management.resources.fluentcore.collection.SupportsListing; import org.junit.Assert; @@ -24,7 +24,7 @@ */ public abstract class TestTemplate< T extends GroupableResource, - C extends SupportsListing & SupportsGettingByGroup & SupportsDeleting & SupportsGettingById> { + C extends SupportsListing & SupportsGettingByGroup & SupportsDeletingById & SupportsGettingById> { protected String testId = String.valueOf(System.currentTimeMillis() % 100000L); private T resource; @@ -80,8 +80,8 @@ public T verifyGetting() throws CloudException, IOException { */ public void verifyDeleting() throws Exception { final String groupName = this.resource.resourceGroupName(); - this.collection.delete(this.resource.id()); - this.resourceGroups.delete(groupName); + this.collection.deleteById(this.resource.id()); + this.resourceGroups.deleteById(groupName); } /** From 5a807e0edc7ff3788851cb301ad7ee6d0efd3dad Mon Sep 17 00:00:00 2001 From: Jianghao Lu Date: Tue, 25 Oct 2016 00:27:25 -0700 Subject: [PATCH 4/4] Fix references in tests and samples --- .../azure/management/batch/BatchAccountOperationsTests.java | 2 +- .../management/compute/VirtualMachineOperationsTests.java | 2 +- .../compute/VirtualMachineScaleSetOperationsTests.java | 2 +- .../com/microsoft/azure/management/keyvault/VaultTests.java | 2 +- .../management/network/NetworkInterfaceOperationsTests.java | 5 +---- .../azure/management/redis/RedisCacheOperationsTests.java | 4 ++-- .../azure/management/resources/DeploymentsTests.java | 2 +- .../azure/management/resources/ResourceGroupsTests.java | 2 +- .../azure/management/sql/SqlServerOperationsTests.java | 2 +- .../management/storage/StorageAccountOperationsTests.java | 2 +- .../azure/management/website/AppServicePlansTests.java | 2 +- .../azure/management/website/CertificateOrdersTests.java | 2 +- .../com/microsoft/azure/management/website/WebAppTests.java | 2 +- .../azure/management/batch/samples/ManageBatchAccount.java | 2 +- ...reateVirtualMachinesUsingCustomImageOrSpecializedVHD.java | 2 +- .../management/compute/samples/ManageAvailabilitySet.java | 2 +- .../management/compute/samples/ManageVirtualMachine.java | 2 +- .../compute/samples/ManageVirtualMachineExtension.java | 2 +- .../compute/samples/ManageVirtualMachineScaleSet.java | 2 +- .../compute/samples/ManageVirtualMachinesInParallel.java | 2 +- .../azure/management/keyvault/samples/ManageKeyVault.java | 2 +- .../azure/management/network/samples/ManageIPAddress.java | 2 +- .../network/samples/ManageInternalLoadBalancer.java | 2 +- .../network/samples/ManageInternetFacingLoadBalancer.java | 2 +- .../management/network/samples/ManageNetworkInterface.java | 2 +- .../network/samples/ManageNetworkSecurityGroup.java | 2 +- .../samples/ManageVirtualMachinesInParallelWithNetwork.java | 2 +- .../management/network/samples/ManageVirtualNetwork.java | 2 +- .../management/rediscache/samples/ManageRedisCache.java | 2 +- .../management/resources/samples/DeployUsingARMTemplate.java | 2 +- .../samples/DeployUsingARMTemplateWithProgress.java | 2 +- .../resources/samples/DeployUsingARMTemplateWithTags.java | 2 +- .../azure/management/resources/samples/ManageResource.java | 2 +- .../management/resources/samples/ManageResourceGroup.java | 4 ++-- .../management/storage/samples/ManageStorageAccount.java | 2 +- .../test/java/com/microsoft/azure/management/AzureTests.java | 2 +- .../java/com/microsoft/azure/management/TestTemplate.java | 2 +- 37 files changed, 39 insertions(+), 42 deletions(-) diff --git a/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java b/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java index caec410c9db8f..671eca66c5295 100644 --- a/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java +++ b/azure-mgmt-batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java @@ -29,7 +29,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java index f8b2cf3d7fe6c..0ea7cd8e51761 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java @@ -18,7 +18,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java index 016eb87cc1a44..47acc6fbdc618 100644 --- a/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java +++ b/azure-mgmt-compute/src/test/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java @@ -29,7 +29,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-keyvault/src/test/java/com/microsoft/azure/management/keyvault/VaultTests.java b/azure-mgmt-keyvault/src/test/java/com/microsoft/azure/management/keyvault/VaultTests.java index 45a505e37618f..03ca4596ce436 100644 --- a/azure-mgmt-keyvault/src/test/java/com/microsoft/azure/management/keyvault/VaultTests.java +++ b/azure-mgmt-keyvault/src/test/java/com/microsoft/azure/management/keyvault/VaultTests.java @@ -25,7 +25,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - //resourceManager.resourceGroups().delete(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java b/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java index 17986a598972c..77b15193ec48c 100644 --- a/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java +++ b/azure-mgmt-network/src/test/java/com/microsoft/azure/management/network/NetworkInterfaceOperationsTests.java @@ -14,7 +14,6 @@ public class NetworkInterfaceOperationsTests extends NetworkManagementTestBase { private static String RG_NAME = "javanwmrg"; - private static String resourceGroupId = null; @BeforeClass public static void setup() throws Exception { @@ -23,9 +22,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - if (resourceGroupId != null) { - resourceManager.resourceGroups().deleteById(resourceGroupId); - } + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java b/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java index ef80ce1d03a51..c037f08498b17 100644 --- a/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java +++ b/azure-mgmt-redis/src/test/java/com/microsoft/azure/management/redis/RedisCacheOperationsTests.java @@ -36,8 +36,8 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); - resourceManager.resourceGroups().deleteById(RG_NAME_SECOND); + resourceManager.resourceGroups().deleteByName(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME_SECOND); } @Test diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java index 41a227cbb985c..9f2718d5ddfee 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/DeploymentsTests.java @@ -36,7 +36,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceGroups.deleteById(rgName); + resourceGroups.deleteByName(rgName); } @Test diff --git a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java index 6e82609ea0cc2..9bf25e2d82671 100644 --- a/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java +++ b/azure-mgmt-resources/src/test/java/com/microsoft/azure/management/resources/ResourceGroupsTests.java @@ -47,7 +47,7 @@ public void canCreateResourceGroup() throws Exception { Assert.assertEquals("value1", updatedGroup.tags().get("tag1")); Assert.assertEquals(location, getGroup.regionName()); // Delete - resourceGroups.deleteById(rgName); + resourceGroups.deleteByName(rgName); Assert.assertFalse(resourceGroups.checkExistence(rgName)); } } diff --git a/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java b/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java index 27b80e54dc2cb..be0d2582127a8 100644 --- a/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java +++ b/azure-mgmt-sql/src/test/java/com/microsoft/azure/management/sql/SqlServerOperationsTests.java @@ -35,7 +35,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java index 5d9da97542f51..cdb690b0ea2d8 100644 --- a/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java +++ b/azure-mgmt-storage/src/test/java/com/microsoft/azure/management/storage/StorageAccountOperationsTests.java @@ -29,7 +29,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java index ef12a4a3e966e..ad4f2c24cc535 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/AppServicePlansTests.java @@ -25,7 +25,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java index 4efb4210a2690..ecf144f51a4d5 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/CertificateOrdersTests.java @@ -27,7 +27,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - resourceManager.resourceGroups().deleteById(RG_NAME); + resourceManager.resourceGroups().deleteByName(RG_NAME); } @Test diff --git a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppTests.java b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppTests.java index b07d4ffd3133d..5c263b19b9e9d 100644 --- a/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppTests.java +++ b/azure-mgmt-website/src/test/java/com/microsoft/azure/management/website/WebAppTests.java @@ -26,7 +26,7 @@ public static void setup() throws Exception { @AfterClass public static void cleanup() throws Exception { - //resourceManager.resourceGroups().delete(RG_NAME); + //resourceManager.resourceGroups().deleteByName(RG_NAME); } @Ignore diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java index 77fc0872cf077..9b53c86202814 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/batch/samples/ManageBatchAccount.java @@ -237,7 +237,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java index 65946941a0173..6b85ec22a2a45 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/CreateVirtualMachinesUsingCustomImageOrSpecializedVHD.java @@ -178,7 +178,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java index bc29f274833a6..985635a291d66 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageAvailabilitySet.java @@ -196,7 +196,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java index bd1d004df29c8..31a284b54c26d 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachine.java @@ -253,7 +253,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java index 054090b6a61e7..bc1af57692eb9 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineExtension.java @@ -294,7 +294,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java index 8d4fb0f070652..1300315010f51 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachineScaleSet.java @@ -299,7 +299,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java index f878b31e25939..30d0ed6d69621 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/compute/samples/ManageVirtualMachinesInParallel.java @@ -120,7 +120,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java b/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java index c1bd959e94df1..e623da1b46658 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/keyvault/samples/ManageKeyVault.java @@ -150,7 +150,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java index c9fd57ec8a232..693e2df92d3f0 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageIPAddress.java @@ -169,7 +169,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java index 68192c2f9cf92..e57a4cfd0a075 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternalLoadBalancer.java @@ -462,7 +462,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java index cab5764c7cd46..2845556139b1b 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageInternetFacingLoadBalancer.java @@ -523,7 +523,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java index ade545053709a..1bcc93708672b 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkInterface.java @@ -210,7 +210,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java index 4e041f4409cb9..64698a6e68445 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java @@ -302,7 +302,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java index 8bcf6adb17d06..cf477f9555967 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualMachinesInParallelWithNetwork.java @@ -248,7 +248,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java index 490e68758c0af..a94948e4bd2a0 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java @@ -263,7 +263,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java b/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java index e603c15927c2b..7ca5be2326ea0 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/rediscache/samples/ManageRedisCache.java @@ -162,7 +162,7 @@ public static void main(String[] args) { } finally { if (azure.resourceGroups().getByName(rgName) != null) { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } else { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java index 69b5106527ffc..7886c06d2945f 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplate.java @@ -91,7 +91,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java index 67759e2e04624..c6910f00d9b30 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithProgress.java @@ -100,7 +100,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java index 5c540b7090644..6941b2263c4e3 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/DeployUsingARMTemplateWithTags.java @@ -119,7 +119,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java index 80b8866ba6312..e55adc5d93d18 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResource.java @@ -133,7 +133,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java index b74e22b049bf8..379ba52ad0228 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/resources/samples/ManageResourceGroup.java @@ -109,7 +109,7 @@ public static void main(String[] args) { System.out.println("Deleting resource group: " + rgName2); - azure.resourceGroups().deleteById(rgName2); + azure.resourceGroups().deleteByName(rgName2); System.out.println("Deleted resource group: " + rgName2); @@ -122,7 +122,7 @@ public static void main(String[] args) { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (NullPointerException npe) { System.out.println("Did not create any resources in Azure. No clean up is necessary"); diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java index 19a1a60e82795..3c4b3378eacf8 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/storage/samples/ManageStorageAccount.java @@ -129,7 +129,7 @@ public static void main(String[] args) { } finally { try { System.out.println("Deleting Resource Group: " + rgName); - azure.resourceGroups().deleteById(rgName); + azure.resourceGroups().deleteByName(rgName); System.out.println("Deleted Resource Group: " + rgName); } catch (Exception e) { diff --git a/azure/src/test/java/com/microsoft/azure/management/AzureTests.java b/azure/src/test/java/com/microsoft/azure/management/AzureTests.java index 6acc9a0df7e94..520c9a5b0bee6 100644 --- a/azure/src/test/java/com/microsoft/azure/management/AzureTests.java +++ b/azure/src/test/java/com/microsoft/azure/management/AzureTests.java @@ -111,7 +111,7 @@ public void setup() throws Exception { .create(); System.out.println("Created deployment: " + deployment.correlationId()); - azure.resourceGroups().deleteById("rg" + testId); + azure.resourceGroups().deleteByName("rg" + testId); } diff --git a/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java b/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java index 45ec4827ea59f..6d2aecc44bf30 100644 --- a/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java +++ b/azure/src/test/java/com/microsoft/azure/management/TestTemplate.java @@ -81,7 +81,7 @@ public T verifyGetting() throws CloudException, IOException { public void verifyDeleting() throws Exception { final String groupName = this.resource.resourceGroupName(); this.collection.deleteById(this.resource.id()); - this.resourceGroups.deleteById(groupName); + this.resourceGroups.deleteByName(groupName); } /**