Skip to content

Commit 5cbcac2

Browse files
use SdkContext.getRxScheduler() for other forceDeletion APIs (#1431)
1 parent 8e2e050 commit 5cbcac2

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetVMsImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ public void deleteInstances(String... instanceIds) {
8282

8383
@Override
8484
public Completable deleteInstancesAsync(Collection<String> instanceIds, boolean forceDeletion) {
85-
return this.scaleSet.manager().virtualMachineScaleSets().deleteInstancesAsync(this.scaleSet.resourceGroupName(),
86-
this.scaleSet.name(), instanceIds, forceDeletion);
85+
return this.scaleSet.manager().virtualMachineScaleSets().deleteInstancesAsync(
86+
this.scaleSet.resourceGroupName(), this.scaleSet.name(), instanceIds, forceDeletion);
8787
}
8888

8989
@Override

azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineScaleSetsImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.microsoft.azure.management.network.implementation.NetworkManager;
2323
import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
2424
import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.TopLevelModifiableResourcesImpl;
25+
import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
2526
import com.microsoft.azure.management.storage.implementation.StorageManager;
2627
import com.microsoft.rest.ServiceCallback;
2728
import com.microsoft.rest.ServiceFuture;
@@ -192,7 +193,7 @@ public Completable deleteInstancesAsync(String groupName, String scaleSetName, C
192193
return Completable.complete();
193194
}
194195
return this.manager().inner().virtualMachineScaleSets().deleteInstancesAsync(groupName, scaleSetName,
195-
new ArrayList<>(instanceIds), forceDeletion).toCompletable();
196+
new ArrayList<>(instanceIds), forceDeletion).toCompletable().subscribeOn(SdkContext.getRxScheduler());
196197
}
197198

198199
@Override
@@ -290,6 +291,6 @@ public ServiceFuture<Void> deleteByResourceGroupAsync(String resourceGroupName,
290291

291292
@Override
292293
public Completable deleteByResourceGroupAsync(String resourceGroupName, String name, boolean forceDeletion) {
293-
return this.inner().deleteAsync(resourceGroupName, name, forceDeletion).toCompletable();
294+
return this.inner().deleteAsync(resourceGroupName, name, forceDeletion).toCompletable().subscribeOn(SdkContext.getRxScheduler());
294295
}
295296
}

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/GenericResourcesImpl.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
1717
import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.GroupableResourcesImpl;
1818
import com.microsoft.azure.management.resources.fluentcore.utils.PagedListConverter;
19+
import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
1920
import com.microsoft.azure.management.resources.fluentcore.utils.Utils;
2021
import com.microsoft.rest.ServiceCallback;
2122
import com.microsoft.rest.ServiceFuture;
@@ -251,7 +252,8 @@ public void delete(String resourceGroupName, String resourceProviderNamespace, S
251252

252253
@Override
253254
public Completable deleteAsync(String resourceGroupName, String resourceProviderNamespace, String parentResourcePath, String resourceType, String resourceName, String apiVersion, boolean forceDeletion) {
254-
return this.inner().deleteAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, apiVersion, forceDeletion).toCompletable();
255+
return this.inner().deleteAsync(resourceGroupName, resourceProviderNamespace, parentResourcePath, resourceType, resourceName, apiVersion, forceDeletion).toCompletable()
256+
.subscribeOn(SdkContext.getRxScheduler());
255257
}
256258

257259
@Override

azure-mgmt-resources/src/main/java/com/microsoft/azure/management/resources/implementation/ResourceGroupsImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.microsoft.azure.management.resources.ResourceGroups;
1414
import com.microsoft.azure.management.resources.fluentcore.arm.ResourceUtils;
1515
import com.microsoft.azure.management.resources.fluentcore.arm.collection.implementation.CreatableResourcesImpl;
16+
import com.microsoft.azure.management.resources.fluentcore.utils.SdkContext;
1617
import com.microsoft.azure.management.resources.fluentcore.utils.Utils;
1718
import com.microsoft.rest.ServiceFuture;
1819
import com.microsoft.rest.ServiceCallback;
@@ -102,7 +103,7 @@ public ServiceFuture<Void> deleteByNameAsync(String name, Collection<ForceDeleti
102103

103104
@Override
104105
public Completable deleteByNameAsync(String name, Collection<ForceDeletionResourceType> forceDeletionResourceTypes) {
105-
return client.deleteAsync(name, forceDeletionTypes(forceDeletionResourceTypes)).toCompletable();
106+
return client.deleteAsync(name, forceDeletionTypes(forceDeletionResourceTypes)).toCompletable().subscribeOn(SdkContext.getRxScheduler());
106107
}
107108

108109
private static String forceDeletionTypes(Collection<ForceDeletionResourceType> forceDeletionResourceTypes) {

0 commit comments

Comments
 (0)