Skip to content

topicmetadata should allow adding empty strings #940

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 2 commits into from
Aug 29, 2022
Merged

topicmetadata should allow adding empty strings #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2331d3b
topicmetadata should allow adding empty strings
saber-wang Aug 26, 2022
86083e9
fix test errors
saber-wang Aug 27, 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
4 changes: 2 additions & 2 deletions src/Dapr.AspNetCore/TopicMetadataAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class TopicMetadataAttribute : Attribute, IOriginalTopicMetadata
public TopicMetadataAttribute(string name, string value)
{
ArgumentVerifier.ThrowIfNullOrEmpty(name, nameof(name));
ArgumentVerifier.ThrowIfNullOrEmpty(value, nameof(value));
ArgumentVerifier.ThrowIfNull(value, nameof(value));
Name = name;
Value = value;
}
Expand All @@ -44,7 +44,7 @@ public TopicMetadataAttribute(string id, string name, string value)
{
ArgumentVerifier.ThrowIfNullOrEmpty(id, nameof(name));
ArgumentVerifier.ThrowIfNullOrEmpty(name, nameof(name));
ArgumentVerifier.ThrowIfNullOrEmpty(value, nameof(value));
ArgumentVerifier.ThrowIfNull(value, nameof(value));
Id = id;
Name = name;
Value = value;
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 @@ -92,6 +92,14 @@ public void TopicMetadataSeparator()
{
}

[Topic("pubsub", "metadataseparatorbyemptytring")]
[HttpPost("/topicmetadataseparatorattrbyemptytring")]
[TopicMetadata("n1", "v1")]
[TopicMetadata("n1", "")]
public void TopicMetadataSeparatorByemptytring ()
{
}

[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(17);
json.GetArrayLength().Should().Be(18);

var subscriptions = new List<(string PubsubName, string Topic, string Route, string rawPayload, string match, string metadata, string DeadLetterTopic)>();

Expand Down Expand Up @@ -116,7 +116,7 @@ public async Task SubscribeEndpoint_ReportsTopics()
subscriptions.Should().Contain(("pubsub", "metadata", "multiMetadataTopicAttr", string.Empty, string.Empty, "n1=v1;n2=v2,v3", string.Empty));
subscriptions.Should().Contain(("pubsub", "metadata.1", "multiMetadataTopicAttr", "true", string.Empty, "n1=v1", string.Empty));
subscriptions.Should().Contain(("pubsub", "splitMetadataTopicBuilder", "splitMetadataTopics", string.Empty, string.Empty, "n1=v1;n2=v1", string.Empty));

subscriptions.Should().Contain(("pubsub", "metadataseparatorbyemptytring", "topicmetadataseparatorattrbyemptytring", string.Empty, string.Empty, "n1=v1,", string.Empty));
// Test priority route sorting
var eTopic = subscriptions.FindAll(e => e.Topic == "E");
eTopic.Count.Should().Be(3);
Expand Down