Skip to content

Commit

Permalink
Fixing merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@tg-msft
tg-msft committed Jul 3, 2019
1 parent b6eec4a commit 2444a1e
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 891 deletions.
87 changes: 0 additions & 87 deletions sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,52 +201,6 @@ internal BlobContainerClient(Uri containerUri, HttpPipeline pipeline)
/// <returns>A new <see cref="BlobClient"/> instance.</returns>
public virtual BlobClient GetBlobClient(string blobName) => new BlobClient(this.Uri.AppendToPath(blobName), this._pipeline);

/// <summary>
/// The <see cref="Create"/> operation creates a new container
/// under the specified account. If the container with the same name
/// already exists, the operation fails.
///
/// For more information, see <see href="https://docs.microsoft.com/rest/api/storageservices/create-container"/>.
/// </summary>
/// <param name="publicAccessType">
/// Optionally specifies whether data in the container may be accessed
/// publicly and the level of access. <see cref="PublicAccessType.Container"/>
/// specifies full public read access for container and blob data.
/// Clients can enumerate blobs within the container via anonymous
/// request, but cannot enumerate containers within the storage
/// account. <see cref="PublicAccessType.Blob"/> specifies public
/// read access for blobs. Blob data within this container can be
/// read via anonymous request, but container data is not available.
/// Clients cannot enumerate blobs within the container via anonymous
/// request. If this parameter is null, container data is private to
/// the account owner.
/// </param>
/// <param name="metadata">
/// Optional custom metadata to set for this container.
/// </param>
/// <param name="cancellationToken">
/// Optional <see cref="CancellationToken"/> to propagate
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Response{ContainerInfo}"/> describing the newly
/// created container.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response<ContainerInfo> Create(
PublicAccessType? publicAccessType = default,
Metadata metadata = default,
CancellationToken cancellationToken = default) =>
this.CreateAsync(
publicAccessType,
metadata,
false, // async
cancellationToken)
.EnsureCompleted();

/// <summary>
/// The <see cref="Create"/> operation creates a new container
/// under the specified account. If the container with the same name
Expand Down Expand Up @@ -1619,47 +1573,6 @@ public virtual Response DeleteBlob(
accessConditions,
cancellationToken);

/// <summary>
/// The <see cref="DeleteBlob"/> operation marks the specified
/// blob or snapshot for deletion. The blob is later deleted during
/// garbage collection.
///
/// Note that in order to delete a blob, you must delete all of its
/// snapshots. You can delete both at the same time using
/// <see cref="DeleteSnapshotsOption.Include"/>.
///
/// For more information, see <see href="https://docs.microsoft.com/rest/api/storageservices/delete-blob" />.
/// </summary>
/// <param name="blobName">The name of the blob to delete.</param>
/// <param name="deleteOptions">
/// Specifies options for deleting blob snapshots.
/// </param>
/// <param name="accessConditions">
/// Optional <see cref="BlobAccessConditions"/> to add conditions on
/// deleting this blob.
/// </param>
/// <param name="cancellationToken">
/// Optional <see cref="CancellationToken"/> to propagate
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Task{Response}"/> on successfully deleting.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response DeleteBlob(
string blobName,
DeleteSnapshotsOption? deleteOptions = default,
BlobAccessConditions? accessConditions = default,
CancellationToken cancellationToken = default) =>
this.GetBlobClient(blobName)
.Delete(
deleteOptions,
accessConditions,
cancellationToken);

/// <summary>
/// The <see cref="DeleteBlobAsync"/> operation marks the specified
/// blob or snapshot for deletion. The blob is later deleted during
Expand Down
50 changes: 1 addition & 49 deletions sdk/storage/Azure.Storage.Blobs/src/BlobServiceClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,55 +231,7 @@ public virtual IEnumerable<Response<ContainerItem>> GetContainers(
new GetContainersAsyncCollection(this, options, cancellationToken);

/// <summary>
/// The <see cref="ListContainersSegment"/> operation returns a
/// single segment of containers in the storage account, starting
/// from the specified <paramref name="marker"/>. Use an empty
/// <paramref name="marker"/> to start enumeration from the beginning
/// and the <see cref="ContainersSegment.NextMarker"/> if it's not
/// empty to make subsequent calls to <see cref="ListContainersSegment"/>
/// to continue enumerating the containers segment by segment.
/// Containers are ordered lexicographically by name.
///
/// For more information, see <see href="https://docs.microsoft.com/rest/api/storageservices/list-containers2"/>.
/// </summary>
/// <param name="marker">
/// An optional string value that identifies the segment of the list
/// of containers to be returned with the next listing operation. The
/// operation returns a non-empty <see cref="ContainersSegment.NextMarker"/>
/// if the listing operation did not return all containers remaining
/// to be listed with the current segment. The NextMarker value can
/// be used as the value for the <paramref name="marker"/> parameter
/// in a subsequent call to request the next segment of list items.
/// </param>
/// <param name="options">
/// Specifies options for listing, filtering, and shaping the
/// containers.
/// </param>
/// <param name="cancellationToken">
/// Optional <see cref="CancellationToken"/> to propagate
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Response{ContainersSegment}"/> describing a
/// segment of the containers in the storage account.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response<ContainersSegment> ListContainersSegment(
string marker = default,
ContainersSegmentOptions? options = default,
CancellationToken cancellationToken = default) =>
this.ListContainersSegmentAsync(
marker,
options,
false, // async
cancellationToken)
.EnsureCompleted(syncOverAsync: true);

/// <summary>
/// The <see cref="ListContainersSegmentAsync"/> operation returns a
/// The <see cref="GetContainersAsync"/> operation returns a
/// single segment of containers in the storage account, starting
/// from the specified <paramref name="marker"/>. Use an empty
/// <paramref name="marker"/> to start enumeration from the beginning
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/Azure.Storage.Blobs/src/PageBlobClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1445,14 +1445,14 @@ public virtual Response<BlobInfo> UpdateSequenceNumber(
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Response{BlobInfo}"/> describing the updated
/// A <see cref="Task{Response{BlobInfo}}"/> describing the updated
/// page blob.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response<BlobInfo> UpdateSequenceNumber(
public virtual async Task<Response<BlobInfo>> UpdateSequenceNumberAsync(
SequenceNumberAction action,
long? sequenceNumber = default,
PageBlobAccessConditions? accessConditions = default,
Expand Down
30 changes: 0 additions & 30 deletions sdk/storage/Azure.Storage.Files/src/DirectoryClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,36 +234,6 @@ public virtual Response<StorageDirectoryInfo> Create(
cancellationToken)
.EnsureCompleted();

/// <summary>
/// The <see cref="Create"/> operation creates a new directory
/// at the specified <see cref="Uri"/>.
///
/// For more information, see <see cref="https://docs.microsoft.com/rest/api/storageservices/create-directory"/>.
/// </summary>
/// <param name="metadata">
/// Optional custom metadata to set for this directory.
/// </param>
/// <param name="cancellationToken">
/// Optional <see cref="CancellationToken"/> to propagate
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Response{StorageDirectoryInfo}"/> describing the newly
/// created directory.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response<StorageDirectoryInfo> Create(
Metadata metadata = default,
CancellationToken cancellationToken = default) =>
this.CreateAsync(
metadata,
false, // async
cancellationToken)
.EnsureCompleted(syncOverAsync: true);

/// <summary>
/// The <see cref="CreateAsync"/> operation creates a new directory
/// at the specified <see cref="Uri"/>.
Expand Down
58 changes: 4 additions & 54 deletions sdk/storage/Azure.Storage.Files/src/FileServiceClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,60 +207,10 @@ public virtual IEnumerable<Response<ShareItem>> GetShares(
new GetSharesAsyncCollection(this, options, cancellationToken);

/// <summary>
/// The <see cref="ListSharesSegment"/> operation returns a
/// single segment of shares in the storage account, starting
/// from the specified <paramref name="marker"/>. Use an empty
/// <paramref name="marker"/> to start enumeration from the beginning
/// and the <see cref="SharesSegment.NextMarker"/> if it's not
/// empty to make subsequent calls to <see cref="ListSharesSegment"/>
/// to continue enumerating the shares segment by segment.
///
/// For more information, <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/list-shares"/>.
/// </summary>
/// <param name="marker">
/// An optional string value that identifies the segment of the list
/// of shares to be returned with the next listing operation. The
/// operation returns a non-empty <see cref="SharesSegment.NextMarker"/>
/// if the listing operation did not return all shares remaining
/// to be listed with the current segment. The NextMarker value can
/// be used as the value for the <paramref name="marker"/> parameter
/// in a subsequent call to request the next segment of list items.
/// </param>
/// <param name="options">
/// Specifies options for listing, filtering, and shaping the
/// shares.
/// </param>
/// <param name="cancellationToken">
/// Optional <see cref="CancellationToken"/> to propagate
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Task{Response{SharesSegment}}"/> describing a
/// segment of the shares in the storage account.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response<SharesSegment> ListSharesSegment(
string marker = default,
SharesSegmentOptions? options = default,
CancellationToken cancellationToken = default) =>
this.ListSharesSegmentAsync(
marker,
options,
false, // async
cancellationToken)
.EnsureCompleted(syncOverAsync: true);

/// <summary>
/// The <see cref="ListSharesSegmentAsync"/> operation returns a
/// single segment of shares in the storage account, starting
/// from the specified <paramref name="marker"/>. Use an empty
/// <paramref name="marker"/> to start enumeration from the beginning
/// and the <see cref="SharesSegment.NextMarker"/> if it's not
/// empty to make subsequent calls to <see cref="ListSharesSegmentAsync"/>
/// to continue enumerating the shares segment by segment.
/// The <see cref="GetSharesAsync"/> operation returns an async collection
/// of the shares in the storage account. Enumerating the shares may
/// make multiple requests to the service while fetching all the
/// values.
///
/// For more information, <see href="https://docs.microsoft.com/en-us/rest/api/storageservices/list-shares"/>.
/// </summary>
Expand Down
45 changes: 0 additions & 45 deletions sdk/storage/Azure.Storage.Files/src/ShareClient.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,51 +251,6 @@ public virtual Response<ShareInfo> Create(
cancellationToken)
.EnsureCompleted();

/// <summary>
/// Create a <see cref="DirectoryClient"/> object for the root of the
/// share. The new <see cref="DirectoryClient"/> uses the same request
/// policy pipeline as the <see cref="ShareClient"/>.
/// </summary>
/// <returns>A new <see cref="DirectoryClient"/> instance.</returns>
public virtual DirectoryClient GetRootDirectoryClient()
=> this.GetDirectoryClient("");

/// <summary>
/// The <see cref="Create"/> operation creates a new share
/// under the specified account. If a share with the same name
/// already exists, the operation fails.
///
/// For more information, see <see cref="https://docs.microsoft.com/rest/api/storageservices/create-share"/>.
/// </summary>
/// <param name="metadata">
/// Optional custom metadata to set for this share.
/// </param>
/// <param name="quotaInBytes">
/// Optional. Maximum size of the share in bytes. If unspecified, use the service's default value.
/// </param>
/// <param name="cancellationToken">
/// Optional <see cref="CancellationToken"/> to propagate
/// notifications that the operation should be cancelled.
/// </param>
/// <returns>
/// A <see cref="Response{ShareInfo}"/> describing the newly
/// created share.
/// </returns>
/// <remarks>
/// A <see cref="StorageRequestFailedException"/> will be thrown if
/// a failure occurs.
/// </remarks>
public virtual Response<ShareInfo> Create(
Metadata metadata = default,
int? quotaInBytes = default,
CancellationToken cancellationToken = default) =>
this.CreateAsync(
metadata,
quotaInBytes,
false, // async
cancellationToken)
.EnsureCompleted(syncOverAsync: true);

/// <summary>
/// The <see cref="CreateAsync"/> operation creates a new share
/// under the specified account. If a share with the same name
Expand Down
Loading

0 comments on commit 2444a1e

Please sign in to comment.