diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDomainsImpl.java b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDomainsImpl.java index 5b4f1a6b4939..83958d3e5c01 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDomainsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppDomainsImpl.java @@ -66,7 +66,7 @@ public void deleteById(String id) { } @Override - public Mono deleteByIdAsync(String id) { + public Mono deleteByIdAsync(String id) { return deleteByNameAsync(ResourceUtils.nameFromResourceId(id)); } diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppServiceBindingsImpl.java b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppServiceBindingsImpl.java index 07326ae08fa0..8a21fe376f50 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppServiceBindingsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringAppServiceBindingsImpl.java @@ -65,7 +65,7 @@ public void deleteById(String id) { } @Override - public Mono deleteByIdAsync(String id) { + public Mono deleteByIdAsync(String id) { return deleteByNameAsync(ResourceUtils.nameFromResourceId(id)); } diff --git a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringServiceCertificatesImpl.java b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringServiceCertificatesImpl.java index a9bc99498871..8a6bf4530bee 100644 --- a/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringServiceCertificatesImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-appplatform/src/main/java/com/azure/resourcemanager/appplatform/implementation/SpringServiceCertificatesImpl.java @@ -65,7 +65,7 @@ public void deleteById(String id) { } @Override - public Mono deleteByIdAsync(String id) { + public Mono deleteByIdAsync(String id) { return deleteByNameAsync(ResourceUtils.nameFromResourceId(id)); } diff --git a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java index 185f2128a8be..d25184b9033f 100644 --- a/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-authorization/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java @@ -75,12 +75,8 @@ protected RoleAssignmentImpl wrapModel(String name) { } @Override - public Mono deleteByIdAsync(String id) { - return inner() - .deleteByIdAsync(id) - .map( - roleAssignmentInner -> - new RoleAssignmentImpl(roleAssignmentInner.name(), roleAssignmentInner, manager())); + public Mono deleteByIdAsync(String id) { + return inner().deleteByIdAsync(id).then(); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsImpl.java b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsImpl.java index 03156c509588..9fdb802db2ba 100644 --- a/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-network/src/main/java/com/azure/resourcemanager/network/implementation/NetworkSecurityGroupsImpl.java @@ -26,7 +26,7 @@ public NetworkSecurityGroupsImpl(final NetworkManager networkManager) { } @Override - public Mono deleteByResourceGroupAsync(String groupName, String name) { + public Mono deleteByResourceGroupAsync(String groupName, String name) { // Clear NIC references if any NetworkSecurityGroupImpl nsg = (NetworkSecurityGroupImpl) getByResourceGroup(groupName, name); if (nsg != null) { diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/SupportsDeletingByResourceGroup.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/SupportsDeletingByResourceGroup.java index d49913cd1944..45d0dd5dfa91 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/SupportsDeletingByResourceGroup.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/SupportsDeletingByResourceGroup.java @@ -26,5 +26,5 @@ public interface SupportsDeletingByResourceGroup { * @param name the name of the resource * @return a representation of the deferred computation of this call */ - Mono deleteByResourceGroupAsync(String resourceGroupName, String name); + Mono deleteByResourceGroupAsync(String resourceGroupName, String name); } diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java index 83cf4018a659..9c4f3d73d1a6 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/GroupableResourcesImpl.java @@ -77,12 +77,12 @@ public final void deleteByResourceGroup(String groupName, String name) { } @Override - public Mono deleteByResourceGroupAsync(String groupName, String name) { + public Mono deleteByResourceGroupAsync(String groupName, String name) { return this.deleteInnerAsync(groupName, name).subscribeOn(SdkContext.getReactorScheduler()); } @Override - public Mono deleteByIdAsync(String id) { + public Mono deleteByIdAsync(String id) { return deleteByResourceGroupAsync(ResourceUtils.groupFromResourceId(id), ResourceUtils.nameFromResourceId(id)); } @@ -99,5 +99,5 @@ public Mono getByResourceGroupAsync(String resourceGroupName, String name) { protected abstract Mono getInnerAsync(String resourceGroupName, String name); - protected abstract Mono deleteInnerAsync(String resourceGroupName, String name); + protected abstract Mono deleteInnerAsync(String resourceGroupName, String name); } diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/TopLevelModifiableResourcesImpl.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/TopLevelModifiableResourcesImpl.java index efc6a2a7642f..178f8cddbe1d 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/TopLevelModifiableResourcesImpl.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/arm/collection/implementation/TopLevelModifiableResourcesImpl.java @@ -54,8 +54,8 @@ protected final Mono getInnerAsync(String resourceGroupName, String name } @Override - protected Mono deleteInnerAsync(String resourceGroupName, String name) { - return inner().deleteAsync(resourceGroupName, name); + protected Mono deleteInnerAsync(String resourceGroupName, String name) { + return inner().deleteAsync(resourceGroupName, name).then(); } @Override diff --git a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/collection/SupportsDeletingById.java b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/collection/SupportsDeletingById.java index 824edb6253a8..abae7e70654c 100644 --- a/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/collection/SupportsDeletingById.java +++ b/sdk/resourcemanager/azure-resourcemanager-resources/src/main/java/com/azure/resourcemanager/resources/fluentcore/collection/SupportsDeletingById.java @@ -24,5 +24,5 @@ public interface SupportsDeletingById { * @param id the resource ID of the resource to delete * @return a representation of the deferred computation of this call */ - Mono deleteByIdAsync(String id); + Mono deleteByIdAsync(String id); }