From 04f6a7cd4517a3efb1e5a09df07caece95867d94 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 16 Jul 2020 14:19:19 +0800 Subject: [PATCH 1/6] remove onErrorResume --- .../implementation/ActiveDirectoryApplicationsImpl.java | 3 --- .../implementation/ActiveDirectoryGroupsImpl.java | 2 -- .../implementation/ActiveDirectoryUsersImpl.java | 1 - .../implementation/RoleAssignmentHelper.java | 2 -- .../implementation/RoleAssignmentsImpl.java | 4 ---- .../implementation/RoleDefinitionsImpl.java | 4 ---- .../implementation/ServicePrincipalsImpl.java | 2 -- .../resourcemanager/compute/implementation/DiskImpl.java | 1 - .../compute/implementation/GalleryImageVersionsImpl.java | 1 - .../compute/implementation/GalleryImagesImpl.java | 1 - .../LinuxDiskVolumeLegacyEncryptionMonitorImpl.java | 9 +-------- .../LinuxDiskVolumeNoAADEncryptionMonitorImpl.java | 8 +------- .../implementation/ProxyEncryptionMonitorImpl.java | 3 +-- .../compute/implementation/SnapshotImpl.java | 1 - .../compute/implementation/SnapshotsImpl.java | 1 - .../VirtualMachineExtensionImageVersionImpl.java | 1 - .../VirtualMachineExtensionImagesImpl.java | 2 -- .../implementation/VirtualMachineExtensionImpl.java | 1 - .../compute/implementation/VirtualMachineImagesImpl.java | 2 -- .../WindowsVolumeLegacyEncryptionMonitorImpl.java | 8 +------- .../WindowsVolumeNoAADEncryptionMonitorImpl.java | 8 +------- .../dns/implementation/ARecordSetsImpl.java | 1 - .../dns/implementation/AaaaRecordSetsImpl.java | 1 - .../dns/implementation/CNameRecordSetsImpl.java | 1 - .../dns/implementation/CaaRecordSetsImpl.java | 1 - .../dns/implementation/MXRecordSetsImpl.java | 1 - .../dns/implementation/NSRecordSetsImpl.java | 1 - .../dns/implementation/PtrRecordSetsImpl.java | 1 - .../dns/implementation/SrvRecordSetsImpl.java | 1 - .../dns/implementation/TxtRecordSetsImpl.java | 1 - .../resources/implementation/PolicyAssignmentsImpl.java | 1 - .../resources/implementation/PolicyDefinitionsImpl.java | 1 - 32 files changed, 5 insertions(+), 71 deletions(-) diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java index caa579548312..3c8446d75743 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java @@ -8,7 +8,6 @@ import com.azure.resourcemanager.authorization.AuthorizationManager; import com.azure.resourcemanager.authorization.models.ActiveDirectoryApplication; import com.azure.resourcemanager.authorization.models.ActiveDirectoryApplications; -import com.azure.resourcemanager.authorization.models.GraphErrorException; import com.azure.resourcemanager.authorization.fluent.inner.ApplicationInner; import com.azure.resourcemanager.authorization.fluent.ApplicationsClient; import com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation.CreatableResourcesImpl; @@ -72,7 +71,6 @@ public ActiveDirectoryApplicationImpl getById(String id) { public Mono getByIdAsync(String id) { return innerCollection .getAsync(id) - .onErrorResume(GraphErrorException.class, e -> Mono.empty()) .flatMap( applicationInner -> new ActiveDirectoryApplicationImpl(applicationInner, manager()).refreshCredentialsAsync()); @@ -96,7 +94,6 @@ public Mono getByNameAsync(String name) { UUID.fromString(trimmed); return inner().listAsync(String.format("appId eq '%s'", trimmed)).singleOrEmpty(); })) - .onErrorResume(IllegalArgumentException.class, e -> Mono.empty()) .map(applicationInner -> new ActiveDirectoryApplicationImpl(applicationInner, manager())) .flatMap(activeDirectoryApplication -> activeDirectoryApplication.refreshCredentialsAsync()); } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryGroupsImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryGroupsImpl.java index 846b318c7168..47e3a2178904 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryGroupsImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryGroupsImpl.java @@ -8,7 +8,6 @@ import com.azure.resourcemanager.authorization.AuthorizationManager; import com.azure.resourcemanager.authorization.models.ActiveDirectoryGroup; import com.azure.resourcemanager.authorization.models.ActiveDirectoryGroups; -import com.azure.resourcemanager.authorization.models.GraphErrorException; import com.azure.resourcemanager.authorization.fluent.inner.ADGroupInner; import com.azure.resourcemanager.authorization.fluent.GroupsClient; import com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation.CreatableWrappersImpl; @@ -48,7 +47,6 @@ public Mono getByIdAsync(String id) { .inner() .getGroups() .getAsync(id) - .onErrorResume(GraphErrorException.class, e -> Mono.empty()) .map(groupInner -> new ActiveDirectoryGroupImpl(groupInner, manager())); } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryUsersImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryUsersImpl.java index a917e23f06be..ea77ec3226c6 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryUsersImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryUsersImpl.java @@ -49,7 +49,6 @@ public Mono getByIdAsync(String id) { .inner() .getUsers() .getAsync(id) - .onErrorResume(GraphErrorException.class, e -> Mono.empty()) .map(userInner -> new ActiveDirectoryUserImpl(userInner, manager())); } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentHelper.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentHelper.java index 5658bad032fc..d1890d45ac4b 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentHelper.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentHelper.java @@ -96,7 +96,6 @@ public RoleAssignmentHelper withAccessTo(final String scope, final BuiltInRole a .createAsync() .last() .onErrorResume( - (Function>) throwable -> { if (isRoleAssignmentExists(throwable)) { return cxt.voidMono(); @@ -150,7 +149,6 @@ public RoleAssignmentHelper withAccessTo(final String scope, final String roleDe .createAsync() .last() .onErrorResume( - (Function>) throwable -> { if (isRoleAssignmentExists(throwable)) { return cxt.voidMono(); diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java index d7c6ac9e4e47..185f2128a8be 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleAssignmentsImpl.java @@ -5,7 +5,6 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; -import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.authorization.AuthorizationManager; import com.azure.resourcemanager.authorization.models.RoleAssignment; import com.azure.resourcemanager.authorization.models.RoleAssignments; @@ -41,7 +40,6 @@ public RoleAssignmentImpl getById(String objectId) { public Mono getByIdAsync(String id) { return inner() .getByIdAsync(id) - .onErrorResume(ManagementException.class, e -> Mono.empty()) .map( roleAssignmentInner -> new RoleAssignmentImpl(roleAssignmentInner.name(), roleAssignmentInner, manager())); @@ -66,7 +64,6 @@ public PagedIterable listByScope(String scope) { public Mono getByScopeAsync(String scope, String name) { return inner() .getAsync(scope, name) - .onErrorResume(ManagementException.class, e -> Mono.empty()) .map( roleAssignmentInner -> new RoleAssignmentImpl(roleAssignmentInner.name(), roleAssignmentInner, manager())); @@ -81,7 +78,6 @@ protected RoleAssignmentImpl wrapModel(String name) { public Mono deleteByIdAsync(String id) { return inner() .deleteByIdAsync(id) - .onErrorResume(ManagementException.class, e -> Mono.empty()) .map( roleAssignmentInner -> new RoleAssignmentImpl(roleAssignmentInner.name(), roleAssignmentInner, manager())); diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionsImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionsImpl.java index 03a5d6eb7e5c..36cdcc223dd7 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionsImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/RoleDefinitionsImpl.java @@ -5,7 +5,6 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; -import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.authorization.AuthorizationManager; import com.azure.resourcemanager.authorization.models.RoleDefinition; import com.azure.resourcemanager.authorization.models.RoleDefinitions; @@ -41,7 +40,6 @@ public RoleDefinition getById(String objectId) { public Mono getByIdAsync(String id) { return inner() .getByIdAsync(id) - .onErrorResume(ManagementException.class, e -> Mono.empty()) .map(roleDefinitionInner -> new RoleDefinitionImpl(roleDefinitionInner, manager())); } @@ -54,7 +52,6 @@ public RoleDefinition getByScope(String scope, String name) { public Mono getByScopeAsync(String scope, String name) { return inner() .getAsync(scope, name) - .onErrorResume(ManagementException.class, e -> Mono.empty()) .map(roleDefinitionInner -> new RoleDefinitionImpl(roleDefinitionInner, manager())); } @@ -79,7 +76,6 @@ public PagedIterable listByScope(String scope) { public Mono getByScopeAndRoleNameAsync(String scope, String roleName) { return inner() .listAsync(scope, String.format("roleName eq '%s'", roleName)) - .onErrorResume(ManagementException.class, e -> Mono.empty()) .singleOrEmpty() .map(roleDefinitionInner -> new RoleDefinitionImpl(roleDefinitionInner, manager())); } diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalsImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalsImpl.java index 6b4bb1873004..eca51340fc1b 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalsImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ServicePrincipalsImpl.java @@ -6,7 +6,6 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; import com.azure.resourcemanager.authorization.AuthorizationManager; -import com.azure.resourcemanager.authorization.models.GraphErrorException; import com.azure.resourcemanager.authorization.models.ServicePrincipal; import com.azure.resourcemanager.authorization.models.ServicePrincipals; import com.azure.resourcemanager.authorization.fluent.inner.ServicePrincipalInner; @@ -69,7 +68,6 @@ public ServicePrincipalImpl getById(String id) { public Mono getByIdAsync(String id) { return innerCollection .getAsync(id) - .onErrorResume(GraphErrorException.class, e -> Mono.empty()) .flatMap( servicePrincipalInner -> new ServicePrincipalImpl(servicePrincipalInner, manager()).refreshCredentialsAsync()); diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/DiskImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/DiskImpl.java index ead47902ac27..304fb276c054 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/DiskImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/DiskImpl.java @@ -106,7 +106,6 @@ public Mono grantAccessAsync(int accessDurationInSeconds) { .inner() .getDisks() .grantAccessAsync(this.resourceGroupName(), this.name(), grantAccessDataInner) - .onErrorResume(e -> Mono.empty()) .map(accessUriInner -> accessUriInner.accessSas()); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImageVersionsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImageVersionsImpl.java index de260341acbe..e7135d7f7c41 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImageVersionsImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImageVersionsImpl.java @@ -58,7 +58,6 @@ public Mono getByGalleryImageAsync( String resourceGroupName, String galleryName, String galleryImageName, String galleryImageVersionName) { return inner() .getAsync(resourceGroupName, galleryName, galleryImageName, galleryImageVersionName) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImagesImpl.java index c99d8b8918ef..557d090cea23 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/GalleryImagesImpl.java @@ -53,7 +53,6 @@ public PagedIterable listByGallery(String resourceGroupName, Strin public Mono getByGalleryAsync(String resourceGroupName, String galleryName, String galleryImageName) { return inner() .getAsync(resourceGroupName, galleryName, galleryImageName) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java index 8953db53da62..4f76b84e777e 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java @@ -117,8 +117,7 @@ private Mono retrieveExtensionWithInstanceViewAsyn return computeManager .inner() .getVirtualMachineExtensions() - .getAsync(rgName, vmName, extension.name(), "instanceView") - .onErrorResume(e -> Mono.empty()); + .getAsync(rgName, vmName, extension.name(), "instanceView"); } /** @@ -133,12 +132,6 @@ private Mono retrieveEncryptExtensionWithInstanceV .inner() .getVirtualMachines() .getByResourceGroupAsync(rgName, vmName) - .onErrorResume( - e -> - Mono - .error( - new Exception( - String.format("VM with name '%s' not found (resource group '%s')", vmName, rgName)))) .flatMap( virtualMachine -> { if (virtualMachine.resources() != null) { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java index edd531cec7f7..f0d4832d5dbb 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java @@ -128,13 +128,7 @@ private Mono retrieveVirtualMachineAsync() { return computeManager .inner() .getVirtualMachines() - .getByResourceGroupAsync(rgName, vmName) - .onErrorResume( - e -> - Mono - .error( - new Exception( - String.format("VM with name '%s' not found (resource group '%s')", vmName, rgName)))); + .getByResourceGroupAsync(rgName, vmName); } private boolean hasEncryptionExtensionInstanceView() { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java index c47503bbdbcd..9428e01690e3 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java @@ -113,8 +113,7 @@ private Mono retrieveVirtualMachineAsync() { return computeManager .inner() .getVirtualMachines() - .getByResourceGroupAsync(ResourceUtils.groupFromResourceId(vmId), ResourceUtils.nameFromResourceId(vmId)) - .onErrorResume(e -> Mono.error(new Exception(String.format("VM with id '%s' not found.", vmId)))); + .getByResourceGroupAsync(ResourceUtils.groupFromResourceId(vmId), ResourceUtils.nameFromResourceId(vmId)); } /** diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotImpl.java index 71bd42f54de8..69f114fa68a4 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotImpl.java @@ -93,7 +93,6 @@ public Mono grantAccessAsync(int accessDurationInSeconds) { .inner() .getSnapshots() .grantAccessAsync(resourceGroupName(), name(), grantAccessDataInner) - .onErrorResume(e -> Mono.empty()) .map(accessUriInner -> accessUriInner.accessSas()); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotsImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotsImpl.java index 55fdeb60df33..1f15fcb331bf 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotsImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/SnapshotsImpl.java @@ -29,7 +29,6 @@ public Mono grantAccessAsync( grantAccessDataInner.withAccess(accessLevel).withDurationInSeconds(accessDuration); return inner() .grantAccessAsync(resourceGroupName, snapshotName, grantAccessDataInner) - .onErrorResume(e -> Mono.empty()) .map(accessUriInner -> accessUriInner.accessSas()); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImageVersionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImageVersionImpl.java index 3017cbcbf3ee..ff5a66fe34de 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImageVersionImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImageVersionImpl.java @@ -60,7 +60,6 @@ public Mono getImageAsync() { final VirtualMachineExtensionImageVersionImpl self = this; return client .getAsync(regionName(), type().publisher().name(), type().name(), name()) - .onErrorResume(e -> Mono.empty()) .map(inner -> new VirtualMachineExtensionImageImpl(self, inner)); } } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java index 455645b2f275..20c0e91c99b5 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java @@ -10,7 +10,6 @@ import com.azure.resourcemanager.compute.models.VirtualMachinePublishers; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter; -import reactor.core.publisher.Mono; /** The implementation for {@link VirtualMachineExtensionImages}. */ public class VirtualMachineExtensionImagesImpl implements VirtualMachineExtensionImages { @@ -44,7 +43,6 @@ public PagedFlux listByRegionAsync(String regionNa virtualMachinePublisher .extensionTypes() .listAsync() - .onErrorResume(e -> Mono.empty()) .flatMap( virtualMachineExtensionImageType -> virtualMachineExtensionImageType.versions().listAsync()) .flatMap(VirtualMachineExtensionImageVersion::getImageAsync)); diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java index 039b8d9cb224..a2b170625b66 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImpl.java @@ -92,7 +92,6 @@ public Mono getInstanceViewAsync() { return this .client .getAsync(this.parent().resourceGroupName(), this.parent().name(), this.name(), "instanceView") - .onErrorResume(e -> Mono.empty()) .map(inner -> inner.instanceView()); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java index b2529d1d4b7f..f3186bc48af7 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java @@ -13,7 +13,6 @@ import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter; import java.util.List; -import reactor.core.publisher.Mono; /** The implementation for {@link VirtualMachineImages}. */ public class VirtualMachineImagesImpl implements VirtualMachineImages { @@ -85,7 +84,6 @@ public PagedFlux listByRegionAsync(String regionName) { virtualMachinePublisher .offers() .listAsync() - .onErrorResume(e -> Mono.empty()) .flatMap(virtualMachineOffer -> virtualMachineOffer.skus().listAsync()) .flatMap(virtualMachineSku -> virtualMachineSku.images().listAsync())); } diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java index b9c284ea3fd2..24e6e515e6ba 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java @@ -152,13 +152,7 @@ private Mono retrieveVirtualMachineAsync() { .computeManager .inner() .getVirtualMachines() - .getByResourceGroupAsync(rgName, vmName) - .onErrorResume( - e -> - Mono - .error( - new Exception( - String.format("VM with name '%s' not found (resource group '%s')", vmName, rgName)))); + .getByResourceGroupAsync(rgName, vmName); } private boolean hasEncryptionDetails() { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java index 35e00710e92a..c2367577d368 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java @@ -155,13 +155,7 @@ private Mono retrieveVirtualMachineAsync() { .computeManager .inner() .getVirtualMachines() - .getByResourceGroupAsync(rgName, vmName) - .onErrorResume( - e -> - Mono - .error( - new Exception( - String.format("VM with name '%s' not found (resource group '%s')", vmName, rgName)))); + .getByResourceGroupAsync(rgName, vmName); } /** diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/ARecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/ARecordSetsImpl.java index 9efe4d3e109b..4049e448105a 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/ARecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/ARecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/AaaaRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/AaaaRecordSetsImpl.java index 0cb248777267..13de8476a6d6 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/AaaaRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/AaaaRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CNameRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CNameRecordSetsImpl.java index f03e366188f3..8904b8ed5e6e 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CNameRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CNameRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CaaRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CaaRecordSetsImpl.java index c6157540e12e..723c7a699d79 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CaaRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/CaaRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/MXRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/MXRecordSetsImpl.java index 33ac1dfac9ed..f3b00f1a3f77 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/MXRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/MXRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/NSRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/NSRecordSetsImpl.java index 8aa272302e19..f1dd2356eabc 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/NSRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/NSRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/PtrRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/PtrRecordSetsImpl.java index 730ae1438ddc..118e6118a432 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/PtrRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/PtrRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/SrvRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/SrvRecordSetsImpl.java index 7a7eb3a0629b..02fc4275e5c8 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/SrvRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/SrvRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/TxtRecordSetsImpl.java b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/TxtRecordSetsImpl.java index 70399b7f4949..8ea6f6e87d05 100644 --- a/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/TxtRecordSetsImpl.java +++ b/sdk/dns/mgmt/src/main/java/com/azure/resourcemanager/dns/implementation/TxtRecordSetsImpl.java @@ -30,7 +30,6 @@ public Mono getByNameAsync(String name) { .inner() .getRecordSets() .getAsync(this.dnsZone.resourceGroupName(), this.dnsZone.name(), name, this.recordType) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyAssignmentsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyAssignmentsImpl.java index fe9c883d1958..2cf01f800fc8 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyAssignmentsImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyAssignmentsImpl.java @@ -80,7 +80,6 @@ public PolicyAssignment getById(String id) { @Override public Mono getByIdAsync(String id) { return client.getByIdAsync(id) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyDefinitionsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyDefinitionsImpl.java index 3b63e50176eb..b0504c94105c 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyDefinitionsImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/PolicyDefinitionsImpl.java @@ -44,7 +44,6 @@ public PolicyDefinition getByName(String name) { @Override public Mono getByNameAsync(String name) { return client.getAsync(name) - .onErrorResume(e -> Mono.empty()) .map(this::wrapModel); } From 13ba3c54d4dc35d02c82d265f12b9731a3c99080 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 16 Jul 2020 14:37:15 +0800 Subject: [PATCH 2/6] add comment to mark the location --- .../LinuxDiskVolumeLegacyEncryptionMonitorImpl.java | 1 + .../LinuxDiskVolumeNoAADEncryptionMonitorImpl.java | 1 + .../compute/implementation/ProxyEncryptionMonitorImpl.java | 1 + .../implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java | 1 + .../implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java | 1 + 5 files changed, 5 insertions(+) diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java index 4f76b84e777e..9e0ea3349cac 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeLegacyEncryptionMonitorImpl.java @@ -132,6 +132,7 @@ private Mono retrieveEncryptExtensionWithInstanceV .inner() .getVirtualMachines() .getByResourceGroupAsync(rgName, vmName) + // Exception if vm not found .flatMap( virtualMachine -> { if (virtualMachine.resources() != null) { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java index f0d4832d5dbb..2d0f60d33631 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/LinuxDiskVolumeNoAADEncryptionMonitorImpl.java @@ -129,6 +129,7 @@ private Mono retrieveVirtualMachineAsync() { .inner() .getVirtualMachines() .getByResourceGroupAsync(rgName, vmName); + // Exception if vm not found } private boolean hasEncryptionExtensionInstanceView() { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java index 9428e01690e3..0f7d30dd07c6 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/ProxyEncryptionMonitorImpl.java @@ -114,6 +114,7 @@ private Mono retrieveVirtualMachineAsync() { .inner() .getVirtualMachines() .getByResourceGroupAsync(ResourceUtils.groupFromResourceId(vmId), ResourceUtils.nameFromResourceId(vmId)); + // Exception if vm not found } /** diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java index 24e6e515e6ba..f8e78ecbafa8 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeLegacyEncryptionMonitorImpl.java @@ -153,6 +153,7 @@ private Mono retrieveVirtualMachineAsync() { .inner() .getVirtualMachines() .getByResourceGroupAsync(rgName, vmName); + // Exception if vm not found } private boolean hasEncryptionDetails() { diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java index c2367577d368..a00c24daaa3a 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/WindowsVolumeNoAADEncryptionMonitorImpl.java @@ -156,6 +156,7 @@ private Mono retrieveVirtualMachineAsync() { .inner() .getVirtualMachines() .getByResourceGroupAsync(rgName, vmName); + // Exception if vm not found } /** From 9f3981cfdae8dede72ee3d997392746bc3349e3d Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 16 Jul 2020 14:49:28 +0800 Subject: [PATCH 3/6] revert --- .../implementation/ActiveDirectoryApplicationsImpl.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java index 3c8446d75743..65bbac0e1e59 100644 --- a/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java +++ b/sdk/authorization/mgmt/src/main/java/com/azure/resourcemanager/authorization/implementation/ActiveDirectoryApplicationsImpl.java @@ -91,8 +91,12 @@ public Mono getByNameAsync(String name) { Mono .defer( () -> { - UUID.fromString(trimmed); - return inner().listAsync(String.format("appId eq '%s'", trimmed)).singleOrEmpty(); + try { + UUID.fromString(trimmed); + return inner().listAsync(String.format("appId eq '%s'", trimmed)).singleOrEmpty(); + } catch (IllegalArgumentException e) { + return Mono.empty(); + } })) .map(applicationInner -> new ActiveDirectoryApplicationImpl(applicationInner, manager())) .flatMap(activeDirectoryApplication -> activeDirectoryApplication.refreshCredentialsAsync()); From 139ae18cfde5e5253d417105edc73b7a1e40c4d3 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 16 Jul 2020 17:15:54 +0800 Subject: [PATCH 4/6] protection for 404 --- .../VirtualMachineExtensionImagesImpl.java | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java index 20c0e91c99b5..060aaef233a0 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java @@ -4,12 +4,15 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImage; -import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageVersion; +import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageType; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImages; import com.azure.resourcemanager.compute.models.VirtualMachinePublishers; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter; +import reactor.core.publisher.Flux; +import reactor.core.publisher.Mono; /** The implementation for {@link VirtualMachineExtensionImages}. */ public class VirtualMachineExtensionImagesImpl implements VirtualMachineExtensionImages { @@ -43,9 +46,31 @@ public PagedFlux listByRegionAsync(String regionNa virtualMachinePublisher .extensionTypes() .listAsync() - .flatMap( - virtualMachineExtensionImageType -> virtualMachineExtensionImageType.versions().listAsync()) - .flatMap(VirtualMachineExtensionImageVersion::getImageAsync)); + .onErrorResume(ManagementException.class, e -> { + if (e.getResponse().getStatusCode() == 404) { + return Flux.empty(); + } else { + return Flux.error(e); + } + }) + .flatMap(virtualMachineExtensionImageType -> + virtualMachineExtensionImageType.versions().listAsync() + .onErrorResume(ManagementException.class, e -> { + if (e.getResponse().getStatusCode() == 404) { + return Flux.empty(); + } else { + return Flux.error(e); + } + })) + .flatMap(virtualMachineExtensionImageVersion -> + virtualMachineExtensionImageVersion.getImageAsync() + .onErrorResume(ManagementException.class, e -> { + if (e.getResponse().getStatusCode() == 404) { + return Mono.empty(); + } else { + return Mono.error(e); + } + }))); } @Override From 9ba48650009632d33039f9641d39ae23719e50b6 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 16 Jul 2020 17:20:22 +0800 Subject: [PATCH 5/6] nit --- .../VirtualMachineExtensionImagesImpl.java | 28 ++++--------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java index 060aaef233a0..9fb9f9bdfbef 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java @@ -6,7 +6,6 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImage; -import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageType; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImages; import com.azure.resourcemanager.compute.models.VirtualMachinePublishers; import com.azure.resourcemanager.resources.fluentcore.arm.Region; @@ -46,31 +45,16 @@ public PagedFlux listByRegionAsync(String regionNa virtualMachinePublisher .extensionTypes() .listAsync() - .onErrorResume(ManagementException.class, e -> { - if (e.getResponse().getStatusCode() == 404) { - return Flux.empty(); - } else { - return Flux.error(e); - } - }) + .onErrorResume(ManagementException.class, + e -> e.getResponse().getStatusCode() == 404 ? Flux.empty() : Flux.error(e)) .flatMap(virtualMachineExtensionImageType -> virtualMachineExtensionImageType.versions().listAsync() - .onErrorResume(ManagementException.class, e -> { - if (e.getResponse().getStatusCode() == 404) { - return Flux.empty(); - } else { - return Flux.error(e); - } - })) + .onErrorResume(ManagementException.class, + e -> e.getResponse().getStatusCode() == 404 ? Flux.empty() : Flux.error(e))) .flatMap(virtualMachineExtensionImageVersion -> virtualMachineExtensionImageVersion.getImageAsync() - .onErrorResume(ManagementException.class, e -> { - if (e.getResponse().getStatusCode() == 404) { - return Mono.empty(); - } else { - return Mono.error(e); - } - }))); + .onErrorResume(ManagementException.class, + e -> e.getResponse().getStatusCode() == 404 ? Mono.empty() : Mono.error(e)))); } @Override From 6a0d0c751b32aa2d6e3503213e3b072916a49226 Mon Sep 17 00:00:00 2001 From: Weidong Xu Date: Thu, 16 Jul 2020 17:57:51 +0800 Subject: [PATCH 6/6] ignore 404 in nested list --- .../VirtualMachineExtensionImagesImpl.java | 11 +++-------- .../implementation/VirtualMachineImagesImpl.java | 5 +++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java index 9fb9f9bdfbef..3facbf7e77ec 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineExtensionImagesImpl.java @@ -6,12 +6,12 @@ import com.azure.core.http.rest.PagedIterable; import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImage; +import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImageVersion; import com.azure.resourcemanager.compute.models.VirtualMachineExtensionImages; import com.azure.resourcemanager.compute.models.VirtualMachinePublishers; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter; import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; /** The implementation for {@link VirtualMachineExtensionImages}. */ public class VirtualMachineExtensionImagesImpl implements VirtualMachineExtensionImages { @@ -48,13 +48,8 @@ public PagedFlux listByRegionAsync(String regionNa .onErrorResume(ManagementException.class, e -> e.getResponse().getStatusCode() == 404 ? Flux.empty() : Flux.error(e)) .flatMap(virtualMachineExtensionImageType -> - virtualMachineExtensionImageType.versions().listAsync() - .onErrorResume(ManagementException.class, - e -> e.getResponse().getStatusCode() == 404 ? Flux.empty() : Flux.error(e))) - .flatMap(virtualMachineExtensionImageVersion -> - virtualMachineExtensionImageVersion.getImageAsync() - .onErrorResume(ManagementException.class, - e -> e.getResponse().getStatusCode() == 404 ? Mono.empty() : Mono.error(e)))); + virtualMachineExtensionImageType.versions().listAsync()) + .flatMap(VirtualMachineExtensionImageVersion::getImageAsync)); } @Override diff --git a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java index f3186bc48af7..0fc380749ed3 100644 --- a/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java +++ b/sdk/compute/mgmt/src/main/java/com/azure/resourcemanager/compute/implementation/VirtualMachineImagesImpl.java @@ -4,6 +4,7 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; +import com.azure.core.management.exception.ManagementException; import com.azure.resourcemanager.compute.models.VirtualMachineImage; import com.azure.resourcemanager.compute.models.VirtualMachineImages; import com.azure.resourcemanager.compute.models.VirtualMachinePublishers; @@ -12,6 +13,8 @@ import com.azure.resourcemanager.compute.fluent.VirtualMachineImagesClient; import com.azure.resourcemanager.resources.fluentcore.arm.Region; import com.azure.resourcemanager.resources.fluentcore.utils.PagedConverter; +import reactor.core.publisher.Flux; + import java.util.List; /** The implementation for {@link VirtualMachineImages}. */ @@ -84,6 +87,8 @@ public PagedFlux listByRegionAsync(String regionName) { virtualMachinePublisher .offers() .listAsync() + .onErrorResume(ManagementException.class, + e -> e.getResponse().getStatusCode() == 404 ? Flux.empty() : Flux.error(e)) .flatMap(virtualMachineOffer -> virtualMachineOffer.skus().listAsync()) .flatMap(virtualMachineSku -> virtualMachineSku.images().listAsync())); }