Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ private interface ContainersService {
@Put("{containerName}")
@ExpectedResponses({200})
@UnexpectedResponseExceptionType(StorageErrorException.class)
Mono<ContainersSetAccessPolicyResponse> setAccessPolicy(@PathParam("containerName") String containerName, @HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") SignedIdentifierWrapper containerAcl, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-blob-public-access") PublicAccessType access, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, Context context);
Mono<ContainersSetAccessPolicyResponse> setAccessPolicy(@PathParam("containerName") String containerName, @HostParam("url") String url, @BodyParam("application/xml; charset=utf-8") SignedIdentifiersWrapper containerAcl, @QueryParam("timeout") Integer timeout, @HeaderParam("x-ms-blob-public-access") PublicAccessType access, @HeaderParam("x-ms-version") String version, @HeaderParam("x-ms-client-request-id") String requestId, @QueryParam("restype") String restype, @QueryParam("comp") String comp, @HeaderParam("x-ms-lease-id") String leaseId, @HeaderParam("If-Modified-Since") DateTimeRfc1123 ifModifiedSince, @HeaderParam("If-Unmodified-Since") DateTimeRfc1123 ifUnmodifiedSince, Context context);

@Put("{containerName}")
@ExpectedResponses({201})
Expand Down Expand Up @@ -381,7 +381,7 @@ public Mono<ContainersSetAccessPolicyResponse> setAccessPolicyWithRestResponseAs
final String restype = "container";
final String comp = "acl";
final String leaseId = null;
SignedIdentifierWrapper containerAclConverted = new SignedIdentifierWrapper(null);
SignedIdentifiersWrapper containerAclConverted = new SignedIdentifiersWrapper(null);
DateTimeRfc1123 ifModifiedSinceConverted = null;
DateTimeRfc1123 ifUnmodifiedSinceConverted = null;
return service.setAccessPolicy(containerName, this.client.getUrl(), containerAclConverted, timeout, access, this.client.getVersion(), requestId, restype, comp, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, context);
Expand Down Expand Up @@ -417,7 +417,7 @@ public Mono<ContainersSetAccessPolicyResponse> setAccessPolicyWithRestResponseAs
if (modifiedAccessConditions != null) {
ifUnmodifiedSince = modifiedAccessConditions.ifUnmodifiedSince();
}
SignedIdentifierWrapper containerAclConverted = new SignedIdentifierWrapper(containerAcl);
SignedIdentifiersWrapper containerAclConverted = new SignedIdentifiersWrapper(containerAcl);
DateTimeRfc1123 ifModifiedSinceConverted = ifModifiedSince == null ? null : new DateTimeRfc1123(ifModifiedSince);
DateTimeRfc1123 ifUnmodifiedSinceConverted = ifUnmodifiedSince == null ? null : new DateTimeRfc1123(ifUnmodifiedSince);
return service.setAccessPolicy(containerName, this.client.getUrl(), containerAclConverted, timeout, access, this.client.getVersion(), requestId, restype, comp, leaseId, ifModifiedSinceConverted, ifUnmodifiedSinceConverted, context);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
/**
* A wrapper around List&lt;SignedIdentifier&gt; which provides top-level metadata for serialization.
*/
@JacksonXmlRootElement(localName = "SignedIdentifier")
public final class SignedIdentifierWrapper {
@JacksonXmlRootElement(localName = "SignedIdentifiers")
public final class SignedIdentifiersWrapper {
@JacksonXmlProperty(localName = "SignedIdentifier")
private final List<SignedIdentifier> signedIdentifier;
private final List<SignedIdentifier> signedIdentifiers;

/**
* Creates an instance of SignedIdentifierWrapper.
* Creates an instance of SignedIdentifiersWrapper.
*
* @param signedIdentifier the list.
* @param signedIdentifiers the list.
*/
@JsonCreator
public SignedIdentifierWrapper(@JsonProperty("SignedIdentifier") List<SignedIdentifier> signedIdentifier) {
this.signedIdentifier = signedIdentifier;
public SignedIdentifiersWrapper(@JsonProperty("SignedIdentifier") List<SignedIdentifier> signedIdentifiers) {
this.signedIdentifiers = signedIdentifiers;
}

/**
Expand All @@ -35,6 +35,6 @@ public SignedIdentifierWrapper(@JsonProperty("SignedIdentifier") List<SignedIden
* @return the List&lt;SignedIdentifier&gt;.
*/
public List<SignedIdentifier> items() {
return signedIdentifier;
return signedIdentifiers;
}
}
9 changes: 6 additions & 3 deletions storage/client/blob/swagger/blob.json
Original file line number Diff line number Diff line change
Expand Up @@ -7706,11 +7706,14 @@
"description": "a collection of signed identifiers",
"type": "array",
"items": {
"$ref": "#/definitions/SignedIdentifier"
"$ref": "#/definitions/SignedIdentifier",
"xml": {
"name": "SignedIdentifier"
}
},
"xml": {
"wrapped": true,
"name": "SignedIdentifier"
"name": "SignedIdentifiers"
}
},
"StaticWebsite": {
Expand Down Expand Up @@ -8641,4 +8644,4 @@
"description": "Content disposition for given resource"
}
}
}
}