Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void deleteById(String id) {
}

@Override
public Mono<?> deleteByIdAsync(String id) {
public Mono<Void> deleteByIdAsync(String id) {
return deleteByNameAsync(ResourceUtils.nameFromResourceId(id));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void deleteById(String id) {
}

@Override
public Mono<?> deleteByIdAsync(String id) {
public Mono<Void> deleteByIdAsync(String id) {
return deleteByNameAsync(ResourceUtils.nameFromResourceId(id));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public void deleteById(String id) {
}

@Override
public Mono<?> deleteByIdAsync(String id) {
public Mono<Void> deleteByIdAsync(String id) {
return deleteByNameAsync(ResourceUtils.nameFromResourceId(id));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,8 @@ protected RoleAssignmentImpl wrapModel(String name) {
}

@Override
public Mono<RoleAssignment> deleteByIdAsync(String id) {
return inner()
.deleteByIdAsync(id)
.map(
roleAssignmentInner ->
new RoleAssignmentImpl(roleAssignmentInner.name(), roleAssignmentInner, manager()));
public Mono<Void> deleteByIdAsync(String id) {
return inner().deleteByIdAsync(id).then();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public NetworkSecurityGroupsImpl(final NetworkManager networkManager) {
}

@Override
public Mono<?> deleteByResourceGroupAsync(String groupName, String name) {
public Mono<Void> deleteByResourceGroupAsync(String groupName, String name) {
// Clear NIC references if any
NetworkSecurityGroupImpl nsg = (NetworkSecurityGroupImpl) getByResourceGroup(groupName, name);
if (nsg != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Void> deleteByResourceGroupAsync(String resourceGroupName, String name);
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ public final void deleteByResourceGroup(String groupName, String name) {
}

@Override
public Mono<?> deleteByResourceGroupAsync(String groupName, String name) {
public Mono<Void> deleteByResourceGroupAsync(String groupName, String name) {
return this.deleteInnerAsync(groupName, name).subscribeOn(SdkContext.getReactorScheduler());
}

@Override
public Mono<?> deleteByIdAsync(String id) {
public Mono<Void> deleteByIdAsync(String id) {
return deleteByResourceGroupAsync(ResourceUtils.groupFromResourceId(id), ResourceUtils.nameFromResourceId(id));
}

Expand All @@ -99,5 +99,5 @@ public Mono<T> getByResourceGroupAsync(String resourceGroupName, String name) {

protected abstract Mono<InnerT> getInnerAsync(String resourceGroupName, String name);

protected abstract Mono<?> deleteInnerAsync(String resourceGroupName, String name);
protected abstract Mono<Void> deleteInnerAsync(String resourceGroupName, String name);
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ protected final Mono<InnerT> getInnerAsync(String resourceGroupName, String name
}

@Override
protected Mono<?> deleteInnerAsync(String resourceGroupName, String name) {
return inner().deleteAsync(resourceGroupName, name);
protected Mono<Void> deleteInnerAsync(String resourceGroupName, String name) {
return inner().deleteAsync(resourceGroupName, name).then();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Void> deleteByIdAsync(String id);
}