Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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 @@ -380,7 +380,7 @@ public BlobDownloadDetails() { }
public Azure.Storage.Blobs.Models.LeaseState LeaseState { get { throw null; } }
public Azure.Storage.Blobs.Models.LeaseStatus LeaseStatus { get { throw null; } }
public System.Collections.Generic.IDictionary<string, string> Metadata { get { throw null; } }
public string ObjectReplicationDestinationPolicy { get { throw null; } }
public string ObjectReplicationDestinationPolicyId { get { throw null; } }
public System.Collections.Generic.IList<Azure.Storage.Blobs.Models.ObjectReplicationPolicy> ObjectReplicationSourceProperties { get { throw null; } }
public long TagCount { get { throw null; } }
public string VersionId { get { throw null; } }
Expand Down Expand Up @@ -683,7 +683,7 @@ public BlobProperties() { }
public Azure.Storage.Blobs.Models.LeaseState LeaseState { get { throw null; } }
public Azure.Storage.Blobs.Models.LeaseStatus LeaseStatus { get { throw null; } }
public System.Collections.Generic.IDictionary<string, string> Metadata { get { throw null; } }
public string ObjectReplicationDestinationPolicy { get { throw null; } }
public string ObjectReplicationDestinationPolicyId { get { throw null; } }
public System.Collections.Generic.IList<Azure.Storage.Blobs.Models.ObjectReplicationPolicy> ObjectReplicationSourceProperties { get { throw null; } }
public long TagCount { get { throw null; } }
public string VersionId { get { throw null; } }
Expand Down
8 changes: 4 additions & 4 deletions sdk/storage/Azure.Storage.Blobs/src/BlobExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ internal static BlobProperties ToBlobProperties(this BlobPropertiesInternal prop
LastModified = properties.LastModified,
CreatedOn = properties.CreatedOn,
Metadata = properties.Metadata,
ObjectReplicationDestinationPolicy = properties.ObjectReplicationPolicyId,
ObjectReplicationDestinationPolicyId = properties.ObjectReplicationPolicyId,
ObjectReplicationSourceProperties =
properties.ObjectReplicationRules?.Count > 0
? BlobExtensions.ParseObjectReplicationIds(properties.ObjectReplicationRules)
Expand Down Expand Up @@ -163,13 +163,13 @@ internal static BlobProperties ToBlobProperties(this BlobPropertiesInternal prop
/// List of <see cref="ObjectReplicationPolicy"/>, which contains the Policy ID and the respective
/// rule(s) and replication status(s) for each policy.
/// If the blob has object replication policy applied and is the destination blob,
/// this method will return default as the policy id should be set in ObjectReplicationDestinationPolicy
/// (e.g. <see cref="BlobProperties.ObjectReplicationDestinationPolicy"/>,<see cref="BlobDownloadDetails.ObjectReplicationDestinationPolicy"/>).
/// this method will return default as the policy id should be set in ObjectReplicationDestinationPolicyId
/// (e.g. <see cref="BlobProperties.ObjectReplicationDestinationPolicyId"/>,<see cref="BlobDownloadDetails.ObjectReplicationDestinationPolicyId"/>).
/// </returns>
internal static IList<ObjectReplicationPolicy> ParseObjectReplicationIds(this IDictionary<string, string> OrIds)
{
// If the dictionary contains a key with policy id, we are not required to do any parsing since
// the policy id should already be stored in the ObjectReplicationDestinationPolicy.
// the policy id should already be stored in the ObjectReplicationDestinationPolicyId.
if (OrIds.First().Key == "policy-id")
{
return default;
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/Azure.Storage.Blobs/src/Models/BlobInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ internal BlobDownloadInfo(FlattenedDownloadProperties flattened)
flattened.ObjectReplicationRules?.Count > 0
? BlobExtensions.ParseObjectReplicationIds(flattened.ObjectReplicationRules)
: null,
ObjectReplicationDestinationPolicy = flattened.ObjectReplicationPolicyId
ObjectReplicationDestinationPolicyId = flattened.ObjectReplicationPolicyId
};
}

Expand Down Expand Up @@ -274,7 +274,7 @@ public partial class BlobDownloadDetails
/// <summary>
/// Object Replication Policy Id. This value is only set when the policy id
/// </summary>
public string ObjectReplicationDestinationPolicy { get; internal set; }
public string ObjectReplicationDestinationPolicyId { get; internal set; }
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public partial class BlobProperties
/// <summary>
/// Object Replication Policy Id of the destination blob.
/// </summary>
public string ObjectReplicationDestinationPolicy { get; internal set; }
public string ObjectReplicationDestinationPolicyId { get; internal set; }

/// <summary>
/// Parsed Object Replication Policy Id, Rule Id(s) and status of the source blob.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public static BlobProperties BlobProperties(
VersionId = versionId,
ObjectReplicationSourceProperties = objectReplicationSourceProperties,
IsCurrentVersion = isCurrentVersion,
ObjectReplicationDestinationPolicy = objectReplicationDestinationPolicy,
ObjectReplicationDestinationPolicyId = objectReplicationDestinationPolicy,
TagCount = tagCount,
Metadata = metadata,
ExpiresOn = expiresOn,
Expand Down Expand Up @@ -596,7 +596,7 @@ public static BlobDownloadDetails BlobDownloadDetails(
VersionId = versionId,
IsSealed = isSealed,
ObjectReplicationSourceProperties = objectReplicationSourceProperties,
ObjectReplicationDestinationPolicy = objectReplicationDestinationPolicy
ObjectReplicationDestinationPolicyId = objectReplicationDestinationPolicy
};
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ namespace Azure.Storage.Blobs.Models
/// Contains Object Replication Policy ID and the respective list of
/// <see cref="ObjectReplicationRule"/>(s). This is used when retrieving the
/// Object Replication Properties on the source blob. The policy id for the
/// destination blob is set in ObjectReplicationDestinationPolicy of the respective
/// method responses. (e.g. <see cref="BlobProperties.ObjectReplicationDestinationPolicy"/>,
/// <see cref="BlobDownloadDetails.ObjectReplicationDestinationPolicy"/>).
/// destination blob is set in ObjectReplicationDestinationPolicyId of the respective
/// method responses. (e.g. <see cref="BlobProperties.ObjectReplicationDestinationPolicyId"/>,
/// <see cref="BlobDownloadDetails.ObjectReplicationDestinationPolicyId"/>).
/// </summary>
public class ObjectReplicationPolicy
{
Expand Down
8 changes: 4 additions & 4 deletions sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,8 @@ public async Task DownloadAsync_ObjectReplication()

//Assert
Assert.AreEqual(1, sourceResponse.Value.Details.ObjectReplicationSourceProperties.Count);
Assert.IsNull(sourceResponse.Value.Details.ObjectReplicationDestinationPolicy);
Assert.IsNotEmpty(destResponse.Value.Details.ObjectReplicationDestinationPolicy);
Assert.IsNull(sourceResponse.Value.Details.ObjectReplicationDestinationPolicyId);
Assert.IsNotEmpty(destResponse.Value.Details.ObjectReplicationDestinationPolicyId);
Assert.IsNull(destResponse.Value.Details.ObjectReplicationSourceProperties);
}
#endregion Sequential Download
Expand Down Expand Up @@ -2896,8 +2896,8 @@ public async Task GetPropertiesAsync_ObjectReplication()

// Assert
Assert.AreEqual(1, source_response.Value.ObjectReplicationSourceProperties.Count);
Assert.IsNull(source_response.Value.ObjectReplicationDestinationPolicy);
Assert.IsNotEmpty(dest_response.Value.ObjectReplicationDestinationPolicy);
Assert.IsNull(source_response.Value.ObjectReplicationDestinationPolicyId);
Assert.IsNotEmpty(dest_response.Value.ObjectReplicationDestinationPolicyId);
Assert.IsNull(dest_response.Value.ObjectReplicationSourceProperties);
}

Expand Down