Skip to content

Fix the problem of determining whether there is a MetadataSeparator error #900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
halspang merged 16 commits into from
Jul 20, 2022
Merged

Fix the problem of determining whether there is a MetadataSeparator error #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f6fc87c
add original topic metadata support
saber-wang May 19, 2022
d5b3ac4
Add topicmetadata sample
saber-wang May 21, 2022
5f1fc2e
Merge branch 'dapr:master' into master
saber-wang May 21, 2022
d1b4d43
fix: v2 route metadata acquisition error
saber-wang May 28, 2022
a95902d
feat: Support setting metadata separator
saber-wang Jun 7, 2022
d3e9e92
chore: Note modification
saber-wang Jun 7, 2022
394c4b0
Merge branch 'master' into master
halspang Jun 7, 2022
719ef9b
style:
saber-wang Jun 8, 2022
7d8ebfd
Merge branch 'master' of https://github.com/saber-wang/dapr-dotnet-sdk
saber-wang Jun 8, 2022
0d8b757
commit
saber-wang Jun 8, 2022
a7a65b5
Merge branch 'master' into master
halspang Jun 21, 2022
a3ae033
Merge branch 'dapr:master' into master
saber-wang Jun 27, 2022
4bc5cf7
fix: Whether there is a problem of MetadataSeparator judgment error
saber-wang Jun 27, 2022
3067a91
TopicAttribute.Metadataseparator default should be null
saber-wang Jun 27, 2022
52fd83f
formatting code
saber-wang Jun 27, 2022
e26a9bf
Merge branch 'master' into master
halspang Jul 7, 2022
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
2 changes: 1 addition & 1 deletion src/Dapr.AspNetCore/DaprEndpointRouteBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ private static IEndpointConventionBuilder CreateSubscribeEndPoint(IEndpointRoute
{
var first = e.First();
var rawPayload = e.Any(e => e.EnableRawPayload.GetValueOrDefault());
var metadataSeparator = e.FirstOrDefault(e => string.IsNullOrEmpty(e.MetadataSeparator)).MetadataSeparator ?? ",";
var metadataSeparator = e.FirstOrDefault(e => !string.IsNullOrEmpty(e.MetadataSeparator)).MetadataSeparator ?? ",";
var rules = e.Where(e => !string.IsNullOrEmpty(e.Match)).ToList();
var defaultRoutes = e.Where(e => string.IsNullOrEmpty(e.Match)).Select(e => RoutePatternToString(e.RoutePattern)).ToList();
var defaultRoute = defaultRoutes.FirstOrDefault();
Expand Down
8 changes: 4 additions & 4 deletions src/Dapr.AspNetCore/TopicAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class TopicAttribute : Attribute, ITopicMetadata, IRawTopicMetadata, IOwn
/// <param name="name">The topic name.</param>
/// <param name="ownedMetadatas">The topic owned metadata ids.</param>
/// <param name="metadataSeparator">Separator to use for metadata.</param>
public TopicAttribute(string pubsubName, string name, string[] ownedMetadatas = null,string metadataSeparator = ",")
public TopicAttribute(string pubsubName, string name, string[] ownedMetadatas = null, string metadataSeparator = null)
{
ArgumentVerifier.ThrowIfNullOrEmpty(pubsubName, nameof(pubsubName));
ArgumentVerifier.ThrowIfNullOrEmpty(name, nameof(name));
Expand All @@ -47,7 +47,7 @@ public TopicAttribute(string pubsubName, string name, string[] ownedMetadatas =
/// <param name="enableRawPayload">The enable/disable raw pay load flag.</param>
/// <param name="ownedMetadatas">The topic owned metadata ids.</param>
/// <param name="metadataSeparator">Separator to use for metadata.</param>
public TopicAttribute(string pubsubName, string name, bool enableRawPayload, string[] ownedMetadatas = null, string metadataSeparator = ",")
public TopicAttribute(string pubsubName, string name, bool enableRawPayload, string[] ownedMetadatas = null, string metadataSeparator = null)
{
ArgumentVerifier.ThrowIfNullOrEmpty(pubsubName, nameof(pubsubName));
ArgumentVerifier.ThrowIfNullOrEmpty(name, nameof(name));
Expand All @@ -68,7 +68,7 @@ public TopicAttribute(string pubsubName, string name, bool enableRawPayload, str
/// <param name="priority">The priority of the rule (low-to-high values).</param>
/// <param name="ownedMetadatas">The topic owned metadata ids.</param>
/// <param name="metadataSeparator">Separator to use for metadata.</param>
public TopicAttribute(string pubsubName, string name, string match, int priority, string[] ownedMetadatas = null, string metadataSeparator = ",")
public TopicAttribute(string pubsubName, string name, string match, int priority, string[] ownedMetadatas = null, string metadataSeparator = null)
{
ArgumentVerifier.ThrowIfNullOrEmpty(pubsubName, nameof(pubsubName));
ArgumentVerifier.ThrowIfNullOrEmpty(name, nameof(name));
Expand All @@ -91,7 +91,7 @@ public TopicAttribute(string pubsubName, string name, string match, int priority
/// <param name="priority">The priority of the rule (low-to-high values).</param>
/// <param name="ownedMetadatas">The topic owned metadata ids.</param>
/// <param name="metadataSeparator">Separator to use for metadata.</param>
public TopicAttribute(string pubsubName, string name, bool enableRawPayload, string match, int priority, string[] ownedMetadatas = null, string metadataSeparator = ",")
public TopicAttribute(string pubsubName, string name, bool enableRawPayload, string match, int priority, string[] ownedMetadatas = null, string metadataSeparator = null)
{
ArgumentVerifier.ThrowIfNullOrEmpty(pubsubName, nameof(pubsubName));
ArgumentVerifier.ThrowIfNullOrEmpty(name, nameof(name));
Expand Down
8 changes: 8 additions & 0 deletions test/Dapr.AspNetCore.IntegrationTest.App/DaprController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,14 @@ public void MultipleMetadataTopics()
{
}

[Topic("pubsub", "metadataseparator", metadataSeparator: "|")]
[HttpPost("/topicmetadataseparatorattr")]
[TopicMetadata("n1", "v1")]
[TopicMetadata("n1", "v2")]
public void TopicMetadataSeparator()
{
}

[Topic("pubsub", "splitTopicAttr", true)]
[HttpPost("/splitTopics")]
public void SplitTopic()
Expand Down
4 changes: 2 additions & 2 deletions test/Dapr.AspNetCore.IntegrationTest/SubscribeEndpointTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public async Task SubscribeEndpoint_ReportsTopics()
var json = await JsonSerializer.DeserializeAsync<JsonElement>(stream);

json.ValueKind.Should().Be(JsonValueKind.Array);
json.GetArrayLength().Should().Be(15);
json.GetArrayLength().Should().Be(16);
var subscriptions = new List<(string PubsubName, string Topic, string Route, string rawPayload, string match, string metadata)>();
foreach (var element in json.EnumerateArray())
{
Expand Down Expand Up @@ -107,7 +107,7 @@ public async Task SubscribeEndpoint_ReportsTopics()
subscriptions.Should().Contain(("pubsub", "metadata", "multiMetadataTopicAttr", string.Empty, string.Empty, "n1=v1;n2=v2,v3"));
subscriptions.Should().Contain(("pubsub", "metadata.1", "multiMetadataTopicAttr", "true", string.Empty, "n1=v1"));
subscriptions.Should().Contain(("pubsub", "splitMetadataTopicBuilder", "splitMetadataTopics", string.Empty, string.Empty, "n1=v1;n2=v1"));

subscriptions.Should().Contain(("pubsub", "metadataseparator", "topicmetadataseparatorattr", string.Empty, string.Empty, "n1=v1|v2"));
Comment thread
saber-wang marked this conversation as resolved.
// Test priority route sorting
var eTopic = subscriptions.FindAll(e => e.Topic == "E");
eTopic.Count.Should().Be(3);
Expand Down