Skip to content

Commit dc6c0f0

Browse files
authored
[AutoPR storage/resource-manager] [Bug fix] Remove read-only constraint for management policy (#4277)
* Generated from 00d9e1b50ab5daed68696f0b0c612e912acde7db [Bug fix] Remove read-only constraint for management policy * Generated from 0e6f149f5338b7fe8256adb51584a22aaecdb407 change type to number * Generated from 870609e2d01b2e64b589a0eb07e938f19282f4f0 Modify description, remove integer
1 parent d9e0740 commit dc6c0f0

16 files changed

+851
-281
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
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.storage.v2019_04_01;
10+
11+
import com.fasterxml.jackson.annotation.JsonProperty;
12+
13+
/**
14+
* Settings for Azure Files identity based authentication.
15+
*/
16+
public class AzureFilesIdentityBasedAuthentication {
17+
/**
18+
* Indicates the directory service used. Possible values include: 'None',
19+
* 'AADDS'.
20+
*/
21+
@JsonProperty(value = "directoryServiceOptions", required = true)
22+
private DirectoryServiceOptions directoryServiceOptions;
23+
24+
/**
25+
* Get indicates the directory service used. Possible values include: 'None', 'AADDS'.
26+
*
27+
* @return the directoryServiceOptions value
28+
*/
29+
public DirectoryServiceOptions directoryServiceOptions() {
30+
return this.directoryServiceOptions;
31+
}
32+
33+
/**
34+
* Set indicates the directory service used. Possible values include: 'None', 'AADDS'.
35+
*
36+
* @param directoryServiceOptions the directoryServiceOptions value to set
37+
* @return the AzureFilesIdentityBasedAuthentication object itself.
38+
*/
39+
public AzureFilesIdentityBasedAuthentication withDirectoryServiceOptions(DirectoryServiceOptions directoryServiceOptions) {
40+
this.directoryServiceOptions = directoryServiceOptions;
41+
return this;
42+
}
43+
44+
}

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/BlobContainers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public interface BlobContainers {
3838
* @throws IllegalArgumentException thrown if parameters fail the validation
3939
* @return the observable for the request
4040
*/
41-
Observable<ListContainerItems> listAsync(String resourceGroupName, String accountName);
41+
Observable<ListContainerItem> listAsync(final String resourceGroupName, final String accountName);
4242

4343
/**
4444
* Gets properties of a specified container.

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/DateAfterCreation.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515
*/
1616
public class DateAfterCreation {
1717
/**
18-
* Integer value indicating the age in days after creation.
18+
* Value indicating the age in days after creation.
1919
*/
2020
@JsonProperty(value = "daysAfterCreationGreaterThan", required = true)
21-
private int daysAfterCreationGreaterThan;
21+
private double daysAfterCreationGreaterThan;
2222

2323
/**
24-
* Get integer value indicating the age in days after creation.
24+
* Get value indicating the age in days after creation.
2525
*
2626
* @return the daysAfterCreationGreaterThan value
2727
*/
28-
public int daysAfterCreationGreaterThan() {
28+
public double daysAfterCreationGreaterThan() {
2929
return this.daysAfterCreationGreaterThan;
3030
}
3131

3232
/**
33-
* Set integer value indicating the age in days after creation.
33+
* Set value indicating the age in days after creation.
3434
*
3535
* @param daysAfterCreationGreaterThan the daysAfterCreationGreaterThan value to set
3636
* @return the DateAfterCreation object itself.
3737
*/
38-
public DateAfterCreation withDaysAfterCreationGreaterThan(int daysAfterCreationGreaterThan) {
38+
public DateAfterCreation withDaysAfterCreationGreaterThan(double daysAfterCreationGreaterThan) {
3939
this.daysAfterCreationGreaterThan = daysAfterCreationGreaterThan;
4040
return this;
4141
}

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/DateAfterModification.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,27 +15,27 @@
1515
*/
1616
public class DateAfterModification {
1717
/**
18-
* Integer value indicating the age in days after last modification.
18+
* Value indicating the age in days after last modification.
1919
*/
2020
@JsonProperty(value = "daysAfterModificationGreaterThan", required = true)
21-
private int daysAfterModificationGreaterThan;
21+
private double daysAfterModificationGreaterThan;
2222

2323
/**
24-
* Get integer value indicating the age in days after last modification.
24+
* Get value indicating the age in days after last modification.
2525
*
2626
* @return the daysAfterModificationGreaterThan value
2727
*/
28-
public int daysAfterModificationGreaterThan() {
28+
public double daysAfterModificationGreaterThan() {
2929
return this.daysAfterModificationGreaterThan;
3030
}
3131

3232
/**
33-
* Set integer value indicating the age in days after last modification.
33+
* Set value indicating the age in days after last modification.
3434
*
3535
* @param daysAfterModificationGreaterThan the daysAfterModificationGreaterThan value to set
3636
* @return the DateAfterModification object itself.
3737
*/
38-
public DateAfterModification withDaysAfterModificationGreaterThan(int daysAfterModificationGreaterThan) {
38+
public DateAfterModification withDaysAfterModificationGreaterThan(double daysAfterModificationGreaterThan) {
3939
this.daysAfterModificationGreaterThan = daysAfterModificationGreaterThan;
4040
return this;
4141
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
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.storage.v2019_04_01;
10+
11+
import java.util.Collection;
12+
import com.fasterxml.jackson.annotation.JsonCreator;
13+
import com.microsoft.rest.ExpandableStringEnum;
14+
15+
/**
16+
* Defines values for DirectoryServiceOptions.
17+
*/
18+
public final class DirectoryServiceOptions extends ExpandableStringEnum<DirectoryServiceOptions> {
19+
/** Static value None for DirectoryServiceOptions. */
20+
public static final DirectoryServiceOptions NONE = fromString("None");
21+
22+
/** Static value AADDS for DirectoryServiceOptions. */
23+
public static final DirectoryServiceOptions AADDS = fromString("AADDS");
24+
25+
/**
26+
* Creates or finds a DirectoryServiceOptions from its string representation.
27+
* @param name a name to look for
28+
* @return the corresponding DirectoryServiceOptions
29+
*/
30+
@JsonCreator
31+
public static DirectoryServiceOptions fromString(String name) {
32+
return fromString(name, DirectoryServiceOptions.class);
33+
}
34+
35+
/**
36+
* @return known DirectoryServiceOptions values
37+
*/
38+
public static Collection<DirectoryServiceOptions> values() {
39+
return values(DirectoryServiceOptions.class);
40+
}
41+
}

storage/resource-manager/v2019_04_01/src/main/java/com/microsoft/azure/management/storage/v2019_04_01/ListContainerItem.java

Lines changed: 34 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -8,198 +8,85 @@
88

99
package com.microsoft.azure.management.storage.v2019_04_01;
1010

11+
import com.microsoft.azure.arm.model.HasInner;
12+
import com.microsoft.azure.arm.resources.models.HasManager;
13+
import com.microsoft.azure.management.storage.v2019_04_01.implementation.StorageManager;
14+
import com.microsoft.azure.management.storage.v2019_04_01.implementation.ListContainerItemInner;
1115
import org.joda.time.DateTime;
1216
import java.util.Map;
13-
import com.fasterxml.jackson.annotation.JsonProperty;
14-
import com.microsoft.rest.serializer.JsonFlatten;
1517

1618
/**
17-
* The blob container properties be listed out.
19+
* Type representing ListContainerItem.
1820
*/
19-
@JsonFlatten
20-
public class ListContainerItem extends AzureEntityResource {
21+
public interface ListContainerItem extends HasInner<ListContainerItemInner>, HasManager<StorageManager> {
2122
/**
22-
* Specifies whether data in the container may be accessed publicly and the
23-
* level of access. Possible values include: 'Container', 'Blob', 'None'.
23+
* @return the etag value.
2424
*/
25-
@JsonProperty(value = "properties.publicAccess")
26-
private PublicAccess publicAccess;
25+
String etag();
2726

2827
/**
29-
* Returns the date and time the container was last modified.
28+
* @return the hasImmutabilityPolicy value.
3029
*/
31-
@JsonProperty(value = "properties.lastModifiedTime", access = JsonProperty.Access.WRITE_ONLY)
32-
private DateTime lastModifiedTime;
30+
Boolean hasImmutabilityPolicy();
3331

3432
/**
35-
* The lease status of the container. Possible values include: 'Locked',
36-
* 'Unlocked'.
33+
* @return the hasLegalHold value.
3734
*/
38-
@JsonProperty(value = "properties.leaseStatus", access = JsonProperty.Access.WRITE_ONLY)
39-
private LeaseStatus leaseStatus;
35+
Boolean hasLegalHold();
4036

4137
/**
42-
* Lease state of the container. Possible values include: 'Available',
43-
* 'Leased', 'Expired', 'Breaking', 'Broken'.
38+
* @return the id value.
4439
*/
45-
@JsonProperty(value = "properties.leaseState", access = JsonProperty.Access.WRITE_ONLY)
46-
private LeaseState leaseState;
40+
String id();
4741

4842
/**
49-
* Specifies whether the lease on a container is of infinite or fixed
50-
* duration, only when the container is leased. Possible values include:
51-
* 'Infinite', 'Fixed'.
43+
* @return the immutabilityPolicy value.
5244
*/
53-
@JsonProperty(value = "properties.leaseDuration", access = JsonProperty.Access.WRITE_ONLY)
54-
private LeaseDuration leaseDuration;
45+
ImmutabilityPolicyProperties immutabilityPolicy();
5546

5647
/**
57-
* A name-value pair to associate with the container as metadata.
48+
* @return the lastModifiedTime value.
5849
*/
59-
@JsonProperty(value = "properties.metadata")
60-
private Map<String, String> metadata;
50+
DateTime lastModifiedTime();
6151

6252
/**
63-
* The ImmutabilityPolicy property of the container.
53+
* @return the leaseDuration value.
6454
*/
65-
@JsonProperty(value = "properties.immutabilityPolicy", access = JsonProperty.Access.WRITE_ONLY)
66-
private ImmutabilityPolicyProperties immutabilityPolicy;
55+
LeaseDuration leaseDuration();
6756

6857
/**
69-
* The LegalHold property of the container.
58+
* @return the leaseState value.
7059
*/
71-
@JsonProperty(value = "properties.legalHold", access = JsonProperty.Access.WRITE_ONLY)
72-
private LegalHoldProperties legalHold;
60+
LeaseState leaseState();
7361

7462
/**
75-
* The hasLegalHold public property is set to true by SRP if there are at
76-
* least one existing tag. The hasLegalHold public property is set to false
77-
* by SRP if all existing legal hold tags are cleared out. There can be a
78-
* maximum of 1000 blob containers with hasLegalHold=true for a given
79-
* account.
63+
* @return the leaseStatus value.
8064
*/
81-
@JsonProperty(value = "properties.hasLegalHold", access = JsonProperty.Access.WRITE_ONLY)
82-
private Boolean hasLegalHold;
65+
LeaseStatus leaseStatus();
8366

8467
/**
85-
* The hasImmutabilityPolicy public property is set to true by SRP if
86-
* ImmutabilityPolicy has been created for this container. The
87-
* hasImmutabilityPolicy public property is set to false by SRP if
88-
* ImmutabilityPolicy has not been created for this container.
68+
* @return the legalHold value.
8969
*/
90-
@JsonProperty(value = "properties.hasImmutabilityPolicy", access = JsonProperty.Access.WRITE_ONLY)
91-
private Boolean hasImmutabilityPolicy;
70+
LegalHoldProperties legalHold();
9271

9372
/**
94-
* Get specifies whether data in the container may be accessed publicly and the level of access. Possible values include: 'Container', 'Blob', 'None'.
95-
*
96-
* @return the publicAccess value
73+
* @return the metadata value.
9774
*/
98-
public PublicAccess publicAccess() {
99-
return this.publicAccess;
100-
}
75+
Map<String, String> metadata();
10176

10277
/**
103-
* Set specifies whether data in the container may be accessed publicly and the level of access. Possible values include: 'Container', 'Blob', 'None'.
104-
*
105-
* @param publicAccess the publicAccess value to set
106-
* @return the ListContainerItem object itself.
78+
* @return the name value.
10779
*/
108-
public ListContainerItem withPublicAccess(PublicAccess publicAccess) {
109-
this.publicAccess = publicAccess;
110-
return this;
111-
}
80+
String name();
11281

11382
/**
114-
* Get returns the date and time the container was last modified.
115-
*
116-
* @return the lastModifiedTime value
83+
* @return the publicAccess value.
11784
*/
118-
public DateTime lastModifiedTime() {
119-
return this.lastModifiedTime;
120-
}
85+
PublicAccess publicAccess();
12186

12287
/**
123-
* Get the lease status of the container. Possible values include: 'Locked', 'Unlocked'.
124-
*
125-
* @return the leaseStatus value
88+
* @return the type value.
12689
*/
127-
public LeaseStatus leaseStatus() {
128-
return this.leaseStatus;
129-
}
130-
131-
/**
132-
* Get lease state of the container. Possible values include: 'Available', 'Leased', 'Expired', 'Breaking', 'Broken'.
133-
*
134-
* @return the leaseState value
135-
*/
136-
public LeaseState leaseState() {
137-
return this.leaseState;
138-
}
139-
140-
/**
141-
* Get specifies whether the lease on a container is of infinite or fixed duration, only when the container is leased. Possible values include: 'Infinite', 'Fixed'.
142-
*
143-
* @return the leaseDuration value
144-
*/
145-
public LeaseDuration leaseDuration() {
146-
return this.leaseDuration;
147-
}
148-
149-
/**
150-
* Get a name-value pair to associate with the container as metadata.
151-
*
152-
* @return the metadata value
153-
*/
154-
public Map<String, String> metadata() {
155-
return this.metadata;
156-
}
157-
158-
/**
159-
* Set a name-value pair to associate with the container as metadata.
160-
*
161-
* @param metadata the metadata value to set
162-
* @return the ListContainerItem object itself.
163-
*/
164-
public ListContainerItem withMetadata(Map<String, String> metadata) {
165-
this.metadata = metadata;
166-
return this;
167-
}
168-
169-
/**
170-
* Get the ImmutabilityPolicy property of the container.
171-
*
172-
* @return the immutabilityPolicy value
173-
*/
174-
public ImmutabilityPolicyProperties immutabilityPolicy() {
175-
return this.immutabilityPolicy;
176-
}
177-
178-
/**
179-
* Get the LegalHold property of the container.
180-
*
181-
* @return the legalHold value
182-
*/
183-
public LegalHoldProperties legalHold() {
184-
return this.legalHold;
185-
}
186-
187-
/**
188-
* Get the hasLegalHold public property is set to true by SRP if there are at least one existing tag. The hasLegalHold public property is set to false by SRP if all existing legal hold tags are cleared out. There can be a maximum of 1000 blob containers with hasLegalHold=true for a given account.
189-
*
190-
* @return the hasLegalHold value
191-
*/
192-
public Boolean hasLegalHold() {
193-
return this.hasLegalHold;
194-
}
195-
196-
/**
197-
* Get the hasImmutabilityPolicy public property is set to true by SRP if ImmutabilityPolicy has been created for this container. The hasImmutabilityPolicy public property is set to false by SRP if ImmutabilityPolicy has not been created for this container.
198-
*
199-
* @return the hasImmutabilityPolicy value
200-
*/
201-
public Boolean hasImmutabilityPolicy() {
202-
return this.hasImmutabilityPolicy;
203-
}
90+
String type();
20491

20592
}

0 commit comments

Comments
 (0)