From 1a1eba66b02aa42d5e5d4ac6cc158d8a87c64559 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2019 00:57:50 +0000 Subject: [PATCH] Generated from edd74f0a1be6f17caa185525a63e594aef956acc (#229) Addressed review comments. --- .../resource-manager/v2016_06_01/pom.xml | 16 +- .../resources/v2016_06_01/Location.java | 4 +- .../resources/v2016_06_01/Operation.java | 30 ++ .../v2016_06_01/OperationDisplay.java | 121 ++++++++ .../resources/v2016_06_01/Operations.java | 27 ++ .../resources/v2016_06_01/Subscription.java | 4 +- .../resources/v2016_06_01/Subscriptions.java | 14 +- .../v2016_06_01/TenantIdDescription.java | 4 +- .../implementation/LocationImpl.java | 6 +- .../implementation/OperationImpl.java | 37 +++ .../implementation/OperationInner.java | 70 +++++ .../implementation/OperationsImpl.java | 49 +++ .../implementation/OperationsInner.java | 283 ++++++++++++++++++ .../v2016_06_01/implementation/PageImpl.java | 2 +- .../v2016_06_01/implementation/PageImpl1.java | 2 +- .../implementation/ResourcesManager.java | 120 ++++++++ .../SubscriptionClientImpl.java | 34 ++- .../implementation/SubscriptionImpl.java | 6 +- .../implementation/SubscriptionsImpl.java | 28 +- .../implementation/SubscriptionsInner.java | 26 +- .../TenantIdDescriptionImpl.java | 6 +- .../implementation/TenantsImpl.java | 6 +- .../implementation/TenantsInner.java | 18 +- 23 files changed, 821 insertions(+), 92 deletions(-) create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operation.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/OperationDisplay.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operations.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationImpl.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationInner.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsImpl.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsInner.java create mode 100644 resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/ResourcesManager.java diff --git a/resources/resource-manager/v2016_06_01/pom.xml b/resources/resource-manager/v2016_06_01/pom.xml index f98dab9217b03..c2c6294885578 100644 --- a/resources/resource-manager/v2016_06_01/pom.xml +++ b/resources/resource-manager/v2016_06_01/pom.xml @@ -11,15 +11,15 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml - azure-mgmt-subscriptions + azure-mgmt-resources 1.0.0-beta jar - Microsoft Azure SDK for Management - This package contains Microsoft Management SDK. - https://github.com/Azure/azure-libraries-for-java + Microsoft Azure SDK for Resources Management + This package contains Microsoft Resources Management SDK. + https://github.com/Azure/azure-sdk-for-java The MIT License (MIT) @@ -28,8 +28,8 @@ - scm:git:https://github.com/Azure/azure-libraries-for-java - scm:git:git@github.com:Azure/azure-libraries-for-java.git + scm:git:https://github.com/Azure/azure-sdk-for-java + scm:git:git@github.com:Azure/azure-sdk-for-java.git HEAD diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Location.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Location.java index df4a8a443b547..00dedf79b0be0 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Location.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Location.java @@ -11,12 +11,12 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.management.resources.v2016_06_01.implementation.LocationInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.resources.v2016_06_01.implementation.Manager; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.ResourcesManager; /** * Type representing Location. */ -public interface Location extends HasInner, HasManager { +public interface Location extends HasInner, HasManager { /** * @return the displayName value. */ diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operation.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operation.java new file mode 100644 index 0000000000000..f2c7d03aa6f18 --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operation.java @@ -0,0 +1,30 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01; + +import com.microsoft.azure.arm.model.HasInner; +import com.microsoft.azure.arm.resources.models.HasManager; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.ResourcesManager; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.OperationInner; + +/** + * Type representing Operation. + */ +public interface Operation extends HasInner, HasManager { + /** + * @return the display value. + */ + OperationDisplay display(); + + /** + * @return the name value. + */ + String name(); + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/OperationDisplay.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/OperationDisplay.java new file mode 100644 index 0000000000000..bc8fe4a666864 --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/OperationDisplay.java @@ -0,0 +1,121 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The object that represents the operation. + */ +public class OperationDisplay { + /** + * Service provider: Microsoft.Resources. + */ + @JsonProperty(value = "provider") + private String provider; + + /** + * Resource on which the operation is performed: Profile, endpoint, etc. + */ + @JsonProperty(value = "resource") + private String resource; + + /** + * Operation type: Read, write, delete, etc. + */ + @JsonProperty(value = "operation") + private String operation; + + /** + * Description of the operation. + */ + @JsonProperty(value = "description") + private String description; + + /** + * Get service provider: Microsoft.Resources. + * + * @return the provider value + */ + public String provider() { + return this.provider; + } + + /** + * Set service provider: Microsoft.Resources. + * + * @param provider the provider value to set + * @return the OperationDisplay object itself. + */ + public OperationDisplay withProvider(String provider) { + this.provider = provider; + return this; + } + + /** + * Get resource on which the operation is performed: Profile, endpoint, etc. + * + * @return the resource value + */ + public String resource() { + return this.resource; + } + + /** + * Set resource on which the operation is performed: Profile, endpoint, etc. + * + * @param resource the resource value to set + * @return the OperationDisplay object itself. + */ + public OperationDisplay withResource(String resource) { + this.resource = resource; + return this; + } + + /** + * Get operation type: Read, write, delete, etc. + * + * @return the operation value + */ + public String operation() { + return this.operation; + } + + /** + * Set operation type: Read, write, delete, etc. + * + * @param operation the operation value to set + * @return the OperationDisplay object itself. + */ + public OperationDisplay withOperation(String operation) { + this.operation = operation; + return this; + } + + /** + * Get description of the operation. + * + * @return the description value + */ + public String description() { + return this.description; + } + + /** + * Set description of the operation. + * + * @param description the description value to set + * @return the OperationDisplay object itself. + */ + public OperationDisplay withDescription(String description) { + this.description = description; + return this; + } + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operations.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operations.java new file mode 100644 index 0000000000000..1ad07783bc392 --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Operations.java @@ -0,0 +1,27 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01; + +import rx.Observable; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.OperationsInner; +import com.microsoft.azure.arm.model.HasInner; + +/** + * Type representing Operations. + */ +public interface Operations extends HasInner { + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable for the request + */ + Observable listAsync(); + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscription.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscription.java index c970233ba78ec..bb67055ccf7b0 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscription.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscription.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.resources.v2016_06_01.implementation.Manager; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.ResourcesManager; import com.microsoft.azure.management.resources.v2016_06_01.implementation.SubscriptionInner; /** * Type representing Subscription. */ -public interface Subscription extends HasInner, HasManager { +public interface Subscription extends HasInner, HasManager { /** * @return the authorizationSource value. */ diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscriptions.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscriptions.java index f3b1f4685190e..6f1480cbdde73 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscriptions.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/Subscriptions.java @@ -8,10 +8,10 @@ package com.microsoft.azure.management.resources.v2016_06_01; -import com.microsoft.azure.PagedList; -import com.microsoft.azure.arm.model.HasInner; -import com.microsoft.azure.management.resources.v2016_06_01.implementation.SubscriptionsInner; import rx.Observable; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.SubscriptionsInner; +import com.microsoft.azure.arm.model.HasInner; +import com.microsoft.azure.management.resources.v2016_06_01.Location; /** * Type representing Subscriptions. @@ -26,14 +26,6 @@ public interface Subscriptions extends HasInner { */ Observable getAsync(String subscriptionId); - /** - * Gets all subscriptions for a tenant. - * - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable for the request - */ - PagedList list(); - /** * Gets all subscriptions for a tenant. * diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/TenantIdDescription.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/TenantIdDescription.java index e4892daf5c036..b6cfdcae56121 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/TenantIdDescription.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/TenantIdDescription.java @@ -10,13 +10,13 @@ import com.microsoft.azure.arm.model.HasInner; import com.microsoft.azure.arm.resources.models.HasManager; -import com.microsoft.azure.management.resources.v2016_06_01.implementation.Manager; +import com.microsoft.azure.management.resources.v2016_06_01.implementation.ResourcesManager; import com.microsoft.azure.management.resources.v2016_06_01.implementation.TenantIdDescriptionInner; /** * Type representing TenantIdDescription. */ -public interface TenantIdDescription extends HasInner, HasManager { +public interface TenantIdDescription extends HasInner, HasManager { /** * @return the id value. */ diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/LocationImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/LocationImpl.java index d8417d855de7a..b4dc5cf0ae0ba 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/LocationImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/LocationImpl.java @@ -13,15 +13,15 @@ import rx.Observable; class LocationImpl extends WrapperImpl implements Location { - private final Manager manager; + private final ResourcesManager manager; - LocationImpl(LocationInner inner, Manager manager) { + LocationImpl(LocationInner inner, ResourcesManager manager) { super(inner); this.manager = manager; } @Override - public Manager manager() { + public ResourcesManager manager() { return this.manager; } diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationImpl.java new file mode 100644 index 0000000000000..b0fb2fec8d2cd --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationImpl.java @@ -0,0 +1,37 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01.implementation; + +import com.microsoft.azure.management.resources.v2016_06_01.Operation; +import com.microsoft.azure.arm.model.implementation.WrapperImpl; +import com.microsoft.azure.management.resources.v2016_06_01.OperationDisplay; + +class OperationImpl extends WrapperImpl implements Operation { + private final ResourcesManager manager; + OperationImpl(OperationInner inner, ResourcesManager manager) { + super(inner); + this.manager = manager; + } + + @Override + public ResourcesManager manager() { + return this.manager; + } + + @Override + public OperationDisplay display() { + return this.inner().display(); + } + + @Override + public String name() { + return this.inner().name(); + } + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationInner.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationInner.java new file mode 100644 index 0000000000000..08a6947d99e9e --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationInner.java @@ -0,0 +1,70 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01.implementation; + +import com.microsoft.azure.management.resources.v2016_06_01.OperationDisplay; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Microsoft.Resources operation. + */ +public class OperationInner { + /** + * Operation name: {provider}/{resource}/{operation}. + */ + @JsonProperty(value = "name") + private String name; + + /** + * The object that represents the operation. + */ + @JsonProperty(value = "display") + private OperationDisplay display; + + /** + * Get operation name: {provider}/{resource}/{operation}. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set operation name: {provider}/{resource}/{operation}. + * + * @param name the name value to set + * @return the OperationInner object itself. + */ + public OperationInner withName(String name) { + this.name = name; + return this; + } + + /** + * Get the object that represents the operation. + * + * @return the display value + */ + public OperationDisplay display() { + return this.display; + } + + /** + * Set the object that represents the operation. + * + * @param display the display value to set + * @return the OperationInner object itself. + */ + public OperationInner withDisplay(OperationDisplay display) { + this.display = display; + return this; + } + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsImpl.java new file mode 100644 index 0000000000000..c7a1e8589d41c --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsImpl.java @@ -0,0 +1,49 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * abc + */ + +package com.microsoft.azure.management.resources.v2016_06_01.implementation; + +import com.microsoft.azure.arm.model.implementation.WrapperImpl; +import com.microsoft.azure.management.resources.v2016_06_01.Operations; +import rx.functions.Func1; +import rx.Observable; +import com.microsoft.azure.Page; +import com.microsoft.azure.management.resources.v2016_06_01.Operation; + +class OperationsImpl extends WrapperImpl implements Operations { + private final ResourcesManager manager; + + OperationsImpl(ResourcesManager manager) { + super(manager.inner().operations()); + this.manager = manager; + } + + public ResourcesManager manager() { + return this.manager; + } + + @Override + public Observable listAsync() { + OperationsInner client = this.inner(); + return client.listAsync() + .flatMapIterable(new Func1, Iterable>() { + @Override + public Iterable call(Page page) { + return page.items(); + } + }) + .map(new Func1() { + @Override + public Operation call(OperationInner inner) { + return new OperationImpl(inner, manager()); + } + }); + } + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsInner.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsInner.java new file mode 100644 index 0000000000000..fcee524bcb21d --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/OperationsInner.java @@ -0,0 +1,283 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01.implementation; + +import retrofit2.Retrofit; +import com.google.common.reflect.TypeToken; +import com.microsoft.azure.AzureServiceFuture; +import com.microsoft.azure.CloudException; +import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.Page; +import com.microsoft.azure.PagedList; +import com.microsoft.rest.ServiceFuture; +import com.microsoft.rest.ServiceResponse; +import java.io.IOException; +import java.util.List; +import okhttp3.ResponseBody; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.Query; +import retrofit2.http.Url; +import retrofit2.Response; +import rx.functions.Func1; +import rx.Observable; + +/** + * An instance of this class provides access to all the operations defined + * in Operations. + */ +public class OperationsInner { + /** The Retrofit service to perform REST calls. */ + private OperationsService service; + /** The service client containing this operation class. */ + private SubscriptionClientImpl client; + + /** + * Initializes an instance of OperationsInner. + * + * @param retrofit the Retrofit instance built from a Retrofit Builder. + * @param client the instance of the service client containing this operation class. + */ + public OperationsInner(Retrofit retrofit, SubscriptionClientImpl client) { + this.service = retrofit.create(OperationsService.class); + this.client = client; + } + + /** + * The interface defining all the services for Operations to be + * used by Retrofit to perform actually REST calls. + */ + interface OperationsService { + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.resources.v2016_06_01.Operations list" }) + @GET("providers/Microsoft.Resources/operations") + Observable> list(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.resources.v2016_06_01.Operations listNext" }) + @GET + Observable> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the PagedList<OperationInner> object if successful. + */ + public PagedList list() { + ServiceResponse> response = listSinglePageAsync().toBlocking().single(); + return new PagedList(response.body()) { + @Override + public Page nextPage(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink).toBlocking().single().body(); + } + }; + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture> listAsync(final ListOperationCallback serviceCallback) { + return AzureServiceFuture.fromPageResponse( + listSinglePageAsync(), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the PagedList<OperationInner> object + */ + public Observable> listAsync() { + return listWithServiceResponseAsync() + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.body(); + } + }); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the PagedList<OperationInner> object + */ + public Observable>> listWithServiceResponseAsync() { + return listSinglePageAsync() + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.body().nextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the PagedList<OperationInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listSinglePageAsync() { + if (this.client.apiVersion() == null) { + throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); + } + return service.list(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listDelegate(response); + return Observable.just(new ServiceResponse>(result.body(), result.response())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the PagedList<OperationInner> object if successful. + */ + public PagedList listNext(final String nextPageLink) { + ServiceResponse> response = listNextSinglePageAsync(nextPageLink).toBlocking().single(); + return new PagedList(response.body()) { + @Override + public Page nextPage(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink).toBlocking().single().body(); + } + }; + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param serviceFuture the ServiceFuture object tracking the Retrofit calls + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture> listNextAsync(final String nextPageLink, final ServiceFuture> serviceFuture, final ListOperationCallback serviceCallback) { + return AzureServiceFuture.fromPageResponse( + listNextSinglePageAsync(nextPageLink), + new Func1>>>() { + @Override + public Observable>> call(String nextPageLink) { + return listNextSinglePageAsync(nextPageLink); + } + }, + serviceCallback); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the PagedList<OperationInner> object + */ + public Observable> listNextAsync(final String nextPageLink) { + return listNextWithServiceResponseAsync(nextPageLink) + .map(new Func1>, Page>() { + @Override + public Page call(ServiceResponse> response) { + return response.body(); + } + }); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the PagedList<OperationInner> object + */ + public Observable>> listNextWithServiceResponseAsync(final String nextPageLink) { + return listNextSinglePageAsync(nextPageLink) + .concatMap(new Func1>, Observable>>>() { + @Override + public Observable>> call(ServiceResponse> page) { + String nextPageLink = page.body().nextPageLink(); + if (nextPageLink == null) { + return Observable.just(page); + } + return Observable.just(page).concatWith(listNextWithServiceResponseAsync(nextPageLink)); + } + }); + } + + /** + * Lists all of the available Microsoft.Resources REST API operations. + * + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the PagedList<OperationInner> object wrapped in {@link ServiceResponse} if successful. + */ + public Observable>> listNextSinglePageAsync(final String nextPageLink) { + if (nextPageLink == null) { + throw new IllegalArgumentException("Parameter nextPageLink is required and cannot be null."); + } + String nextUrl = String.format("%s", nextPageLink); + return service.listNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listNextDelegate(response); + return Observable.just(new ServiceResponse>(result.body(), result.response())); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl.java index f7c2708ca2c0e..a3cf958c7fb13 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl.java @@ -22,7 +22,7 @@ public class PageImpl implements Page { /** * The link to the next page. */ - @JsonProperty("") + @JsonProperty("nextLink") private String nextPageLink; /** diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl1.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl1.java index 5b3a6612486f1..b4dccf8d3ced8 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl1.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/PageImpl1.java @@ -22,7 +22,7 @@ public class PageImpl1 implements Page { /** * The link to the next page. */ - @JsonProperty("nextLink") + @JsonProperty("") private String nextPageLink; /** diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/ResourcesManager.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/ResourcesManager.java new file mode 100644 index 0000000000000..271c128902d23 --- /dev/null +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/ResourcesManager.java @@ -0,0 +1,120 @@ +/** + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + */ + +package com.microsoft.azure.management.resources.v2016_06_01.implementation; + +import com.microsoft.azure.AzureEnvironment; +import com.microsoft.azure.AzureResponseBuilder; +import com.microsoft.azure.credentials.AzureTokenCredentials; +import com.microsoft.azure.management.apigeneration.Beta; +import com.microsoft.azure.management.apigeneration.Beta.SinceVersion; +import com.microsoft.azure.arm.resources.AzureConfigurable; +import com.microsoft.azure.serializer.AzureJacksonAdapter; +import com.microsoft.rest.RestClient; +import com.microsoft.azure.management.resources.v2016_06_01.Operations; +import com.microsoft.azure.management.resources.v2016_06_01.Subscriptions; +import com.microsoft.azure.management.resources.v2016_06_01.Tenants; +import com.microsoft.azure.arm.resources.implementation.AzureConfigurableCoreImpl; +import com.microsoft.azure.arm.resources.implementation.ManagerCore; + +/** + * Entry point to Azure Resources resource management. + */ +public final class ResourcesManager extends ManagerCore { + private Operations operations; + private Subscriptions subscriptions; + private Tenants tenants; + /** + * Get a Configurable instance that can be used to create ResourcesManager with optional configuration. + * + * @return the instance allowing configurations + */ + public static Configurable configure() { + return new ResourcesManager.ConfigurableImpl(); + } + /** + * Creates an instance of ResourcesManager that exposes Resources resource management API entry points. + * + * @param credentials the credentials to use + * @return the ResourcesManager + */ + public static ResourcesManager authenticate(AzureTokenCredentials credentials) { + return new ResourcesManager(new RestClient.Builder() + .withBaseUrl(credentials.environment(), AzureEnvironment.Endpoint.RESOURCE_MANAGER) + .withCredentials(credentials) + .withSerializerAdapter(new AzureJacksonAdapter()) + .withResponseBuilderFactory(new AzureResponseBuilder.Factory()) + .build()); + } + /** + * Creates an instance of ResourcesManager that exposes Resources resource management API entry points. + * + * @param restClient the RestClient to be used for API calls. + * @return the ResourcesManager + */ + public static ResourcesManager authenticate(RestClient restClient) { + return new ResourcesManager(restClient); + } + /** + * The interface allowing configurations to be set. + */ + public interface Configurable extends AzureConfigurable { + /** + * Creates an instance of ResourcesManager that exposes Resources management API entry points. + * + * @param credentials the credentials to use + * @return the interface exposing Resources management API entry points that work across subscriptions + */ + ResourcesManager authenticate(AzureTokenCredentials credentials); + } + + /** + * @return Entry point to manage Operations. + */ + public Operations operations() { + if (this.operations == null) { + this.operations = new OperationsImpl(this); + } + return this.operations; + } + + /** + * @return Entry point to manage Subscriptions. + */ + public Subscriptions subscriptions() { + if (this.subscriptions == null) { + this.subscriptions = new SubscriptionsImpl(this); + } + return this.subscriptions; + } + + /** + * @return Entry point to manage Tenants. + */ + public Tenants tenants() { + if (this.tenants == null) { + this.tenants = new TenantsImpl(this); + } + return this.tenants; + } + + /** + * The implementation for Configurable interface. + */ + private static final class ConfigurableImpl extends AzureConfigurableCoreImpl implements Configurable { + public ResourcesManager authenticate(AzureTokenCredentials credentials) { + return ResourcesManager.authenticate(buildRestClient(credentials)); + } + } + private ResourcesManager(RestClient restClient) { + super( + restClient, + null, + new SubscriptionClientImpl(restClient)); + } +} diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionClientImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionClientImpl.java index e306938366f25..f8cf1a1ae08b7 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionClientImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionClientImpl.java @@ -40,11 +40,11 @@ public String apiVersion() { return this.apiVersion; } - /** Gets or sets the preferred language for the response. */ + /** The preferred language for the response. */ private String acceptLanguage; /** - * Gets Gets or sets the preferred language for the response. + * Gets The preferred language for the response. * * @return the acceptLanguage value. */ @@ -53,7 +53,7 @@ public String acceptLanguage() { } /** - * Sets Gets or sets the preferred language for the response. + * Sets The preferred language for the response. * * @param acceptLanguage the acceptLanguage value. * @return the service client itself @@ -63,11 +63,11 @@ public SubscriptionClientImpl withAcceptLanguage(String acceptLanguage) { return this; } - /** Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. */ + /** The retry timeout in seconds for Long Running Operations. Default value is 30. */ private int longRunningOperationRetryTimeout; /** - * Gets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. + * Gets The retry timeout in seconds for Long Running Operations. Default value is 30. * * @return the longRunningOperationRetryTimeout value. */ @@ -76,7 +76,7 @@ public int longRunningOperationRetryTimeout() { } /** - * Sets Gets or sets the retry timeout in seconds for Long Running Operations. Default value is 30. + * Sets The retry timeout in seconds for Long Running Operations. Default value is 30. * * @param longRunningOperationRetryTimeout the longRunningOperationRetryTimeout value. * @return the service client itself @@ -86,11 +86,11 @@ public SubscriptionClientImpl withLongRunningOperationRetryTimeout(int longRunni return this; } - /** When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */ + /** Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. */ private boolean generateClientRequestId; /** - * Gets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. + * Gets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. * * @return the generateClientRequestId value. */ @@ -99,7 +99,7 @@ public boolean generateClientRequestId() { } /** - * Sets When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. + * Sets Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true. * * @param generateClientRequestId the generateClientRequestId value. * @return the service client itself @@ -109,6 +109,19 @@ public SubscriptionClientImpl withGenerateClientRequestId(boolean generateClient return this; } + /** + * The OperationsInner object to access its operations. + */ + private OperationsInner operations; + + /** + * Gets the OperationsInner object to access its operations. + * @return the OperationsInner object. + */ + public OperationsInner operations() { + return this.operations; + } + /** * The SubscriptionsInner object to access its operations. */ @@ -170,6 +183,7 @@ protected void initialize() { this.acceptLanguage = "en-US"; this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; + this.operations = new OperationsInner(restClient().retrofit(), this); this.subscriptions = new SubscriptionsInner(restClient().retrofit(), this); this.tenants = new TenantsInner(restClient().retrofit(), this); this.azureClient = new AzureClient(this); @@ -182,6 +196,6 @@ protected void initialize() { */ @Override public String userAgent() { - return String.format("%s (%s, %s)", super.userAgent(), "SubscriptionClient", "2016-06-01"); + return String.format("%s (%s, %s, auto-generated)", super.userAgent(), "SubscriptionClient", "2016-06-01"); } } diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionImpl.java index b463156e6001a..9853ea3bba1c9 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionImpl.java @@ -14,14 +14,14 @@ import com.microsoft.azure.management.resources.v2016_06_01.SubscriptionPolicies; class SubscriptionImpl extends WrapperImpl implements Subscription { - private final Manager manager; - SubscriptionImpl(SubscriptionInner inner, Manager manager) { + private final ResourcesManager manager; + SubscriptionImpl(SubscriptionInner inner, ResourcesManager manager) { super(inner); this.manager = manager; } @Override - public Manager manager() { + public ResourcesManager manager() { return this.manager; } diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsImpl.java index d6b6d88817c16..66683dfc4cfa6 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsImpl.java @@ -9,27 +9,24 @@ package com.microsoft.azure.management.resources.v2016_06_01.implementation; -import com.microsoft.azure.Page; -import com.microsoft.azure.PagedList; import com.microsoft.azure.arm.model.implementation.WrapperImpl; -import com.microsoft.azure.arm.utils.PagedListConverter; -import com.microsoft.azure.management.resources.v2016_06_01.Location; -import com.microsoft.azure.management.resources.v2016_06_01.Subscription; import com.microsoft.azure.management.resources.v2016_06_01.Subscriptions; -import rx.Observable; import rx.functions.Func1; - +import rx.Observable; +import com.microsoft.azure.Page; +import com.microsoft.azure.management.resources.v2016_06_01.Subscription; import java.util.List; +import com.microsoft.azure.management.resources.v2016_06_01.Location; class SubscriptionsImpl extends WrapperImpl implements Subscriptions { - private final Manager manager; + private final ResourcesManager manager; - SubscriptionsImpl(Manager manager) { + SubscriptionsImpl(ResourcesManager manager) { super(manager.inner().subscriptions()); this.manager = manager; } - public Manager manager() { + public ResourcesManager manager() { return this.manager; } @@ -45,17 +42,6 @@ public Subscription call(SubscriptionInner inner) { }); } - @Override - public PagedList list() { - return new PagedListConverter() { - - @Override - public Observable typeConvertAsync(SubscriptionInner subscriptionInner) { - return Observable.just((Subscription) new SubscriptionImpl(subscriptionInner, manager())); - } - }.convert(inner().list()); - } - @Override public Observable listAsync() { SubscriptionsInner client = this.inner(); diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsInner.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsInner.java index f06fa1cb52ce7..6c970f5c36546 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsInner.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/SubscriptionsInner.java @@ -139,7 +139,7 @@ public Observable>> listLocationsWithService @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listLocationsDelegate(response); + ServiceResponse> result = listLocationsDelegate(response); List items = null; if (result.body() != null) { items = result.body().items(); @@ -153,9 +153,9 @@ public Observable>> call(Response> listLocationsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listLocationsDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -324,7 +324,7 @@ public Observable>> listSinglePageAsync( @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listDelegate(response); + ServiceResponse> result = listDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -333,9 +333,9 @@ public Observable>> call(Response> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -421,7 +421,7 @@ public Observable>> call(ServiceResponse /** * Gets all subscriptions for a tenant. * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the PagedList<SubscriptionInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -435,7 +435,7 @@ public Observable>> listNextSinglePageAs @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listNextDelegate(response); + ServiceResponse> result = listNextDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -444,9 +444,9 @@ public Observable>> call(Response> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantIdDescriptionImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantIdDescriptionImpl.java index defc1823ffb30..1935c312615f7 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantIdDescriptionImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantIdDescriptionImpl.java @@ -12,14 +12,14 @@ import com.microsoft.azure.arm.model.implementation.WrapperImpl; class TenantIdDescriptionImpl extends WrapperImpl implements TenantIdDescription { - private final Manager manager; - TenantIdDescriptionImpl(TenantIdDescriptionInner inner, Manager manager) { + private final ResourcesManager manager; + TenantIdDescriptionImpl(TenantIdDescriptionInner inner, ResourcesManager manager) { super(inner); this.manager = manager; } @Override - public Manager manager() { + public ResourcesManager manager() { return this.manager; } diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsImpl.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsImpl.java index 977976c2a56c5..72bb3b1074c61 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsImpl.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsImpl.java @@ -17,14 +17,14 @@ import com.microsoft.azure.management.resources.v2016_06_01.TenantIdDescription; class TenantsImpl extends WrapperImpl implements Tenants { - private final Manager manager; + private final ResourcesManager manager; - TenantsImpl(Manager manager) { + TenantsImpl(ResourcesManager manager) { super(manager.inner().tenants()); this.manager = manager; } - public Manager manager() { + public ResourcesManager manager() { return this.manager; } diff --git a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsInner.java b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsInner.java index 3b48bfec9d347..9309d0e622d2f 100644 --- a/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsInner.java +++ b/resources/resource-manager/v2016_06_01/src/main/java/com/microsoft/azure/management/resources/v2016_06_01/implementation/TenantsInner.java @@ -153,7 +153,7 @@ public Observable>> listSinglePag @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listDelegate(response); + ServiceResponse> result = listDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -162,9 +162,9 @@ public Observable>> call(Response }); } - private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); } @@ -250,7 +250,7 @@ public Observable>> call(ServiceR /** * Gets the tenants for your account. * - ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. + ServiceResponse> * @param nextPageLink The NextLink from the previous successful call to List operation. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the PagedList<TenantIdDescriptionInner> object wrapped in {@link ServiceResponse} if successful. */ @@ -264,7 +264,7 @@ public Observable>> listNextSingl @Override public Observable>> call(Response response) { try { - ServiceResponse> result = listNextDelegate(response); + ServiceResponse> result = listNextDelegate(response); return Observable.just(new ServiceResponse>(result.body(), result.response())); } catch (Throwable t) { return Observable.error(t); @@ -273,9 +273,9 @@ public Observable>> call(Response }); } - private ServiceResponse> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken>() { }.getType()) + private ServiceResponse> listNextDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) .registerError(CloudException.class) .build(response); }