From 7a229e1c0185eb0a5881546de3480b05c19fedd8 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Sun, 20 Oct 2019 11:47:13 +0000 Subject: [PATCH] Generated from 965878ad7cb4fb6cb6d8cc7467ccbb000dc05a36 feat: use 204 instead of 200 --- .../resource-manager/v2019_06_01/pom.xml | 6 ++--- .../v2019_06_01/AgentPools.java | 3 +-- ...hiftManagedClusterAADIdentityProvider.java | 2 +- ...iftManagedClusterBaseIdentityProvider.java | 2 +- .../implementation/AgentPoolsImpl.java | 14 ++++------ .../implementation/AgentPoolsInner.java | 27 +++++++------------ 6 files changed, 20 insertions(+), 34 deletions(-) diff --git a/containerservice/resource-manager/v2019_06_01/pom.xml b/containerservice/resource-manager/v2019_06_01/pom.xml index 1c11b07d0195..37f51c5b0a95 100644 --- a/containerservice/resource-manager/v2019_06_01/pom.xml +++ b/containerservice/resource-manager/v2019_06_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.1.0 - ../../../pom.management.xml + 0.0.3-beta + ../../../pom.xml azure-mgmt-containerservice 1.0.0-beta @@ -71,8 +71,6 @@ azure-arm-client-runtime test-jar test - - 1.6.5 diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java index f718a036f428..fb9fa8713b17 100644 --- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java +++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPools.java @@ -71,10 +71,9 @@ public interface AgentPools extends SupportsCreating getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName); + Observable getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName); } diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java index c18b5d4d7615..898c7bf7f7b6 100644 --- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java +++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterAADIdentityProvider.java @@ -15,7 +15,7 @@ /** * Defines the Identity provider for MS AAD. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind", defaultImpl = OpenShiftManagedClusterAADIdentityProvider.class) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind") @JsonTypeName("AADIdentityProvider") public class OpenShiftManagedClusterAADIdentityProvider extends OpenShiftManagedClusterBaseIdentityProvider { /** diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java index 2c6e011105ef..524c75a6ff47 100644 --- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java +++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/OpenShiftManagedClusterBaseIdentityProvider.java @@ -15,7 +15,7 @@ /** * Structure for any Identity provider. */ -@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind", defaultImpl = OpenShiftManagedClusterBaseIdentityProvider.class) +@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "kind") @JsonTypeName("OpenShiftManagedClusterBaseIdentityProvider") @JsonSubTypes({ @JsonSubTypes.Type(name = "AADIdentityProvider", value = OpenShiftManagedClusterAADIdentityProvider.class) diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java index 911bee5b30f7..8eedd81fde99 100644 --- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java +++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsImpl.java @@ -66,14 +66,10 @@ public AgentPool call(AgentPoolInner inner) { public Observable getAsync(String resourceGroupName, String resourceName, String agentPoolName) { AgentPoolsInner client = this.inner(); return client.getAsync(resourceGroupName, resourceName, agentPoolName) - .flatMap(new Func1>() { + .map(new Func1() { @Override - public Observable call(AgentPoolInner inner) { - if (inner == null) { - return Observable.empty(); - } else { - return Observable.just((AgentPool)wrapModel(inner)); - } + public AgentPool call(AgentPoolInner inner) { + return wrapModel(inner); } }); } @@ -97,9 +93,9 @@ public AgentPoolUpgradeProfile call(AgentPoolUpgradeProfileInner inner) { } @Override - public Observable getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) { + public Observable getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName) { AgentPoolsInner client = this.inner(); - return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName, agentPoolName) + return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName) .map(new Func1() { @Override public AgentPoolAvailableVersions call(AgentPoolAvailableVersionsInner inner) { diff --git a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java index b95dc4cafbe0..167c0318a3db 100644 --- a/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java +++ b/containerservice/resource-manager/v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java @@ -90,8 +90,8 @@ interface AgentPoolsService { Observable> getUpgradeProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @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.containerservice.v2019_06_01.AgentPools getAvailableAgentPoolVersions" }) - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/availableAgentPoolVersions") - Observable> getAvailableAgentPoolVersions(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/availableAgentPoolVersions") + Observable> getAvailableAgentPoolVersions(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @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.containerservice.v2019_06_01.AgentPools listNext" }) @GET @@ -783,14 +783,13 @@ private ServiceResponse getUpgradeProfileDelegate( * * @param resourceGroupName The name of the resource group. * @param resourceName The name of the managed cluster resource. - * @param agentPoolName The name of the agent pool. * @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 AgentPoolAvailableVersionsInner object if successful. */ - public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String resourceGroupName, String resourceName, String agentPoolName) { - return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().single().body(); + public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String resourceGroupName, String resourceName) { + return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body(); } /** @@ -799,13 +798,12 @@ public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String reso * * @param resourceGroupName The name of the resource group. * @param resourceName The name of the managed cluster resource. - * @param agentPoolName The name of the agent pool. * @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 getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback); + public ServiceFuture getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback); } /** @@ -814,12 +812,11 @@ public ServiceFuture getAvailableAgentPoolVersi * * @param resourceGroupName The name of the resource group. * @param resourceName The name of the managed cluster resource. - * @param agentPoolName The name of the agent pool. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the AgentPoolAvailableVersionsInner object */ - public Observable getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) { - return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1, AgentPoolAvailableVersionsInner>() { + public Observable getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName) { + return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1, AgentPoolAvailableVersionsInner>() { @Override public AgentPoolAvailableVersionsInner call(ServiceResponse response) { return response.body(); @@ -833,11 +830,10 @@ public AgentPoolAvailableVersionsInner call(ServiceResponse> getAvailableAgentPoolVersionsWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) { + public Observable> getAvailableAgentPoolVersionsWithServiceResponseAsync(String resourceGroupName, String resourceName) { if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } @@ -847,11 +843,8 @@ public Observable> getAvailable if (resourceName == null) { throw new IllegalArgumentException("Parameter resourceName is required and cannot be null."); } - if (agentPoolName == null) { - throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."); - } final String apiVersion = "2019-06-01"; - return service.getAvailableAgentPoolVersions(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + return service.getAvailableAgentPoolVersions(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) {