Skip to content

Commit c09c2f3

Browse files
author
SDK Automation
committed
Update from master
1 parent 83a6538 commit c09c2f3

File tree

12 files changed

+448
-190
lines changed

12 files changed

+448
-190
lines changed

‎sdk/resources/mgmt-v2019_07_01/pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
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>
@@ -46,12 +46,10 @@
4646
<dependency>
4747
<groupId>com.microsoft.azure</groupId>
4848
<artifactId>azure-client-runtime</artifactId>
49-
<version>1.6.14</version>
5049
</dependency>
5150
<dependency>
5251
<groupId>com.microsoft.azure</groupId>
5352
<artifactId>azure-arm-client-runtime</artifactId>
54-
<version>1.6.14</version>
5553
</dependency>
5654
<dependency>
5755
<groupId>junit</groupId>

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/GenericResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
package com.microsoft.azure.management.resources.v2019_07_01;
1010

1111
import com.microsoft.azure.arm.model.HasInner;
12-
import com.microsoft.azure.management.resources.v2019_07_01.implementation.GenericResourceInner;
1312
import com.microsoft.azure.arm.resources.models.HasManager;
1413
import com.microsoft.azure.management.resources.v2019_07_01.implementation.ResourcesManager;
14+
import com.microsoft.azure.management.resources.v2019_07_01.implementation.GenericResourceInner;
1515
import java.util.Map;
1616

1717
/**

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/GenericResourceExpanded.java

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
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.v2019_07_01;
10+
11+
import com.microsoft.azure.arm.model.HasInner;
12+
import com.microsoft.azure.management.resources.v2019_07_01.implementation.GenericResourceExpandedInner;
13+
import com.microsoft.azure.arm.resources.models.HasManager;
14+
import com.microsoft.azure.management.resources.v2019_07_01.implementation.ResourcesManager;
15+
import org.joda.time.DateTime;
16+
import java.util.Map;
17+
18+
/**
19+
* Type representing GenericResourceExpanded.
20+
*/
21+
public interface GenericResourceExpanded extends HasInner<GenericResourceExpandedInner>, HasManager<ResourcesManager> {
22+
/**
23+
* @return the changedTime value.
24+
*/
25+
DateTime changedTime();
26+
27+
/**
28+
* @return the createdTime value.
29+
*/
30+
DateTime createdTime();
31+
32+
/**
33+
* @return the id value.
34+
*/
35+
String id();
36+
37+
/**
38+
* @return the identity value.
39+
*/
40+
Identity identity();
41+
42+
/**
43+
* @return the kind value.
44+
*/
45+
String kind();
46+
47+
/**
48+
* @return the location value.
49+
*/
50+
String location();
51+
52+
/**
53+
* @return the managedBy value.
54+
*/
55+
String managedBy();
56+
57+
/**
58+
* @return the name value.
59+
*/
60+
String name();
61+
62+
/**
63+
* @return the plan value.
64+
*/
65+
Plan plan();
66+
67+
/**
68+
* @return the properties value.
69+
*/
70+
Object properties();
71+
72+
/**
73+
* @return the provisioningState value.
74+
*/
75+
String provisioningState();
76+
77+
/**
78+
* @return the sku value.
79+
*/
80+
Sku sku();
81+
82+
/**
83+
* @return the tags value.
84+
*/
85+
Map<String, String> tags();
86+
87+
/**
88+
* @return the type value.
89+
*/
90+
String type();
91+
92+
}

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/Resources.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public interface Resources extends HasInner<ResourcesInner> {
2424
* @throws IllegalArgumentException thrown if parameters fail the validation
2525
* @return the observable for the request
2626
*/
27-
Observable<GenericResource> listAsync();
27+
Observable<GenericResourceExpanded> listAsync();
2828

2929
/**
3030
* Checks by ID whether a resource exists.
@@ -85,7 +85,7 @@ public interface Resources extends HasInner<ResourcesInner> {
8585
* @throws IllegalArgumentException thrown if parameters fail the validation
8686
* @return the observable for the request
8787
*/
88-
Observable<GenericResource> listByResourceGroupAsync(final String resourceGroupName);
88+
Observable<GenericResourceExpanded> listByResourceGroupAsync(final String resourceGroupName);
8989

9090
/**
9191
* Moves resources from one resource group to another resource group.

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/implementation/DeploymentsImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ public Observable<DeploymentExtended> getByResourceGroupAsync(String resourceGro
516516
return this.getInnerAsync(resourceGroupName, name).flatMap(new Func1<DeploymentExtendedInner, Observable<DeploymentExtended>> () {
517517
@Override
518518
public Observable<DeploymentExtended> call(DeploymentExtendedInner innerT) {
519-
if (innerT == null) {
519+
if (inner == null) {
520520
return Observable.empty();
521521
} else {
522522
return Observable.just((DeploymentExtended)wrapModel(innerT));

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/implementation/DeploymentsInner.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@
4545
import rx.Observable;
4646
import com.microsoft.azure.LongRunningFinalState;
4747
import com.microsoft.azure.LongRunningOperationOptions;
48-
import com.microsoft.azure.LongRunningFinalState;
49-
import com.microsoft.azure.LongRunningOperationOptions;
5048

5149
/**
5250
* An instance of this class provides access to all the operations defined

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/implementation/GenericResourceExpandedImpl.java

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
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.v2019_07_01.implementation;
10+
11+
import com.microsoft.azure.management.resources.v2019_07_01.GenericResourceExpanded;
12+
import com.microsoft.azure.arm.model.implementation.WrapperImpl;
13+
import rx.Observable;
14+
import org.joda.time.DateTime;
15+
import com.microsoft.azure.management.resources.v2019_07_01.Identity;
16+
import com.microsoft.azure.management.resources.v2019_07_01.Plan;
17+
import com.microsoft.azure.management.resources.v2019_07_01.Sku;
18+
import java.util.Map;
19+
20+
class GenericResourceExpandedImpl extends WrapperImpl<GenericResourceExpandedInner> implements GenericResourceExpanded {
21+
private final ResourcesManager manager;
22+
23+
GenericResourceExpandedImpl(GenericResourceExpandedInner inner, ResourcesManager manager) {
24+
super(inner);
25+
this.manager = manager;
26+
}
27+
28+
@Override
29+
public ResourcesManager manager() {
30+
return this.manager;
31+
}
32+
33+
34+
35+
@Override
36+
public DateTime changedTime() {
37+
return this.inner().changedTime();
38+
}
39+
40+
@Override
41+
public DateTime createdTime() {
42+
return this.inner().createdTime();
43+
}
44+
45+
@Override
46+
public String id() {
47+
return this.inner().id();
48+
}
49+
50+
@Override
51+
public Identity identity() {
52+
return this.inner().identity();
53+
}
54+
55+
@Override
56+
public String kind() {
57+
return this.inner().kind();
58+
}
59+
60+
@Override
61+
public String location() {
62+
return this.inner().location();
63+
}
64+
65+
@Override
66+
public String managedBy() {
67+
return this.inner().managedBy();
68+
}
69+
70+
@Override
71+
public String name() {
72+
return this.inner().name();
73+
}
74+
75+
@Override
76+
public Plan plan() {
77+
return this.inner().plan();
78+
}
79+
80+
@Override
81+
public Object properties() {
82+
return this.inner().properties();
83+
}
84+
85+
@Override
86+
public String provisioningState() {
87+
return this.inner().provisioningState();
88+
}
89+
90+
@Override
91+
public Sku sku() {
92+
return this.inner().sku();
93+
}
94+
95+
@Override
96+
public Map<String, String> tags() {
97+
return this.inner().getTags();
98+
}
99+
100+
@Override
101+
public String type() {
102+
return this.inner().type();
103+
}
104+
105+
}

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/implementation/GenericResourceExpandedInner.java

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
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.v2019_07_01.implementation;
10+
11+
import org.joda.time.DateTime;
12+
import com.fasterxml.jackson.annotation.JsonProperty;
13+
14+
/**
15+
* Resource information.
16+
*/
17+
public class GenericResourceExpandedInner extends GenericResourceInner {
18+
/**
19+
* The created time of the resource. This is only present if requested via
20+
* the $expand query parameter.
21+
*/
22+
@JsonProperty(value = "createdTime", access = JsonProperty.Access.WRITE_ONLY)
23+
private DateTime createdTime;
24+
25+
/**
26+
* The changed time of the resource. This is only present if requested via
27+
* the $expand query parameter.
28+
*/
29+
@JsonProperty(value = "changedTime", access = JsonProperty.Access.WRITE_ONLY)
30+
private DateTime changedTime;
31+
32+
/**
33+
* The provisioning state of the resource. This is only present if
34+
* requested via the $expand query parameter.
35+
*/
36+
@JsonProperty(value = "provisioningState", access = JsonProperty.Access.WRITE_ONLY)
37+
private String provisioningState;
38+
39+
/**
40+
* Get the created time of the resource. This is only present if requested via the $expand query parameter.
41+
*
42+
* @return the createdTime value
43+
*/
44+
public DateTime createdTime() {
45+
return this.createdTime;
46+
}
47+
48+
/**
49+
* Get the changed time of the resource. This is only present if requested via the $expand query parameter.
50+
*
51+
* @return the changedTime value
52+
*/
53+
public DateTime changedTime() {
54+
return this.changedTime;
55+
}
56+
57+
/**
58+
* Get the provisioning state of the resource. This is only present if requested via the $expand query parameter.
59+
*
60+
* @return the provisioningState value
61+
*/
62+
public String provisioningState() {
63+
return this.provisioningState;
64+
}
65+
66+
}

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/implementation/GenericResourceImpl.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,14 @@
1010

1111
import com.microsoft.azure.management.resources.v2019_07_01.GenericResource;
1212
import com.microsoft.azure.arm.model.implementation.WrapperImpl;
13-
import rx.Observable;
1413
import com.microsoft.azure.management.resources.v2019_07_01.Identity;
1514
import com.microsoft.azure.management.resources.v2019_07_01.Plan;
1615
import com.microsoft.azure.management.resources.v2019_07_01.Sku;
1716
import java.util.Map;
1817

1918
class GenericResourceImpl extends WrapperImpl<GenericResourceInner> implements GenericResource {
2019
private final ResourcesManager manager;
21-
22-
GenericResourceImpl(GenericResourceInner inner, ResourcesManager manager) {
20+
GenericResourceImpl(GenericResourceInner inner, ResourcesManager manager) {
2321
super(inner);
2422
this.manager = manager;
2523
}
@@ -29,8 +27,6 @@ public ResourcesManager manager() {
2927
return this.manager;
3028
}
3129

32-
33-
3430
@Override
3531
public String id() {
3632
return this.inner().id();

‎sdk/resources/mgmt-v2019_07_01/src/main/java/com/microsoft/azure/management/resources/v2019_07_01/implementation/ResourceManagementClientImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import com.microsoft.azure.AzureClient;
1212
import com.microsoft.azure.AzureServiceClient;
13+
import com.microsoft.azure.LongRunningFinalState;
14+
import com.microsoft.azure.LongRunningOperationOptions;
1315
import com.microsoft.rest.credentials.ServiceClientCredentials;
1416
import com.microsoft.rest.RestClient;
1517

0 commit comments

Comments
 (0)