diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/ResourceSku.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/ResourceSku.java index 47d46bbc625..eb0700fd66b 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/ResourceSku.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/ResourceSku.java @@ -26,7 +26,7 @@ public class ResourceSku { * 'Free', 'Basic', 'Premium'. */ @JsonProperty(value = "tier") - private SignalrSkuTier tier; + private SignalRSkuTier tier; /** * Optional, string. When the name field is the combination of tier and @@ -75,7 +75,7 @@ public ResourceSku withName(String name) { * * @return the tier value */ - public SignalrSkuTier tier() { + public SignalRSkuTier tier() { return this.tier; } @@ -85,7 +85,7 @@ public SignalrSkuTier tier() { * @param tier the tier value to set * @return the ResourceSku object itself. */ - public ResourceSku withTier(SignalrSkuTier tier) { + public ResourceSku withTier(SignalRSkuTier tier) { this.tier = tier; return this; } diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/OperationsInner.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/OperationsInner.java index 43d43fde9c0..5b6736ef35a 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/OperationsInner.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/OperationsInner.java @@ -37,7 +37,7 @@ public class OperationsInner { /** The Retrofit service to perform REST calls. */ private OperationsService service; /** The service client containing this operation class. */ - private SignalrManagementClientImpl client; + private SignalRManagementClientImpl client; /** * Initializes an instance of OperationsInner. @@ -45,7 +45,7 @@ public class 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, SignalrManagementClientImpl client) { + public OperationsInner(Retrofit retrofit, SignalRManagementClientImpl client) { this.service = retrofit.create(OperationsService.class); this.client = client; } diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRManagementClientImpl.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRManagementClientImpl.java index 18ab4de3b49..627d82c17d9 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRManagementClientImpl.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRManagementClientImpl.java @@ -132,6 +132,19 @@ public SignalRManagementClientImpl withGenerateClientRequestId(boolean generateC 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 SignalRsInner object to access its operations. */ @@ -180,6 +193,7 @@ protected void initialize() { this.acceptLanguage = "en-US"; this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; + this.operations = new OperationsInner(restClient().retrofit(), this); this.signalRs = new SignalRsInner(restClient().retrofit(), this); this.azureClient = new AzureClient(this); } diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRResourceInner.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRResourceInner.java index 258887fe361..e0c9b7f43bd 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRResourceInner.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRResourceInner.java @@ -33,9 +33,9 @@ public class SignalRResourceInner extends TrackedResourceInner { private String hostNamePrefix; /** - * Provisioning state of the resource. Possible values include: - * 'Succeeded', 'Failed', 'Canceled', 'Creating', 'Updating', 'Deleting', - * 'Moving'. + * Provisioning state of the resource. Possible values include: 'Unknown', + * 'Succeeded', 'Failed', 'Canceled', 'Running', 'Creating', 'Updating', + * 'Deleting', 'Moving'. */ @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY) private ProvisioningState provisioningState; diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRsInner.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRsInner.java index dfc5784437d..b521dbc03ae 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRsInner.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/SignalRsInner.java @@ -68,10 +68,6 @@ public SignalRsInner(Retrofit retrofit, SignalRManagementClientImpl client) { * used by Retrofit to perform actually REST calls. */ interface SignalRsService { - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.signalr.SignalRs listOperations" }) - @GET("providers/Microsoft.SignalRService/operations") - Observable> listOperations(@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.signalr.SignalRs checkNameAvailability" }) @POST("subscriptions/{subscriptionId}/providers/Microsoft.SignalRService/checkNameAvailability") Observable> checkNameAvailability(@Path("subscriptionId") String subscriptionId, @Body NameAvailabilityParametersInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -124,10 +120,6 @@ interface SignalRsService { @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.SignalRService/SignalR/{resourceName}") Observable> beginUpdate(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Body SignalRUpdateParametersInner parameters, @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.signalr.SignalRs listOperationsNext" }) - @GET - Observable> listOperationsNext(@Url String nextUrl, @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.signalr.SignalRs listNext" }) @GET Observable> listNext(@Url String nextUrl, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -138,110 +130,6 @@ interface SignalRsService { } - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @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 listOperations() { - ServiceResponse> response = listOperationsSinglePageAsync().toBlocking().single(); - return new PagedList(response.body()) { - @Override - public Page nextPage(String nextPageLink) { - return listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single().body(); - } - }; - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @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> listOperationsAsync(final ListOperationCallback serviceCallback) { - return AzureServiceFuture.fromPageResponse( - listOperationsSinglePageAsync(), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listOperationsNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the PagedList<OperationInner> object - */ - public Observable> listOperationsAsync() { - return listOperationsWithServiceResponseAsync() - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.body(); - } - }); - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the PagedList<OperationInner> object - */ - public Observable>> listOperationsWithServiceResponseAsync() { - return listOperationsSinglePageAsync() - .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(listOperationsNextWithServiceResponseAsync(nextPageLink)); - } - }); - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the PagedList<OperationInner> object wrapped in {@link ServiceResponse} if successful. - */ - public Observable>> listOperationsSinglePageAsync() { - if (this.client.apiVersion() == null) { - throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); - } - return service.listOperations(this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { - @Override - public Observable>> call(Response response) { - try { - ServiceResponse> result = listOperationsDelegate(response); - return Observable.just(new ServiceResponse>(result.body(), result.response())); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse> listOperationsDelegate(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); - } - /** * Checks that the SignalR name is valid and is not already in use. * @@ -1889,117 +1777,6 @@ private ServiceResponse beginUpdateDelegate(Response listOperationsNext(final String nextPageLink) { - ServiceResponse> response = listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single(); - return new PagedList(response.body()) { - @Override - public Page nextPage(String nextPageLink) { - return listOperationsNextSinglePageAsync(nextPageLink).toBlocking().single().body(); - } - }; - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @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> listOperationsNextAsync(final String nextPageLink, final ServiceFuture> serviceFuture, final ListOperationCallback serviceCallback) { - return AzureServiceFuture.fromPageResponse( - listOperationsNextSinglePageAsync(nextPageLink), - new Func1>>>() { - @Override - public Observable>> call(String nextPageLink) { - return listOperationsNextSinglePageAsync(nextPageLink); - } - }, - serviceCallback); - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @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> listOperationsNextAsync(final String nextPageLink) { - return listOperationsNextWithServiceResponseAsync(nextPageLink) - .map(new Func1>, Page>() { - @Override - public Page call(ServiceResponse> response) { - return response.body(); - } - }); - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - * @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>> listOperationsNextWithServiceResponseAsync(final String nextPageLink) { - return listOperationsNextSinglePageAsync(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(listOperationsNextWithServiceResponseAsync(nextPageLink)); - } - }); - } - - /** - * Lists all of the available REST API operations of the Microsoft.SignalRService provider. - * - 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>> listOperationsNextSinglePageAsync(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.listOperationsNext(nextUrl, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>>() { - @Override - public Observable>> call(Response response) { - try { - ServiceResponse> result = listOperationsNextDelegate(response); - return Observable.just(new ServiceResponse>(result.body(), result.response())); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse> listOperationsNextDelegate(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); - } - /** * Handles requests to list all resources in a subscription. * diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/package-info.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/package-info.java index a9d98533003..55b9f9e953e 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/package-info.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/implementation/package-info.java @@ -5,7 +5,7 @@ // Code generated by Microsoft (R) AutoRest Code Generator. /** - * This package contains the implementation classes for SignalrManagementClient. + * This package contains the implementation classes for SignalRManagementClient. * REST API for Azure SignalR Service. */ package com.microsoft.azure.management.signalr.implementation; diff --git a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/package-info.java b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/package-info.java index 15b05ba577b..625f7d7ab31 100644 --- a/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/package-info.java +++ b/azure-mgmt-signalr/src/main/java/com/microsoft/azure/management/signalr/package-info.java @@ -5,7 +5,7 @@ // Code generated by Microsoft (R) AutoRest Code Generator. /** - * This package contains the classes for SignalrManagementClient. + * This package contains the classes for SignalRManagementClient. * REST API for Azure SignalR Service. */ package com.microsoft.azure.management.signalr;