diff --git a/sdk/containerregistry/mgmt/pom.xml b/sdk/containerregistry/mgmt/pom.xml index 596f76b8d0bf..e3bd0e19c397 100644 --- a/sdk/containerregistry/mgmt/pom.xml +++ b/sdk/containerregistry/mgmt/pom.xml @@ -80,7 +80,7 @@ - azure-resourcemanager-sdk-test-jar + azure-mgmt-sdk-test-jar !maven.test.skip diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java index a105bf90726b..d0954d9a3704 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/ResourceManager.java @@ -238,7 +238,7 @@ private ResourceManager(HttpPipeline httpPipeline, AzureProfile profile, SdkCont */ public ResourceGroups resourceGroups() { if (resourceGroups == null) { - resourceGroups = new ResourceGroupsImpl(resourceManagementClient); + resourceGroups = new ResourceGroupsImpl(this); } return resourceGroups; } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceGroupsImpl.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceGroupsImpl.java index 8647da6f1878..de466d831c5e 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceGroupsImpl.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/implementation/ResourceGroupsImpl.java @@ -5,14 +5,13 @@ import com.azure.core.http.rest.PagedFlux; import com.azure.core.http.rest.PagedIterable; +import com.azure.resourcemanager.resources.ResourceManager; import com.azure.resourcemanager.resources.models.ResourceGroup; import com.azure.resourcemanager.resources.models.ResourceGroups; import com.azure.resourcemanager.resources.fluentcore.arm.ResourceUtils; import com.azure.resourcemanager.resources.fluentcore.arm.collection.implementation.CreatableResourcesImpl; import com.azure.resourcemanager.resources.fluentcore.utils.Utils; import com.azure.resourcemanager.resources.fluent.inner.ResourceGroupInner; -import com.azure.resourcemanager.resources.fluent.ResourceGroupsClient; -import com.azure.resourcemanager.resources.ResourceManagementClient; import reactor.core.publisher.Mono; /** @@ -21,42 +20,38 @@ public final class ResourceGroupsImpl extends CreatableResourcesImpl implements ResourceGroups { - private final ResourceGroupsClient client; - private final ResourceManagementClient serviceClient; - /** - * Creates an instance of the implementation. - * - * @param serviceClient the inner resource management client - */ - public ResourceGroupsImpl(final ResourceManagementClient serviceClient) { - this.serviceClient = serviceClient; - this.client = serviceClient.getResourceGroups(); + private final ResourceManager resourceManager; + + public ResourceGroupsImpl(final ResourceManager resourceManager) { + this.resourceManager = resourceManager; } @Override public PagedIterable list() { - return wrapList(client.list()); + return wrapList(manager().inner().getResourceGroups().list()); } @Override public PagedIterable listByTag(String tagName, String tagValue) { - return wrapList(client.list(Utils.createOdataFilterForTags(tagName, tagValue), null)); + return wrapList(manager().inner().getResourceGroups() + .list(Utils.createOdataFilterForTags(tagName, tagValue), null)); } @Override public PagedFlux listByTagAsync(String tagName, String tagValue) { - return wrapPageAsync(client.listAsync(Utils.createOdataFilterForTags(tagName, tagValue), null)); + return wrapPageAsync(manager().inner().getResourceGroups() + .listAsync(Utils.createOdataFilterForTags(tagName, tagValue), null)); } @Override public ResourceGroupImpl getByName(String name) { - return wrapModel(client.get(name)); + return wrapModel(manager().inner().getResourceGroups().get(name)); } @Override public Mono getByNameAsync(String name) { - return client.getAsync(name).map(inner -> wrapModel(inner)); + return manager().inner().getResourceGroups().getAsync(name).map(this::wrapModel); } @Override @@ -67,7 +62,7 @@ public void deleteByName(String name) { @Override public Mono deleteByNameAsync(String name) { - return client.deleteAsync(name); + return manager().inner().getResourceGroups().deleteAsync(name); } @Override @@ -77,12 +72,12 @@ public ResourceGroupImpl define(String name) { @Override public boolean contain(String name) { - return client.checkExistence(name); + return manager().inner().getResourceGroups().checkExistence(name); } @Override protected ResourceGroupImpl wrapModel(String name) { - return new ResourceGroupImpl(new ResourceGroupInner(), name, serviceClient); + return new ResourceGroupImpl(new ResourceGroupInner(), name, manager().inner()); } @Override @@ -90,7 +85,7 @@ protected ResourceGroupImpl wrapModel(ResourceGroupInner inner) { if (inner == null) { return null; } - return new ResourceGroupImpl(inner, inner.name(), serviceClient); + return new ResourceGroupImpl(inner, inner.name(), manager().inner()); } @Override @@ -101,7 +96,7 @@ public void beginDeleteByName(String id) { @Override public Mono beginDeleteByNameAsync(String name) { // DELETE - return client.beginDeleteWithoutPollingAsync(name); + return manager().inner().getResourceGroups().beginDeleteWithoutPollingAsync(name); } @Override @@ -111,6 +106,11 @@ public Mono deleteByIdAsync(String id) { @Override public PagedFlux listAsync() { - return this.client.listAsync().mapPage(inner -> wrapModel(inner)); + return this.manager().inner().getResourceGroups().listAsync().mapPage(inner -> wrapModel(inner)); + } + + @Override + public ResourceManager manager() { + return resourceManager; } } diff --git a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/models/ResourceGroups.java b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/models/ResourceGroups.java index b455a181d0b8..a6054eec8cc7 100644 --- a/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/models/ResourceGroups.java +++ b/sdk/resources/mgmt/src/main/java/com/azure/resourcemanager/resources/models/ResourceGroups.java @@ -4,7 +4,9 @@ package com.azure.resourcemanager.resources.models; import com.azure.core.annotation.Fluent; +import com.azure.resourcemanager.resources.ResourceManager; import com.azure.resourcemanager.resources.fluentcore.arm.collection.SupportsGettingByName; +import com.azure.resourcemanager.resources.fluentcore.arm.models.HasManager; import com.azure.resourcemanager.resources.fluentcore.collection.SupportsBatchCreation; import com.azure.resourcemanager.resources.fluentcore.collection.SupportsBeginDeletingByName; import com.azure.resourcemanager.resources.fluentcore.collection.SupportsCreating; @@ -23,7 +25,8 @@ public interface ResourceGroups extends SupportsCreating, SupportsDeletingByName, SupportsBeginDeletingByName, - SupportsBatchCreation { + SupportsBatchCreation, + HasManager { /** * Checks whether resource group exists.