Skip to content

Commit

Permalink
Generated from edd74f0a1be6f17caa185525a63e594aef956acc (#230)
Browse files Browse the repository at this point in the history
Addressed review comments.
  • Loading branch information
openapi-sdkautomation[bot] authored Aug 28, 2019
1 parent da5b57e commit 956c9f6
Show file tree
Hide file tree
Showing 19 changed files with 87 additions and 62 deletions.
12 changes: 5 additions & 7 deletions resources/resource-manager/v2016_09_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
<version>0.0.3-beta</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>azure-mgmt-resources</artifactId>
<version>1.0.0-beta</version>
<packaging>jar</packaging>
<name>Microsoft Azure SDK for Resources Management</name>
<description>This package contains Microsoft Resources Management SDK.</description>
<url>https://github.com/Azure/azure-libraries-for-java</url>
<url>https://github.com/Azure/azure-sdk-for-java</url>
<licenses>
<license>
<name>The MIT License (MIT)</name>
Expand All @@ -28,8 +28,8 @@
</license>
</licenses>
<scm>
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-libraries-for-java.git</connection>
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
<connection>scm:git:git@github.com:Azure/azure-sdk-for-java.git</connection>
<tag>HEAD</tag>
</scm>
<properties>
Expand Down Expand Up @@ -71,8 +71,6 @@
<artifactId>azure-arm-client-runtime</artifactId>
<type>test-jar</type>
<scope>test</scope>
<!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
<version>1.6.5</version>
</dependency>
</dependencies>
<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ interface Blank extends WithResourceGroupName {
interface WithResourceGroupName {
/**
* Specifies resourceGroupName.
* @param resourceGroupName The name of the resource group to deploy the resources to. The name is case insensitive. The resource group must already exist
* @return the next definition stage
*/
WithProperties withResourceGroupName(String resourceGroupName);
}
Expand All @@ -69,6 +71,8 @@ interface WithResourceGroupName {
interface WithProperties {
/**
* Specifies properties.
* @param properties The deployment properties
* @return the next definition stage
*/
WithCreate withProperties(DeploymentProperties properties);
}
Expand Down Expand Up @@ -97,6 +101,8 @@ interface UpdateStages {
interface WithProperties {
/**
* Specifies properties.
* @param properties The deployment properties
* @return the next update stage
*/
Update withProperties(DeploymentProperties properties);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class DeploymentPropertiesExtended {
private DateTime timestamp;

/**
* Key/value pairs that represent deploymentoutput.
* Key/value pairs that represent deployment output.
*/
@JsonProperty(value = "outputs")
private Object outputs;
Expand Down Expand Up @@ -120,7 +120,7 @@ public DateTime timestamp() {
}

/**
* Get key/value pairs that represent deploymentoutput.
* Get key/value pairs that represent deployment output.
*
* @return the outputs value
*/
Expand All @@ -129,7 +129,7 @@ public Object outputs() {
}

/**
* Set key/value pairs that represent deploymentoutput.
* Set key/value pairs that represent deployment output.
*
* @param outputs the outputs value to set
* @return the DeploymentPropertiesExtended object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public interface Deployments extends SupportsCreating<DeploymentExtended.Definit
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable checkExistenceAsync(String resourceGroupName, String deploymentName);
Observable<Boolean> checkExistenceAsync(String resourceGroupName, String deploymentName);

/**
* Cancels a currently running template deployment.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
*/
public class ExportTemplateRequest {
/**
* The IDs of the resources. The only supported string currently is '*'
* (all resources). Future updates will support exporting specific
* resources.
* The IDs of the resources to filter the export by. To export all
* resources, supply an array with single entry '*'.
*/
@JsonProperty(value = "resources")
private List<String> resources;

/**
* The export template options. Supported values include
* 'IncludeParameterDefaultValue', 'IncludeComments' or
* 'IncludeParameterDefaultValue, IncludeComments.
* The export template options. A CSV-formatted list containing zero or
* more of the following: 'IncludeParameterDefaultValue',
* 'IncludeComments', 'SkipResourceNameParameterization',
* 'SkipAllParameterization'.
*/
@JsonProperty(value = "options")
private String options;

/**
* Get the IDs of the resources. The only supported string currently is '*' (all resources). Future updates will support exporting specific resources.
* Get the IDs of the resources to filter the export by. To export all resources, supply an array with single entry '*'.
*
* @return the resources value
*/
Expand All @@ -41,7 +41,7 @@ public List<String> resources() {
}

/**
* Set the IDs of the resources. The only supported string currently is '*' (all resources). Future updates will support exporting specific resources.
* Set the IDs of the resources to filter the export by. To export all resources, supply an array with single entry '*'.
*
* @param resources the resources value to set
* @return the ExportTemplateRequest object itself.
Expand All @@ -52,7 +52,7 @@ public ExportTemplateRequest withResources(List<String> resources) {
}

/**
* Get the export template options. Supported values include 'IncludeParameterDefaultValue', 'IncludeComments' or 'IncludeParameterDefaultValue, IncludeComments.
* Get the export template options. A CSV-formatted list containing zero or more of the following: 'IncludeParameterDefaultValue', 'IncludeComments', 'SkipResourceNameParameterization', 'SkipAllParameterization'.
*
* @return the options value
*/
Expand All @@ -61,7 +61,7 @@ public String options() {
}

/**
* Set the export template options. Supported values include 'IncludeParameterDefaultValue', 'IncludeComments' or 'IncludeParameterDefaultValue, IncludeComments.
* Set the export template options. A CSV-formatted list containing zero or more of the following: 'IncludeParameterDefaultValue', 'IncludeComments', 'SkipResourceNameParameterization', 'SkipAllParameterization'.
*
* @param options the options value to set
* @return the ExportTemplateRequest object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.fasterxml.jackson.annotation.JsonProperty;

/**
* Entity representing the reference to the deployment paramaters.
* Entity representing the reference to the deployment parameters.
*/
public class ParametersLink {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ interface Blank extends WithSubscription {
interface WithSubscription {
/**
* Specifies .
* @return the next definition stage
*/
WithLocation withExistingSubscription();
}
Expand All @@ -85,6 +86,8 @@ interface WithSubscription {
interface WithLocation {
/**
* Specifies location.
* @param location The location of the resource group. It cannot be changed after the resource group has been created. It must be one of the supported Azure locations
* @return the next definition stage
*/
WithCreate withLocation(String location);
}
Expand All @@ -95,6 +98,8 @@ interface WithLocation {
interface WithManagedBy {
/**
* Specifies managedBy.
* @param managedBy The ID of the resource that manages this resource group
* @return the next definition stage
*/
WithCreate withManagedBy(String managedBy);
}
Expand All @@ -105,6 +110,8 @@ interface WithManagedBy {
interface WithName {
/**
* Specifies name.
* @param name The name of the resource group
* @return the next definition stage
*/
WithCreate withName(String name);
}
Expand All @@ -115,6 +122,8 @@ interface WithName {
interface WithProperties {
/**
* Specifies properties.
* @param properties the properties parameter value
* @return the next definition stage
*/
WithCreate withProperties(ResourceGroupProperties properties);
}
Expand All @@ -125,6 +134,8 @@ interface WithProperties {
interface WithTags {
/**
* Specifies tags.
* @param tags The tags attached to the resource group
* @return the next definition stage
*/
WithCreate withTags(Map<String, String> tags);
}
Expand Down Expand Up @@ -153,6 +164,8 @@ interface UpdateStages {
interface WithManagedBy {
/**
* Specifies managedBy.
* @param managedBy The ID of the resource that manages this resource group
* @return the next update stage
*/
Update withManagedBy(String managedBy);
}
Expand All @@ -163,6 +176,8 @@ interface WithManagedBy {
interface WithName {
/**
* Specifies name.
* @param name The name of the resource group
* @return the next update stage
*/
Update withName(String name);
}
Expand All @@ -173,6 +188,8 @@ interface WithName {
interface WithProperties {
/**
* Specifies properties.
* @param properties the properties parameter value
* @return the next update stage
*/
Update withProperties(ResourceGroupProperties properties);
}
Expand All @@ -183,6 +200,8 @@ interface WithProperties {
interface WithTags {
/**
* Specifies tags.
* @param tags The tags attached to the resource group
* @return the next update stage
*/
Update withTags(Map<String, String> tags);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface ResourceGroups extends SupportsCreating<ResourceGroup.Definitio
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable checkExistenceAsync(String resourceGroupName);
Observable<Boolean> checkExistenceAsync(String resourceGroupName);

/**
* Captures the specified resource group as a template.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public interface Resources extends HasInner<ResourcesInner> {
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable checkExistenceByIdAsync(String resourceId, String apiVersion);
Observable<Boolean> checkExistenceByIdAsync(String resourceId, String apiVersion);

/**
* Deletes a resource by ID.
Expand Down Expand Up @@ -82,7 +82,7 @@ public interface Resources extends HasInner<ResourcesInner> {
* Moves resources from one resource group to another resource group.
* The resources to move must be in the same source resource group. The target resource group may be in a different subscription. When moving resources, both the source group and the target group are locked for the duration of the operation. Write and delete operations are blocked on the groups until the move completes.
*
* @param sourceResourceGroupName The name of the resource group containing the rsources to move.
* @param sourceResourceGroupName The name of the resource group containing the resources to move.
* @param parameters Parameters for moving resources.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
Expand All @@ -101,7 +101,7 @@ public interface Resources extends HasInner<ResourcesInner> {
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable checkExistenceAsync(String resourceGroupName, String resourceProviderNamespace, String parentResourcePath, String resourceType, String resourceName, String apiVersion);
Observable<Boolean> checkExistenceAsync(String resourceGroupName, String resourceProviderNamespace, String parentResourcePath, String resourceType, String resourceName, String apiVersion);

/**
* Deletes a resource.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ class DeploymentExtendedImpl extends CreatableUpdatableImpl<DeploymentExtended,
this.manager = manager;
// Set resource name
this.deploymentName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourcegroups");
this.deploymentName = IdParsingUtils.getValueFromIdByName(inner.id(), "deployments");
//
// set other parameters for create and update
this.cproperties = new DeploymentProperties();
this.uproperties = new DeploymentProperties();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class DeploymentOperationImpl extends IndexableRefreshableWrapperImpl<Deployment
DeploymentOperationImpl(DeploymentOperationInner inner, ResourcesManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourcegroups");
this.deploymentName = IdParsingUtils.getValueFromIdByName(inner.id(), "deployments");
this.operationId = IdParsingUtils.getValueFromIdByName(inner.id(), "operations");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@ private DeploymentExtendedImpl wrapModel(String name) {
}

@Override
public Completable checkExistenceAsync(String resourceGroupName, String deploymentName) {
public Observable<Boolean> checkExistenceAsync(String resourceGroupName, String deploymentName) {
DeploymentsInner client = this.inner();
return client.checkExistenceAsync(resourceGroupName, deploymentName).toCompletable();
}
return client.checkExistenceAsync(resourceGroupName, deploymentName)
;}

@Override
public Completable cancelAsync(String resourceGroupName, String deploymentName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class ProviderImpl extends IndexableRefreshableWrapperImpl<Provider, ProviderInn
ProviderImpl(ProviderInner inner, ResourcesManager manager) {
super(null, inner);
this.manager = manager;
// set resource ancestor and positional variables
this.resourceProviderNamespace = IdParsingUtils.getValueFromIdByName(inner.id(), "providers");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class ResourceGroupImpl extends CreatableUpdatableImpl<ResourceGroup, ResourceGr
this.manager = manager;
// Set resource name
this.resourceGroupName = inner.name();
// resource ancestor names
// set resource ancestor and positional variables
this.resourceGroupName = IdParsingUtils.getValueFromIdByName(inner.id(), "resourcegroups");
//
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class ResourceGroupInner {

/**
* The location of the resource group. It cannot be changed after the
* resource group has been created. It muct be one of the supported Azure
* resource group has been created. It must be one of the supported Azure
* locations.
*/
@JsonProperty(value = "location", required = true)
Expand Down Expand Up @@ -104,7 +104,7 @@ public ResourceGroupInner withProperties(ResourceGroupProperties properties) {
}

/**
* Get the location of the resource group. It cannot be changed after the resource group has been created. It muct be one of the supported Azure locations.
* Get the location of the resource group. It cannot be changed after the resource group has been created. It must be one of the supported Azure locations.
*
* @return the location value
*/
Expand All @@ -113,7 +113,7 @@ public String location() {
}

/**
* Set the location of the resource group. It cannot be changed after the resource group has been created. It muct be one of the supported Azure locations.
* Set the location of the resource group. It cannot be changed after the resource group has been created. It must be one of the supported Azure locations.
*
* @param location the location value to set
* @return the ResourceGroupInner object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ private ResourceGroupImpl wrapModel(String name) {
}

@Override
public Completable checkExistenceAsync(String resourceGroupName) {
public Observable<Boolean> checkExistenceAsync(String resourceGroupName) {
ResourceGroupsInner client = this.inner();
return client.checkExistenceAsync(resourceGroupName).toCompletable();
}
return client.checkExistenceAsync(resourceGroupName)
;}

@Override
public Observable<ResourceGroupExportResult> exportTemplateAsync(String resourceGroupName, ExportTemplateRequest parameters) {
Expand Down
Loading

0 comments on commit 956c9f6

Please sign in to comment.