diff --git a/sdk/managedapplications/mgmt-v2019_07_01/pom.xml b/sdk/managedapplications/mgmt-v2019_07_01/pom.xml index 6f9f24b9e2bfb..715d003c82288 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/pom.xml +++ b/sdk/managedapplications/mgmt-v2019_07_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.2.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-managedapplications 1.0.0-beta diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Application.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Application.java index b458dd52a5c8b..a3716aa99bb6e 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Application.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Application.java @@ -266,7 +266,7 @@ interface WithCreate extends Creatable, Resource.DefinitionWithTags /** * The template for a Application update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithApplicationDefinitionId, UpdateStages.WithIdentity, UpdateStages.WithJitAccessPolicy, UpdateStages.WithManagedBy, UpdateStages.WithManagedResourceGroupId, UpdateStages.WithParameters, UpdateStages.WithPlan, UpdateStages.WithSku { + interface Update extends Appliable, Resource.UpdateWithTags, UpdateStages.WithApplicationDefinitionId, UpdateStages.WithIdentity, UpdateStages.WithJitAccessPolicy, UpdateStages.WithKind, UpdateStages.WithManagedBy, UpdateStages.WithManagedResourceGroupId, UpdateStages.WithParameters, UpdateStages.WithPlan, UpdateStages.WithSku { } /** @@ -309,6 +309,18 @@ interface WithJitAccessPolicy { Update withJitAccessPolicy(ApplicationJitAccessPolicy jitAccessPolicy); } + /** + * The stage of the application update allowing to specify Kind. + */ + interface WithKind { + /** + * Specifies kind. + * @param kind The kind of the managed application. Allowed values are MarketPlace and ServiceCatalog + * @return the next update stage + */ + Update withKind(String kind); + } + /** * The stage of the application update allowing to specify ManagedBy. */ @@ -354,7 +366,7 @@ interface WithPlan { * @param plan The plan information * @return the next update stage */ - Update withPlan(Plan plan); + Update withPlan(PlanPatchable plan); } /** diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationDefinitions.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationDefinitions.java index f7ff5d5fd761b..d9f9324d18cfc 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationDefinitions.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationDefinitions.java @@ -24,31 +24,34 @@ */ public interface ApplicationDefinitions extends SupportsCreating, SupportsDeletingByResourceGroup, SupportsBatchDeletion, SupportsGettingByResourceGroup, SupportsListingByResourceGroup, HasInner { /** - * Gets the managed application definition. + * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition to delete. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ - Observable getByIdAsync(String applicationDefinitionId); + Completable deleteAsync(String resourceGroupName, String applicationDefinitionName); /** - * Deletes the managed application definition. + * Gets the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ - Completable deleteByIdAsync(String applicationDefinitionId); + Observable getByIdAsync(String resourceGroupName, String applicationDefinitionName); /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ - Observable createOrUpdateByIdAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters); + Observable createOrUpdateByIdAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters); } diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPatchable.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPatchable.java index bf7ac055caff3..c07387a71bb96 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPatchable.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPatchable.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.managedapplications.v2019_07_01; +import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -49,6 +50,70 @@ public class ApplicationPatchable extends GenericResource { @JsonProperty(value = "properties.provisioningState", access = JsonProperty.Access.WRITE_ONLY) private ProvisioningState provisioningState; + /** + * The managed application billing details. + */ + @JsonProperty(value = "properties.billingDetails", access = JsonProperty.Access.WRITE_ONLY) + private ApplicationBillingDetailsDefinition billingDetails; + + /** + * The managed application Jit access policy. + */ + @JsonProperty(value = "properties.jitAccessPolicy") + private ApplicationJitAccessPolicy jitAccessPolicy; + + /** + * The publisher tenant Id. + */ + @JsonProperty(value = "properties.publisherTenantId", access = JsonProperty.Access.WRITE_ONLY) + private String publisherTenantId; + + /** + * The read-only authorizations property that is retrieved from the + * application package. + */ + @JsonProperty(value = "properties.authorizations", access = JsonProperty.Access.WRITE_ONLY) + private List authorizations; + + /** + * The managed application management mode. Possible values include: + * 'NotSpecified', 'Unmanaged', 'Managed'. + */ + @JsonProperty(value = "properties.managementMode", access = JsonProperty.Access.WRITE_ONLY) + private ApplicationManagementMode managementMode; + + /** + * The read-only customer support property that is retrieved from the + * application package. + */ + @JsonProperty(value = "properties.customerSupport", access = JsonProperty.Access.WRITE_ONLY) + private ApplicationPackageContact customerSupport; + + /** + * The read-only support URLs property that is retrieved from the + * application package. + */ + @JsonProperty(value = "properties.supportUrls", access = JsonProperty.Access.WRITE_ONLY) + private ApplicationPackageSupportUrls supportUrls; + + /** + * The collection of managed application artifacts. + */ + @JsonProperty(value = "properties.artifacts", access = JsonProperty.Access.WRITE_ONLY) + private List artifacts; + + /** + * The client entity that created the JIT request. + */ + @JsonProperty(value = "properties.createdBy", access = JsonProperty.Access.WRITE_ONLY) + private ApplicationClientDetails createdBy; + + /** + * The client entity that last updated the JIT request. + */ + @JsonProperty(value = "properties.updatedBy", access = JsonProperty.Access.WRITE_ONLY) + private ApplicationClientDetails updatedBy; + /** * The plan information. */ @@ -146,6 +211,107 @@ public ProvisioningState provisioningState() { return this.provisioningState; } + /** + * Get the managed application billing details. + * + * @return the billingDetails value + */ + public ApplicationBillingDetailsDefinition billingDetails() { + return this.billingDetails; + } + + /** + * Get the managed application Jit access policy. + * + * @return the jitAccessPolicy value + */ + public ApplicationJitAccessPolicy jitAccessPolicy() { + return this.jitAccessPolicy; + } + + /** + * Set the managed application Jit access policy. + * + * @param jitAccessPolicy the jitAccessPolicy value to set + * @return the ApplicationPatchable object itself. + */ + public ApplicationPatchable withJitAccessPolicy(ApplicationJitAccessPolicy jitAccessPolicy) { + this.jitAccessPolicy = jitAccessPolicy; + return this; + } + + /** + * Get the publisher tenant Id. + * + * @return the publisherTenantId value + */ + public String publisherTenantId() { + return this.publisherTenantId; + } + + /** + * Get the read-only authorizations property that is retrieved from the application package. + * + * @return the authorizations value + */ + public List authorizations() { + return this.authorizations; + } + + /** + * Get the managed application management mode. Possible values include: 'NotSpecified', 'Unmanaged', 'Managed'. + * + * @return the managementMode value + */ + public ApplicationManagementMode managementMode() { + return this.managementMode; + } + + /** + * Get the read-only customer support property that is retrieved from the application package. + * + * @return the customerSupport value + */ + public ApplicationPackageContact customerSupport() { + return this.customerSupport; + } + + /** + * Get the read-only support URLs property that is retrieved from the application package. + * + * @return the supportUrls value + */ + public ApplicationPackageSupportUrls supportUrls() { + return this.supportUrls; + } + + /** + * Get the collection of managed application artifacts. + * + * @return the artifacts value + */ + public List artifacts() { + return this.artifacts; + } + + /** + * Get the client entity that created the JIT request. + * + * @return the createdBy value + */ + public ApplicationClientDetails createdBy() { + return this.createdBy; + } + + /** + * Get the client entity that last updated the JIT request. + * + * @return the updatedBy value + */ + public ApplicationClientDetails updatedBy() { + return this.updatedBy; + } + /** * Get the plan information. * diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPropertiesPatchable.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPropertiesPatchable.java new file mode 100644 index 0000000000000..5fd477af681ee --- /dev/null +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ApplicationPropertiesPatchable.java @@ -0,0 +1,128 @@ +/** + * 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.managedapplications.v2019_07_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * The managed application properties. + */ +public class ApplicationPropertiesPatchable { + /** + * The managed resource group Id. + */ + @JsonProperty(value = "managedResourceGroupId") + private String managedResourceGroupId; + + /** + * The fully qualified path of managed application definition Id. + */ + @JsonProperty(value = "applicationDefinitionId") + private String applicationDefinitionId; + + /** + * Name and value pairs that define the managed application parameters. It + * can be a JObject or a well formed JSON string. + */ + @JsonProperty(value = "parameters") + private Object parameters; + + /** + * Name and value pairs that define the managed application outputs. + */ + @JsonProperty(value = "outputs", access = JsonProperty.Access.WRITE_ONLY) + private Object outputs; + + /** + * The managed application provisioning state. Possible values include: + * 'NotSpecified', 'Accepted', 'Running', 'Ready', 'Creating', 'Created', + * 'Deleting', 'Deleted', 'Canceled', 'Failed', 'Succeeded', 'Updating'. + */ + @JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY) + private ProvisioningState provisioningState; + + /** + * Get the managed resource group Id. + * + * @return the managedResourceGroupId value + */ + public String managedResourceGroupId() { + return this.managedResourceGroupId; + } + + /** + * Set the managed resource group Id. + * + * @param managedResourceGroupId the managedResourceGroupId value to set + * @return the ApplicationPropertiesPatchable object itself. + */ + public ApplicationPropertiesPatchable withManagedResourceGroupId(String managedResourceGroupId) { + this.managedResourceGroupId = managedResourceGroupId; + return this; + } + + /** + * Get the fully qualified path of managed application definition Id. + * + * @return the applicationDefinitionId value + */ + public String applicationDefinitionId() { + return this.applicationDefinitionId; + } + + /** + * Set the fully qualified path of managed application definition Id. + * + * @param applicationDefinitionId the applicationDefinitionId value to set + * @return the ApplicationPropertiesPatchable object itself. + */ + public ApplicationPropertiesPatchable withApplicationDefinitionId(String applicationDefinitionId) { + this.applicationDefinitionId = applicationDefinitionId; + return this; + } + + /** + * Get name and value pairs that define the managed application parameters. It can be a JObject or a well formed JSON string. + * + * @return the parameters value + */ + public Object parameters() { + return this.parameters; + } + + /** + * Set name and value pairs that define the managed application parameters. It can be a JObject or a well formed JSON string. + * + * @param parameters the parameters value to set + * @return the ApplicationPropertiesPatchable object itself. + */ + public ApplicationPropertiesPatchable withParameters(Object parameters) { + this.parameters = parameters; + return this; + } + + /** + * Get name and value pairs that define the managed application outputs. + * + * @return the outputs value + */ + public Object outputs() { + return this.outputs; + } + + /** + * Get the managed application provisioning state. Possible values include: 'NotSpecified', 'Accepted', 'Running', 'Ready', 'Creating', 'Created', 'Deleting', 'Deleted', 'Canceled', 'Failed', 'Succeeded', 'Updating'. + * + * @return the provisioningState value + */ + public ProvisioningState provisioningState() { + return this.provisioningState; + } + +} diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java index 1a529de7b4a17..72b094c5ecafd 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/Identity.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.managedapplications.v2019_07_01; +import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; /** @@ -27,11 +28,20 @@ public class Identity { private String tenantId; /** - * The identity type. Possible values include: 'SystemAssigned'. + * The identity type. Possible values include: 'SystemAssigned', + * 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'. */ @JsonProperty(value = "type") private ResourceIdentityType type; + /** + * The list of user identities associated with the resource. The user + * identity dictionary key references will be resource ids in the form: + * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + */ + @JsonProperty(value = "userAssignedIdentities") + private Map userAssignedIdentities; + /** * Get the principal ID of resource identity. * @@ -51,7 +61,7 @@ public String tenantId() { } /** - * Get the identity type. Possible values include: 'SystemAssigned'. + * Get the identity type. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'. * * @return the type value */ @@ -60,7 +70,7 @@ public ResourceIdentityType type() { } /** - * Set the identity type. Possible values include: 'SystemAssigned'. + * Set the identity type. Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned, UserAssigned', 'None'. * * @param type the type value to set * @return the Identity object itself. @@ -70,4 +80,24 @@ public Identity withType(ResourceIdentityType type) { return this; } + /** + * Get the list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + * + * @return the userAssignedIdentities value + */ + public Map userAssignedIdentities() { + return this.userAssignedIdentities; + } + + /** + * Set the list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + * + * @param userAssignedIdentities the userAssignedIdentities value to set + * @return the Identity object itself. + */ + public Identity withUserAssignedIdentities(Map userAssignedIdentities) { + this.userAssignedIdentities = userAssignedIdentities; + return this; + } + } diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java index b83d6b1e2e559..51ac50cd10f90 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/ResourceIdentityType.java @@ -16,7 +16,16 @@ */ public enum ResourceIdentityType { /** Enum value SystemAssigned. */ - SYSTEM_ASSIGNED("SystemAssigned"); + SYSTEM_ASSIGNED("SystemAssigned"), + + /** Enum value UserAssigned. */ + USER_ASSIGNED("UserAssigned"), + + /** Enum value SystemAssigned, UserAssigned. */ + SYSTEM_ASSIGNED_USER_ASSIGNED("SystemAssigned, UserAssigned"), + + /** Enum value None. */ + NONE("None"); /** The actual serialized value for a ResourceIdentityType instance. */ private String value; diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/UserAssignedResourceIdentity.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/UserAssignedResourceIdentity.java new file mode 100644 index 0000000000000..0b14c994b3a4c --- /dev/null +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/UserAssignedResourceIdentity.java @@ -0,0 +1,48 @@ +/** + * 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.managedapplications.v2019_07_01; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Represents the user assigned identity that is contained within the + * UserAssignedIdentities dictionary on ResourceIdentity. + */ +public class UserAssignedResourceIdentity { + /** + * The principal id of user assigned identity. + */ + @JsonProperty(value = "principalId", access = JsonProperty.Access.WRITE_ONLY) + private String principalId; + + /** + * The tenant id of user assigned identity. + */ + @JsonProperty(value = "tenantId", access = JsonProperty.Access.WRITE_ONLY) + private String tenantId; + + /** + * Get the principal id of user assigned identity. + * + * @return the principalId value + */ + public String principalId() { + return this.principalId; + } + + /** + * Get the tenant id of user assigned identity. + * + * @return the tenantId value + */ + public String tenantId() { + return this.tenantId; + } + +} diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionImpl.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionImpl.java index c9c02b208af46..c5e2709e406b7 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionImpl.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionImpl.java @@ -44,7 +44,7 @@ public Observable updateResourceAsync() { @Override protected Observable getInnerAsync() { ApplicationDefinitionsInner client = this.manager().inner().applicationDefinitions(); - return client.getByResourceGroupAsync(this.resourceGroupName(), this.name()); + return client.getAsync(this.resourceGroupName(), this.name()); } @Override diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java index 78c6c12974544..0a6530c981a93 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsImpl.java @@ -31,13 +31,13 @@ protected ApplicationDefinitionsImpl(ManagedApplicationsManager manager) { @Override protected Observable getInnerAsync(String resourceGroupName, String name) { ApplicationDefinitionsInner client = this.inner(); - return client.getByResourceGroupAsync(resourceGroupName, name); + return client.getAsync(resourceGroupName, name); } @Override protected Completable deleteInnerAsync(String resourceGroupName, String name) { ApplicationDefinitionsInner client = this.inner(); - return client.deleteAsync(resourceGroupName, name).toCompletable(); + return client.deleteByIdAsync(resourceGroupName, name).toCompletable(); } @Override @@ -49,7 +49,7 @@ public Observable deleteByIdsAsync(Collection ids) { for (String id : ids) { final String resourceGroupName = ResourceUtilsCore.groupFromResourceId(id); final String name = ResourceUtilsCore.nameFromResourceId(id); - Observable o = RXMapper.map(this.inner().deleteAsync(resourceGroupName, name), id); + Observable o = RXMapper.map(this.inner().deleteByIdAsync(resourceGroupName, name), id); observables.add(o); } return Observable.mergeDelayError(observables); @@ -102,15 +102,27 @@ public ApplicationDefinitionImpl define(String name) { } @Override - public Completable deleteByIdAsync(String applicationDefinitionId) { + public Completable deleteAsync(String resourceGroupName, String applicationDefinitionName) { ApplicationDefinitionsInner client = this.inner(); - return client.deleteByIdAsync(applicationDefinitionId).toCompletable(); + return client.deleteAsync(resourceGroupName, applicationDefinitionName).toCompletable(); } @Override - public Observable createOrUpdateByIdAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters) { + public Observable getByIdAsync(String resourceGroupName, String applicationDefinitionName) { ApplicationDefinitionsInner client = this.inner(); - return client.createOrUpdateByIdAsync(applicationDefinitionId, parameters) + return client.getByIdAsync(resourceGroupName, applicationDefinitionName) + .map(new Func1() { + @Override + public ApplicationDefinition call(ApplicationDefinitionInner inner) { + return new ApplicationDefinitionImpl(inner.name(), inner, manager()); + } + }); + } + + @Override + public Observable createOrUpdateByIdAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + ApplicationDefinitionsInner client = this.inner(); + return client.createOrUpdateByIdAsync(resourceGroupName, applicationDefinitionName, parameters) .map(new Func1() { @Override public ApplicationDefinition call(ApplicationDefinitionInner inner) { diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsInner.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsInner.java index b6c03efe55468..3d71cd9ef2f6c 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsInner.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationDefinitionsInner.java @@ -8,7 +8,6 @@ package com.microsoft.azure.management.managedapplications.v2019_07_01.implementation; -import com.microsoft.azure.arm.collection.InnerSupportsGet; import com.microsoft.azure.arm.collection.InnerSupportsDelete; import retrofit2.Retrofit; import com.google.common.reflect.TypeToken; @@ -41,7 +40,7 @@ * An instance of this class provides access to all the operations defined * in ApplicationDefinitions. */ -public class ApplicationDefinitionsInner implements InnerSupportsGet, InnerSupportsDelete { +public class ApplicationDefinitionsInner implements InnerSupportsDelete { /** The Retrofit service to perform REST calls. */ private ApplicationDefinitionsService service; /** The service client containing this operation class. */ @@ -63,9 +62,9 @@ public ApplicationDefinitionsInner(Retrofit retrofit, ApplicationClientImpl clie * used by Retrofit to perform actually REST calls. */ interface ApplicationDefinitionsService { - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationDefinitions getByResourceGroup" }) + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationDefinitions get" }) @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}") - Observable> getByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> get(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @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.managedapplications.v2019_07_01.ApplicationDefinitions delete" }) @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}", method = "DELETE", hasBody = true) @@ -88,24 +87,24 @@ interface ApplicationDefinitionsService { Observable> listByResourceGroup(@Path("resourceGroupName") String resourceGroupName, @Path("subscriptionId") String subscriptionId, @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.managedapplications.v2019_07_01.ApplicationDefinitions getById" }) - @GET("{applicationDefinitionId}") - Observable> getById(@Path(value = "applicationDefinitionId", encoded = true) String applicationDefinitionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}") + Observable> getById(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @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.managedapplications.v2019_07_01.ApplicationDefinitions deleteById" }) - @HTTP(path = "{applicationDefinitionId}", method = "DELETE", hasBody = true) - Observable> deleteById(@Path(value = "applicationDefinitionId", encoded = true) String applicationDefinitionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}", method = "DELETE", hasBody = true) + Observable> deleteById(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @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.managedapplications.v2019_07_01.ApplicationDefinitions beginDeleteById" }) - @HTTP(path = "{applicationDefinitionId}", method = "DELETE", hasBody = true) - Observable> beginDeleteById(@Path(value = "applicationDefinitionId", encoded = true) String applicationDefinitionId, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @HTTP(path = "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}", method = "DELETE", hasBody = true) + Observable> beginDeleteById(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @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.managedapplications.v2019_07_01.ApplicationDefinitions createOrUpdateById" }) - @PUT("{applicationDefinitionId}") - Observable> createOrUpdateById(@Path(value = "applicationDefinitionId", encoded = true) String applicationDefinitionId, @Body ApplicationDefinitionInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}") + Observable> createOrUpdateById(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Body ApplicationDefinitionInner parameters, @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.managedapplications.v2019_07_01.ApplicationDefinitions beginCreateOrUpdateById" }) - @PUT("{applicationDefinitionId}") - Observable> beginCreateOrUpdateById(@Path(value = "applicationDefinitionId", encoded = true) String applicationDefinitionId, @Body ApplicationDefinitionInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + @PUT("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applicationDefinitions/{applicationDefinitionName}") + Observable> beginCreateOrUpdateById(@Path("resourceGroupName") String resourceGroupName, @Path("applicationDefinitionName") String applicationDefinitionName, @Path("subscriptionId") String subscriptionId, @Query("api-version") String apiVersion, @Body ApplicationDefinitionInner parameters, @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.managedapplications.v2019_07_01.ApplicationDefinitions listByResourceGroupNext" }) @GET @@ -123,8 +122,8 @@ interface ApplicationDefinitionsService { * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the ApplicationDefinitionInner object if successful. */ - public ApplicationDefinitionInner getByResourceGroup(String resourceGroupName, String applicationDefinitionName) { - return getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).toBlocking().single().body(); + public ApplicationDefinitionInner get(String resourceGroupName, String applicationDefinitionName) { + return getWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).toBlocking().single().body(); } /** @@ -136,8 +135,8 @@ public ApplicationDefinitionInner getByResourceGroup(String resourceGroupName, S * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object */ - public ServiceFuture getByResourceGroupAsync(String resourceGroupName, String applicationDefinitionName, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationDefinitionName), serviceCallback); + public ServiceFuture getAsync(String resourceGroupName, String applicationDefinitionName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(getWithServiceResponseAsync(resourceGroupName, applicationDefinitionName), serviceCallback); } /** @@ -148,8 +147,8 @@ public ServiceFuture getByResourceGroupAsync(String * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ApplicationDefinitionInner object */ - public Observable getByResourceGroupAsync(String resourceGroupName, String applicationDefinitionName) { - return getByResourceGroupWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).map(new Func1, ApplicationDefinitionInner>() { + public Observable getAsync(String resourceGroupName, String applicationDefinitionName) { + return getWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).map(new Func1, ApplicationDefinitionInner>() { @Override public ApplicationDefinitionInner call(ServiceResponse response) { return response.body(); @@ -165,7 +164,7 @@ public ApplicationDefinitionInner call(ServiceResponse> getByResourceGroupWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName) { + public Observable> getWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -178,12 +177,12 @@ public Observable> getByResourceGrou if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - return service.getByResourceGroup(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + return service.get(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { try { - ServiceResponse clientResponse = getByResourceGroupDelegate(response); + ServiceResponse clientResponse = getDelegate(response); return Observable.just(clientResponse); } catch (Throwable t) { return Observable.error(t); @@ -192,7 +191,7 @@ public Observable> call(Response getByResourceGroupDelegate(Response response) throws ErrorResponseException, IOException, IllegalArgumentException { + private ServiceResponse getDelegate(Response response) throws ErrorResponseException, IOException, IllegalArgumentException { return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) .register(200, new TypeToken() { }.getType()) .registerError(ErrorResponseException.class) @@ -644,37 +643,40 @@ private ServiceResponse> listByResourceGrou /** * Gets the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws ErrorResponseException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the ApplicationDefinitionInner object if successful. */ - public ApplicationDefinitionInner getById(String applicationDefinitionId) { - return getByIdWithServiceResponseAsync(applicationDefinitionId).toBlocking().single().body(); + public ApplicationDefinitionInner getById(String resourceGroupName, String applicationDefinitionName) { + return getByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).toBlocking().single().body(); } /** * Gets the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @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 getByIdAsync(String applicationDefinitionId, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(getByIdWithServiceResponseAsync(applicationDefinitionId), serviceCallback); + public ServiceFuture getByIdAsync(String resourceGroupName, String applicationDefinitionName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(getByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName), serviceCallback); } /** * Gets the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ApplicationDefinitionInner object */ - public Observable getByIdAsync(String applicationDefinitionId) { - return getByIdWithServiceResponseAsync(applicationDefinitionId).map(new Func1, ApplicationDefinitionInner>() { + public Observable getByIdAsync(String resourceGroupName, String applicationDefinitionName) { + return getByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).map(new Func1, ApplicationDefinitionInner>() { @Override public ApplicationDefinitionInner call(ServiceResponse response) { return response.body(); @@ -685,18 +687,25 @@ public ApplicationDefinitionInner call(ServiceResponse> getByIdWithServiceResponseAsync(String applicationDefinitionId) { - if (applicationDefinitionId == null) { - throw new IllegalArgumentException("Parameter applicationDefinitionId is required and cannot be null."); + public Observable> getByIdWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (applicationDefinitionName == null) { + throw new IllegalArgumentException("Parameter applicationDefinitionName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - return service.getById(applicationDefinitionId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + return service.getById(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { @@ -720,36 +729,39 @@ private ServiceResponse getByIdDelegate(Response deleteByIdAsync(String applicationDefinitionId, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(deleteByIdWithServiceResponseAsync(applicationDefinitionId), serviceCallback); + public ServiceFuture deleteByIdAsync(String resourceGroupName, String applicationDefinitionName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(deleteByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName), serviceCallback); } /** * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ - public Observable deleteByIdAsync(String applicationDefinitionId) { - return deleteByIdWithServiceResponseAsync(applicationDefinitionId).map(new Func1, Void>() { + public Observable deleteByIdAsync(String resourceGroupName, String applicationDefinitionName) { + return deleteByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).map(new Func1, Void>() { @Override public Void call(ServiceResponse response) { return response.body(); @@ -760,54 +772,64 @@ public Void call(ServiceResponse response) { /** * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ - public Observable> deleteByIdWithServiceResponseAsync(String applicationDefinitionId) { - if (applicationDefinitionId == null) { - throw new IllegalArgumentException("Parameter applicationDefinitionId is required and cannot be null."); + public Observable> deleteByIdWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (applicationDefinitionName == null) { + throw new IllegalArgumentException("Parameter applicationDefinitionName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - Observable> observable = service.deleteById(applicationDefinitionId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()); + Observable> observable = service.deleteById(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()); return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } /** * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws ErrorResponseException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent */ - public void beginDeleteById(String applicationDefinitionId) { - beginDeleteByIdWithServiceResponseAsync(applicationDefinitionId).toBlocking().single().body(); + public void beginDeleteById(String resourceGroupName, String applicationDefinitionName) { + beginDeleteByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).toBlocking().single().body(); } /** * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @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 beginDeleteByIdAsync(String applicationDefinitionId, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginDeleteByIdWithServiceResponseAsync(applicationDefinitionId), serviceCallback); + public ServiceFuture beginDeleteByIdAsync(String resourceGroupName, String applicationDefinitionName, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(beginDeleteByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName), serviceCallback); } /** * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceResponse} object if successful. */ - public Observable beginDeleteByIdAsync(String applicationDefinitionId) { - return beginDeleteByIdWithServiceResponseAsync(applicationDefinitionId).map(new Func1, Void>() { + public Observable beginDeleteByIdAsync(String resourceGroupName, String applicationDefinitionName) { + return beginDeleteByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName).map(new Func1, Void>() { @Override public Void call(ServiceResponse response) { return response.body(); @@ -818,18 +840,25 @@ public Void call(ServiceResponse response) { /** * Deletes the managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceResponse} object if successful. */ - public Observable> beginDeleteByIdWithServiceResponseAsync(String applicationDefinitionId) { - if (applicationDefinitionId == null) { - throw new IllegalArgumentException("Parameter applicationDefinitionId is required and cannot be null."); + public Observable> beginDeleteByIdWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); + } + if (applicationDefinitionName == null) { + throw new IllegalArgumentException("Parameter applicationDefinitionName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - return service.beginDeleteById(applicationDefinitionId, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + return service.beginDeleteById(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { @@ -855,40 +884,43 @@ private ServiceResponse beginDeleteByIdDelegate(Response res /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws ErrorResponseException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the ApplicationDefinitionInner object if successful. */ - public ApplicationDefinitionInner createOrUpdateById(String applicationDefinitionId, ApplicationDefinitionInner parameters) { - return createOrUpdateByIdWithServiceResponseAsync(applicationDefinitionId, parameters).toBlocking().last().body(); + public ApplicationDefinitionInner createOrUpdateById(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + return createOrUpdateByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName, parameters).toBlocking().last().body(); } /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @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 createOrUpdateByIdAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(createOrUpdateByIdWithServiceResponseAsync(applicationDefinitionId, parameters), serviceCallback); + public ServiceFuture createOrUpdateByIdAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(createOrUpdateByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName, parameters), serviceCallback); } /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable for the request */ - public Observable createOrUpdateByIdAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters) { - return createOrUpdateByIdWithServiceResponseAsync(applicationDefinitionId, parameters).map(new Func1, ApplicationDefinitionInner>() { + public Observable createOrUpdateByIdAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + return createOrUpdateByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName, parameters).map(new Func1, ApplicationDefinitionInner>() { @Override public ApplicationDefinitionInner call(ServiceResponse response) { return response.body(); @@ -899,63 +931,73 @@ public ApplicationDefinitionInner call(ServiceResponse> createOrUpdateByIdWithServiceResponseAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters) { - if (applicationDefinitionId == null) { - throw new IllegalArgumentException("Parameter applicationDefinitionId is required and cannot be null."); + public Observable> createOrUpdateByIdWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); + if (applicationDefinitionName == null) { + throw new IllegalArgumentException("Parameter applicationDefinitionName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } + if (parameters == null) { + throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); + } Validator.validate(parameters); - Observable> observable = service.createOrUpdateById(applicationDefinitionId, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()); + Observable> observable = service.createOrUpdateById(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent()); return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); } /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @throws ErrorResponseException thrown if the request is rejected by server * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the ApplicationDefinitionInner object if successful. */ - public ApplicationDefinitionInner beginCreateOrUpdateById(String applicationDefinitionId, ApplicationDefinitionInner parameters) { - return beginCreateOrUpdateByIdWithServiceResponseAsync(applicationDefinitionId, parameters).toBlocking().single().body(); + public ApplicationDefinitionInner beginCreateOrUpdateById(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + return beginCreateOrUpdateByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName, parameters).toBlocking().single().body(); } /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @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 beginCreateOrUpdateByIdAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(beginCreateOrUpdateByIdWithServiceResponseAsync(applicationDefinitionId, parameters), serviceCallback); + public ServiceFuture beginCreateOrUpdateByIdAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters, final ServiceCallback serviceCallback) { + return ServiceFuture.fromResponse(beginCreateOrUpdateByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName, parameters), serviceCallback); } /** * Creates a new managed application definition. * - * @param applicationDefinitionId The fully qualified ID of the managed application definition, including the managed application name and the managed application definition resource type. Use the format, /subscriptions/{guid}/resourceGroups/{resource-group-name}/Microsoft.Solutions/applicationDefinitions/{applicationDefinition-name} + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param applicationDefinitionName The name of the managed application definition. * @param parameters Parameters supplied to the create or update a managed application definition. * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ApplicationDefinitionInner object */ - public Observable beginCreateOrUpdateByIdAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters) { - return beginCreateOrUpdateByIdWithServiceResponseAsync(applicationDefinitionId, parameters).map(new Func1, ApplicationDefinitionInner>() { + public Observable beginCreateOrUpdateByIdAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + return beginCreateOrUpdateByIdWithServiceResponseAsync(resourceGroupName, applicationDefinitionName, parameters).map(new Func1, ApplicationDefinitionInner>() { @Override public ApplicationDefinitionInner call(ServiceResponse response) { return response.body(); @@ -966,23 +1008,30 @@ public ApplicationDefinitionInner call(ServiceResponse> beginCreateOrUpdateByIdWithServiceResponseAsync(String applicationDefinitionId, ApplicationDefinitionInner parameters) { - if (applicationDefinitionId == null) { - throw new IllegalArgumentException("Parameter applicationDefinitionId is required and cannot be null."); + public Observable> beginCreateOrUpdateByIdWithServiceResponseAsync(String resourceGroupName, String applicationDefinitionName, ApplicationDefinitionInner parameters) { + if (resourceGroupName == null) { + throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } - if (parameters == null) { - throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); + if (applicationDefinitionName == null) { + throw new IllegalArgumentException("Parameter applicationDefinitionName is required and cannot be null."); + } + if (this.client.subscriptionId() == null) { + throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } + if (parameters == null) { + throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); + } Validator.validate(parameters); - return service.beginCreateOrUpdateById(applicationDefinitionId, parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) + return service.beginCreateOrUpdateById(resourceGroupName, applicationDefinitionName, this.client.subscriptionId(), this.client.apiVersion(), parameters, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override public Observable> call(Response response) { diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationImpl.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationImpl.java index 005736b442620..55ee46aca40d0 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationImpl.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationImpl.java @@ -11,11 +11,12 @@ import com.microsoft.azure.arm.resources.models.implementation.GroupableResourceCoreImpl; import com.microsoft.azure.management.managedapplications.v2019_07_01.Application; import rx.Observable; +import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationPatchable; +import java.util.List; import com.microsoft.azure.management.managedapplications.v2019_07_01.Sku; import com.microsoft.azure.management.managedapplications.v2019_07_01.ProvisioningState; import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationBillingDetailsDefinition; import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationJitAccessPolicy; -import java.util.List; import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationAuthorization; import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationManagementMode; import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationPackageContact; @@ -24,23 +25,41 @@ import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationClientDetails; import com.microsoft.azure.management.managedapplications.v2019_07_01.Plan; import com.microsoft.azure.management.managedapplications.v2019_07_01.Identity; +import com.microsoft.azure.management.managedapplications.v2019_07_01.PlanPatchable; +import rx.functions.Func1; class ApplicationImpl extends GroupableResourceCoreImpl implements Application, Application.Definition, Application.Update { + private ApplicationPatchable updateParameter; ApplicationImpl(String name, ApplicationInner inner, ManagedApplicationsManager manager) { super(name, inner, manager); + this.updateParameter = new ApplicationPatchable(); } @Override public Observable createResourceAsync() { ApplicationsInner client = this.manager().inner().applications(); return client.createOrUpdateAsync(this.resourceGroupName(), this.name(), this.inner()) + .map(new Func1() { + @Override + public ApplicationInner call(ApplicationInner resource) { + resetCreateUpdateParameters(); + return resource; + } + }) .map(innerToFluentMap(this)); } @Override public Observable updateResourceAsync() { ApplicationsInner client = this.manager().inner().applications(); - return client.updateAsync(this.resourceGroupName(), this.name(), this.inner()) + return client.updateAsync(this.resourceGroupName(), this.name(), this.updateParameter) + .map(new Func1() { + @Override + public ApplicationInner call(ApplicationInner resource) { + resetCreateUpdateParameters(); + return resource; + } + }) .map(innerToFluentMap(this)); } @@ -55,6 +74,9 @@ public boolean isInCreateMode() { return this.inner().id() == null; } + private void resetCreateUpdateParameters() { + this.updateParameter = new ApplicationPatchable(); + } @Override public String applicationDefinitionId() { @@ -156,57 +178,95 @@ public ApplicationClientDetails updatedBy() { return this.inner().updatedBy(); } + @Override + public ApplicationImpl withPlan(Plan plan) { + this.inner().withPlan(plan); + return this; + } + + @Override + public ApplicationImpl withPlan(PlanPatchable plan) { + this.updateParameter.withPlan(plan); + return this; + } + @Override public ApplicationImpl withKind(String kind) { - this.inner().withKind(kind); + if (isInCreateMode()) { + this.inner().withKind(kind); + } else { + this.updateParameter.withKind(kind); + } return this; } @Override public ApplicationImpl withApplicationDefinitionId(String applicationDefinitionId) { - this.inner().withApplicationDefinitionId(applicationDefinitionId); + if (isInCreateMode()) { + this.inner().withApplicationDefinitionId(applicationDefinitionId); + } else { + this.updateParameter.withApplicationDefinitionId(applicationDefinitionId); + } return this; } @Override public ApplicationImpl withIdentity(Identity identity) { - this.inner().withIdentity(identity); + if (isInCreateMode()) { + this.inner().withIdentity(identity); + } else { + this.updateParameter.withIdentity(identity); + } return this; } @Override public ApplicationImpl withJitAccessPolicy(ApplicationJitAccessPolicy jitAccessPolicy) { - this.inner().withJitAccessPolicy(jitAccessPolicy); + if (isInCreateMode()) { + this.inner().withJitAccessPolicy(jitAccessPolicy); + } else { + this.updateParameter.withJitAccessPolicy(jitAccessPolicy); + } return this; } @Override public ApplicationImpl withManagedBy(String managedBy) { - this.inner().withManagedBy(managedBy); + if (isInCreateMode()) { + this.inner().withManagedBy(managedBy); + } else { + this.updateParameter.withManagedBy(managedBy); + } return this; } @Override public ApplicationImpl withManagedResourceGroupId(String managedResourceGroupId) { - this.inner().withManagedResourceGroupId(managedResourceGroupId); + if (isInCreateMode()) { + this.inner().withManagedResourceGroupId(managedResourceGroupId); + } else { + this.updateParameter.withManagedResourceGroupId(managedResourceGroupId); + } return this; } @Override public ApplicationImpl withParameters(Object parameters) { - this.inner().withParameters(parameters); - return this; - } - - @Override - public ApplicationImpl withPlan(Plan plan) { - this.inner().withPlan(plan); + if (isInCreateMode()) { + this.inner().withParameters(parameters); + } else { + this.updateParameter.withParameters(parameters); + } return this; } @Override public ApplicationImpl withSku(Sku sku) { - this.inner().withSku(sku); + if (isInCreateMode()) { + this.inner().withSku(sku); + } else { + this.updateParameter.withSku(sku); + } return this; } diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java index ff07a7fe07270..25dc9df999e0e 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsImpl.java @@ -125,6 +125,18 @@ public ApplicationImpl define(String name) { return wrapModel(name); } + @Override + public Observable getByIdAsync(String applicationId) { + ApplicationsInner client = this.inner(); + return client.getByIdAsync(applicationId) + .map(new Func1() { + @Override + public Application call(ApplicationInner inner) { + return new ApplicationImpl(inner.name(), inner, manager()); + } + }); + } + @Override public Completable deleteByIdAsync(String applicationId) { ApplicationsInner client = this.inner(); diff --git a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsInner.java b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsInner.java index 38085e320de53..cd0f43f9b4bf3 100644 --- a/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsInner.java +++ b/sdk/managedapplications/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/managedapplications/v2019_07_01/implementation/ApplicationsInner.java @@ -15,6 +15,7 @@ import com.google.common.reflect.TypeToken; import com.microsoft.azure.AzureServiceFuture; import com.microsoft.azure.ListOperationCallback; +import com.microsoft.azure.management.managedapplications.v2019_07_01.ApplicationPatchable; import com.microsoft.azure.management.managedapplications.v2019_07_01.ErrorResponseException; import com.microsoft.azure.Page; import com.microsoft.azure.PagedList; @@ -88,7 +89,7 @@ interface ApplicationsService { @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.managedapplications.v2019_07_01.Applications update" }) @PATCH("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applications/{applicationName}") - Observable> update(@Path("resourceGroupName") String resourceGroupName, @Path("applicationName") String applicationName, @Path("subscriptionId") String subscriptionId, @Body ApplicationInner parameters, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + Observable> update(@Path("resourceGroupName") String resourceGroupName, @Path("applicationName") String applicationName, @Path("subscriptionId") String subscriptionId, @Body ApplicationPatchable 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.managedapplications.v2019_07_01.Applications listByResourceGroup" }) @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Solutions/applications") @@ -617,7 +618,7 @@ public Observable> updateWithServiceResponseAs if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - final ApplicationInner parameters = null; + final ApplicationPatchable parameters = null; return service.update(resourceGroupName, applicationName, this.client.subscriptionId(), parameters, this.client.apiVersion(), this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -643,7 +644,7 @@ public Observable> call(Response * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent * @return the ApplicationInner object if successful. */ - public ApplicationInner update(String resourceGroupName, String applicationName, ApplicationInner parameters) { + public ApplicationInner update(String resourceGroupName, String applicationName, ApplicationPatchable parameters) { return updateWithServiceResponseAsync(resourceGroupName, applicationName, parameters).toBlocking().single().body(); } @@ -657,7 +658,7 @@ public ApplicationInner update(String resourceGroupName, String applicationName, * @throws IllegalArgumentException thrown if parameters fail the validation * @return the {@link ServiceFuture} object */ - public ServiceFuture updateAsync(String resourceGroupName, String applicationName, ApplicationInner parameters, final ServiceCallback serviceCallback) { + public ServiceFuture updateAsync(String resourceGroupName, String applicationName, ApplicationPatchable parameters, final ServiceCallback serviceCallback) { return ServiceFuture.fromResponse(updateWithServiceResponseAsync(resourceGroupName, applicationName, parameters), serviceCallback); } @@ -670,7 +671,7 @@ public ServiceFuture updateAsync(String resourceGroupName, Str * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ApplicationInner object */ - public Observable updateAsync(String resourceGroupName, String applicationName, ApplicationInner parameters) { + public Observable updateAsync(String resourceGroupName, String applicationName, ApplicationPatchable parameters) { return updateWithServiceResponseAsync(resourceGroupName, applicationName, parameters).map(new Func1, ApplicationInner>() { @Override public ApplicationInner call(ServiceResponse response) { @@ -688,7 +689,7 @@ public ApplicationInner call(ServiceResponse response) { * @throws IllegalArgumentException thrown if parameters fail the validation * @return the observable to the ApplicationInner object */ - public Observable> updateWithServiceResponseAsync(String resourceGroupName, String applicationName, ApplicationInner parameters) { + public Observable> updateWithServiceResponseAsync(String resourceGroupName, String applicationName, ApplicationPatchable parameters) { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); }