Skip to content

Commit d59eed9

Browse files
author
SDKAuto
committed
CodeGen from PR 11921 in Azure/azure-rest-api-specs
Merge a469ccf8f847744de6a173bac75df05ac9014e2a into b5702b7d62e824b5cabd4b507dc794e81c873642
1 parent 33362b5 commit d59eed9

39 files changed

+2147
-298
lines changed

sdk/resources/mgmt-v2016_09_01/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.2.0</version>
15-
<relativePath>../../parents/azure-arm-parent</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-resources</artifactId>
1818
<version>1.0.0-beta</version>
1919
<packaging>jar</packaging>
2020
<name>Microsoft Azure SDK for Resources Management</name>
2121
<description>This package contains Microsoft Resources Management SDK.</description>
22-
<url>https://github.com/Azure/azure-libraries-for-java</url>
22+
<url>https://github.com/Azure/azure-sdk-for-java</url>
2323
<licenses>
2424
<license>
2525
<name>The MIT License (MIT)</name>
@@ -28,8 +28,8 @@
2828
</license>
2929
</licenses>
3030
<scm>
31-
<url>scm:git:https://github.com/Azure/azure-libraries-for-java</url>
32-
<connection>scm:git:[email protected]:Azure/azure-libraries-for-java.git</connection>
31+
<url>scm:git:https://github.com/Azure/azure-sdk-for-java</url>
32+
<connection>scm:git:[email protected]:Azure/azure-sdk-for-java.git</connection>
3333
<tag>HEAD</tag>
3434
</scm>
3535
<properties>

sdk/resources/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/resources/v2016_09_01/DeploymentExtended.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ interface Blank extends WithResourceGroupName {
5959
interface WithResourceGroupName {
6060
/**
6161
* Specifies resourceGroupName.
62+
* @param resourceGroupName The name of the resource group to deploy the resources to. The name is case insensitive. The resource group must already exist
63+
* @return the next definition stage
6264
*/
6365
WithProperties withResourceGroupName(String resourceGroupName);
6466
}
@@ -69,6 +71,8 @@ interface WithResourceGroupName {
6971
interface WithProperties {
7072
/**
7173
* Specifies properties.
74+
* @param properties The deployment properties
75+
* @return the next definition stage
7276
*/
7377
WithCreate withProperties(DeploymentProperties properties);
7478
}
@@ -97,6 +101,8 @@ interface UpdateStages {
97101
interface WithProperties {
98102
/**
99103
* Specifies properties.
104+
* @param properties The deployment properties
105+
* @return the next update stage
100106
*/
101107
Update withProperties(DeploymentProperties properties);
102108
}

sdk/resources/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/resources/v2016_09_01/DeploymentPropertiesExtended.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class DeploymentPropertiesExtended {
3636
private DateTime timestamp;
3737

3838
/**
39-
* Key/value pairs that represent deploymentoutput.
39+
* Key/value pairs that represent deployment output.
4040
*/
4141
@JsonProperty(value = "outputs")
4242
private Object outputs;
@@ -120,7 +120,7 @@ public DateTime timestamp() {
120120
}
121121

122122
/**
123-
* Get key/value pairs that represent deploymentoutput.
123+
* Get key/value pairs that represent deployment output.
124124
*
125125
* @return the outputs value
126126
*/
@@ -129,7 +129,7 @@ public Object outputs() {
129129
}
130130

131131
/**
132-
* Set key/value pairs that represent deploymentoutput.
132+
* Set key/value pairs that represent deployment output.
133133
*
134134
* @param outputs the outputs value to set
135135
* @return the DeploymentPropertiesExtended object itself.

sdk/resources/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/resources/v2016_09_01/Deployments.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public interface Deployments extends SupportsCreating<DeploymentExtended.Definit
3030
* @throws IllegalArgumentException thrown if parameters fail the validation
3131
* @return the observable for the request
3232
*/
33-
Completable checkExistenceAsync(String resourceGroupName, String deploymentName);
33+
Observable<Boolean> checkExistenceAsync(String resourceGroupName, String deploymentName);
3434

3535
/**
3636
* Cancels a currently running template deployment.
@@ -64,4 +64,13 @@ public interface Deployments extends SupportsCreating<DeploymentExtended.Definit
6464
*/
6565
Observable<DeploymentExportResult> exportTemplateAsync(String resourceGroupName, String deploymentName);
6666

67+
/**
68+
* Calculate the hash of the given template.
69+
*
70+
* @param template The template provided to calculate hash.
71+
* @throws IllegalArgumentException thrown if parameters fail the validation
72+
* @return the observable for the request
73+
*/
74+
Observable<TemplateHashResult> calculateTemplateHashAsync(Object template);
75+
6776
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/**
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for
4+
* license information.
5+
*
6+
* Code generated by Microsoft (R) AutoRest Code Generator.
7+
*/
8+
9+
package com.microsoft.azure.management.resources.v2016_09_01;
10+
11+
import com.fasterxml.jackson.annotation.JsonProperty;
12+
13+
/**
14+
* The resource management error additional info.
15+
*/
16+
public class ErrorAdditionalInfo {
17+
/**
18+
* The additional info type.
19+
*/
20+
@JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
21+
private String type;
22+
23+
/**
24+
* The additional info.
25+
*/
26+
@JsonProperty(value = "info", access = JsonProperty.Access.WRITE_ONLY)
27+
private Object info;
28+
29+
/**
30+
* Get the additional info type.
31+
*
32+
* @return the type value
33+
*/
34+
public String type() {
35+
return this.type;
36+
}
37+
38+
/**
39+
* Get the additional info.
40+
*
41+
* @return the info value
42+
*/
43+
public Object info() {
44+
return this.info;
45+
}
46+
47+
}
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
/**
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for
4+
* license information.
5+
*
6+
* Code generated by Microsoft (R) AutoRest Code Generator.
7+
*/
8+
9+
package com.microsoft.azure.management.resources.v2016_09_01;
10+
11+
import java.util.List;
12+
import com.fasterxml.jackson.annotation.JsonProperty;
13+
14+
/**
15+
* Error Response.
16+
* Common error response for all Azure Resource Manager APIs to return error
17+
* details for failed operations. (This also follows the OData error response
18+
* format.).
19+
*/
20+
public class ErrorResponse {
21+
/**
22+
* The error code.
23+
*/
24+
@JsonProperty(value = "code", access = JsonProperty.Access.WRITE_ONLY)
25+
private String code;
26+
27+
/**
28+
* The error message.
29+
*/
30+
@JsonProperty(value = "message", access = JsonProperty.Access.WRITE_ONLY)
31+
private String message;
32+
33+
/**
34+
* The error target.
35+
*/
36+
@JsonProperty(value = "target", access = JsonProperty.Access.WRITE_ONLY)
37+
private String target;
38+
39+
/**
40+
* The error details.
41+
*/
42+
@JsonProperty(value = "details", access = JsonProperty.Access.WRITE_ONLY)
43+
private List<ErrorResponse> details;
44+
45+
/**
46+
* The error additional info.
47+
*/
48+
@JsonProperty(value = "additionalInfo", access = JsonProperty.Access.WRITE_ONLY)
49+
private List<ErrorAdditionalInfo> additionalInfo;
50+
51+
/**
52+
* Get the error code.
53+
*
54+
* @return the code value
55+
*/
56+
public String code() {
57+
return this.code;
58+
}
59+
60+
/**
61+
* Get the error message.
62+
*
63+
* @return the message value
64+
*/
65+
public String message() {
66+
return this.message;
67+
}
68+
69+
/**
70+
* Get the error target.
71+
*
72+
* @return the target value
73+
*/
74+
public String target() {
75+
return this.target;
76+
}
77+
78+
/**
79+
* Get the error details.
80+
*
81+
* @return the details value
82+
*/
83+
public List<ErrorResponse> details() {
84+
return this.details;
85+
}
86+
87+
/**
88+
* Get the error additional info.
89+
*
90+
* @return the additionalInfo value
91+
*/
92+
public List<ErrorAdditionalInfo> additionalInfo() {
93+
return this.additionalInfo;
94+
}
95+
96+
}

sdk/resources/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/resources/v2016_09_01/ExportTemplateRequest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@
1616
*/
1717
public class ExportTemplateRequest {
1818
/**
19-
* The IDs of the resources. The only supported string currently is '*'
20-
* (all resources). Future updates will support exporting specific
21-
* resources.
19+
* The IDs of the resources to filter the export by. To export all
20+
* resources, supply an array with single entry '*'.
2221
*/
2322
@JsonProperty(value = "resources")
2423
private List<String> resources;
2524

2625
/**
27-
* The export template options. Supported values include
28-
* 'IncludeParameterDefaultValue', 'IncludeComments' or
29-
* 'IncludeParameterDefaultValue, IncludeComments.
26+
* The export template options. A CSV-formatted list containing zero or
27+
* more of the following: 'IncludeParameterDefaultValue',
28+
* 'IncludeComments', 'SkipResourceNameParameterization',
29+
* 'SkipAllParameterization'.
3030
*/
3131
@JsonProperty(value = "options")
3232
private String options;
3333

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

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

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

6363
/**
64-
* Set the export template options. Supported values include 'IncludeParameterDefaultValue', 'IncludeComments' or 'IncludeParameterDefaultValue, IncludeComments.
64+
* Set the export template options. A CSV-formatted list containing zero or more of the following: 'IncludeParameterDefaultValue', 'IncludeComments', 'SkipResourceNameParameterization', 'SkipAllParameterization'.
6565
*
6666
* @param options the options value to set
6767
* @return the ExportTemplateRequest object itself.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
/**
2+
* Copyright (c) Microsoft Corporation. All rights reserved.
3+
* Licensed under the MIT License. See License.txt in the project root for
4+
* license information.
5+
*
6+
* Code generated by Microsoft (R) AutoRest Code Generator.
7+
*/
8+
9+
package com.microsoft.azure.management.resources.v2016_09_01;
10+
11+
import com.microsoft.azure.arm.model.HasInner;
12+
import com.microsoft.azure.arm.resources.models.HasManager;
13+
import com.microsoft.azure.management.resources.v2016_09_01.implementation.ResourcesManager;
14+
import com.microsoft.azure.management.resources.v2016_09_01.implementation.GenericResourceInner;
15+
import java.util.Map;
16+
17+
/**
18+
* Type representing GenericResource.
19+
*/
20+
public interface GenericResource extends HasInner<GenericResourceInner>, HasManager<ResourcesManager> {
21+
/**
22+
* @return the id value.
23+
*/
24+
String id();
25+
26+
/**
27+
* @return the identity value.
28+
*/
29+
Identity identity();
30+
31+
/**
32+
* @return the kind value.
33+
*/
34+
String kind();
35+
36+
/**
37+
* @return the location value.
38+
*/
39+
String location();
40+
41+
/**
42+
* @return the managedBy value.
43+
*/
44+
String managedBy();
45+
46+
/**
47+
* @return the name value.
48+
*/
49+
String name();
50+
51+
/**
52+
* @return the plan value.
53+
*/
54+
Plan plan();
55+
56+
/**
57+
* @return the properties value.
58+
*/
59+
Object properties();
60+
61+
/**
62+
* @return the sku value.
63+
*/
64+
Sku sku();
65+
66+
/**
67+
* @return the tags value.
68+
*/
69+
Map<String, String> tags();
70+
71+
/**
72+
* @return the type value.
73+
*/
74+
String type();
75+
76+
}

sdk/resources/mgmt-v2016_09_01/src/main/java/com/microsoft/azure/management/resources/v2016_09_01/ParametersLink.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import com.fasterxml.jackson.annotation.JsonProperty;
1212

1313
/**
14-
* Entity representing the reference to the deployment paramaters.
14+
* Entity representing the reference to the deployment parameters.
1515
*/
1616
public class ParametersLink {
1717
/**

0 commit comments

Comments
 (0)