Merge pull request #1236 from jianghaolu/deleteby

Rename delete to deleteByBlah to align with getByBlahs
Azure · Oct 25, 2016 · 560aa18 · 560aa18
2 parents 79217b0 + 5a807e0
commit 560aa18
Show file tree

Hide file tree

Showing 103 changed files with 289 additions and 233 deletions.
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
@@ -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<BatchAccount>,
         SupportsGettingByGroup<BatchAccount>,
         SupportsGettingById<BatchAccount>,
-        SupportsDeleting,
+        SupportsDeletingById,
         SupportsDeletingByGroup,
         SupportsBatchCreation<BatchAccount> {
     /**

diff --git a/.../src/main/java/com/microsoft/azure/management/batch/implementation/BatchAccountsImpl.java b/.../src/main/java/com/microsoft/azure/management/batch/implementation/BatchAccountsImpl.java
@@ -42,7 +42,7 @@ protected BatchAccountsImpl(
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...batch/src/test/java/com/microsoft/azure/management/batch/BatchAccountOperationsTests.java b/...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().deleteByName(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/...e-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/AvailabilitySets.java b/...e-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<AvailabilitySet>,
         SupportsListing<AvailabilitySet>,
         SupportsCreating<AvailabilitySet.DefinitionStages.Blank>,
-        SupportsDeleting,
+        SupportsDeletingById,
         SupportsDeletingByGroup,
         SupportsBatchCreation<AvailabilitySet> {
 }
diff --git a/...compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineScaleSets.java b/...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<VirtualMachineScaleSet>,
         SupportsGettingById<VirtualMachineScaleSet>,
         SupportsCreating<VirtualMachineScaleSet.DefinitionStages.Blank>,
-        SupportsDeleting,
+        SupportsDeletingById,
         SupportsDeletingByGroup,
         SupportsBatchCreation<VirtualMachineScaleSet> {
     /**

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
@@ -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<VirtualMachine>,
         SupportsGettingById<VirtualMachine>,
         SupportsCreating<VirtualMachine.DefinitionStages.Blank>,
-        SupportsDeleting,
+        SupportsDeletingById,
         SupportsDeletingByGroup,
         SupportsBatchCreation<VirtualMachine> {
 

diff --git a/...main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java b/...main/java/com/microsoft/azure/management/compute/implementation/AvailabilitySetsImpl.java
@@ -61,7 +61,7 @@ public AvailabilitySetImpl define(String name) {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...va/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java b/...va/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java
@@ -56,7 +56,7 @@ public PagedList<VirtualMachineScaleSet> list() {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/.../main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java b/.../main/java/com/microsoft/azure/management/compute/implementation/VirtualMachinesImpl.java
@@ -74,7 +74,7 @@ public VirtualMachine getByGroup(String groupName, String name) {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...e/src/test/java/com/microsoft/azure/management/compute/VirtualMachineOperationsTests.java b/...e/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().deleteByName(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/...st/java/com/microsoft/azure/management/compute/VirtualMachineScaleSetOperationsTests.java b/...st/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().deleteByName(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
@@ -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<ActiveDirectoryGroup.DefinitionStages.Blank>,
         SupportsListing<ActiveDirectoryGroup>,
-        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
@@ -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<Vault>,
         SupportsCreating<Vault.DefinitionStages.Blank>,
-        SupportsDeleting,
+        SupportsDeletingById,
         SupportsListingByGroup<Vault>,
         SupportsGettingByGroup<Vault>,
         SupportsGettingById<Vault>,

diff --git a/...ault/src/main/java/com/microsoft/azure/management/keyvault/implementation/VaultsImpl.java b/...ault/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<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

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
@@ -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/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<LoadBalancer>,
     SupportsGettingByGroup<LoadBalancer>,
     SupportsGettingById<LoadBalancer>,
-    SupportsDeleting,
+        SupportsDeletingById,
     SupportsDeletingByGroup,
     SupportsBatchCreation<LoadBalancer> {
 }
diff --git a/...-mgmt-network/src/main/java/com/microsoft/azure/management/network/NetworkInterfaces.java b/...-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<NetworkInterface>,
         SupportsGettingByGroup<NetworkInterface>,
         SupportsGettingById<NetworkInterface>,
-        SupportsDeleting,
+        SupportsDeletingById,
         SupportsDeletingByGroup,
         SupportsBatchCreation<NetworkInterface> {
 }
diff --git a/...t-network/src/main/java/com/microsoft/azure/management/network/NetworkSecurityGroups.java b/...t-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<NetworkSecurityGroup>,
     SupportsGettingByGroup<NetworkSecurityGroup>,
     SupportsGettingById<NetworkSecurityGroup>,
-    SupportsDeleting,
+        SupportsDeletingById,
     SupportsDeletingByGroup,
     SupportsBatchCreation<NetworkSecurityGroup> {
 }
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
@@ -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<Network>,
     SupportsGettingByGroup<Network>,
     SupportsGettingById<Network>,
-    SupportsDeleting,
+        SupportsDeletingById,
     SupportsDeletingByGroup,
     SupportsBatchCreation<Network> {
 }
diff --git a/...-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddresses.java b/...-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<PublicIpAddress>,
     SupportsCreating<PublicIpAddress.DefinitionStages.Blank>,
-    SupportsDeleting,
+        SupportsDeletingById,
     SupportsListingByGroup<PublicIpAddress>,
     SupportsGettingByGroup<PublicIpAddress>,
     SupportsGettingById<PublicIpAddress>,

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
@@ -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<RouteTable>,
     SupportsGettingByGroup<RouteTable>,
     SupportsGettingById<RouteTable>,
-    SupportsDeleting,
+        SupportsDeletingById,
     SupportsDeletingByGroup,
     SupportsBatchCreation<RouteTable> {
 }
diff --git a/...rc/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java b/...rc/main/java/com/microsoft/azure/management/network/implementation/LoadBalancersImpl.java
@@ -47,7 +47,7 @@ public LoadBalancerImpl getByGroup(String groupName, String name) {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...ain/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java b/...ain/java/com/microsoft/azure/management/network/implementation/NetworkInterfacesImpl.java
@@ -45,7 +45,7 @@ public NetworkInterface getByGroup(String groupName, String name) {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java b/...java/com/microsoft/azure/management/network/implementation/NetworkSecurityGroupsImpl.java
@@ -47,7 +47,7 @@ public NetworkSecurityGroupImpl getByGroup(String groupName, String name) {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...ork/src/main/java/com/microsoft/azure/management/network/implementation/NetworksImpl.java b/...ork/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<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/...ain/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java b/...ain/java/com/microsoft/azure/management/network/implementation/PublicIpAddressesImpl.java
@@ -48,7 +48,7 @@ public PublicIpAddressImpl getByGroup(String groupName, String name) {
     }
 
     @Override
-    public Observable<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }
 

diff --git a/.../src/main/java/com/microsoft/azure/management/network/implementation/RouteTablesImpl.java b/.../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<Void> deleteAsync(String groupName, String name) {
+    public Observable<Void> deleteByGroupAsync(String groupName, String name) {
         return this.innerCollection.deleteAsync(groupName, name);
     }