v0.6.1 - Add SubjectMapping header; fix MessageType header

rickdotnet · Nov 17, 2024 · 81595cb · 81595cb
1 parent 33081af
commit 81595cb
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/build/version.props b/build/version.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<VersionMajor>0</VersionMajor>
 		<VersionMinor>6</VersionMinor>
-		<VersionPatch>0</VersionPatch>
+		<VersionPatch>1</VersionPatch>
 		<VersionQuality />
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)$(VersionQuality)</VersionPrefix>
 	</PropertyGroup>

diff --git a/src/Apollo.Providers.NATS/NatsCoreSubscription.cs b/src/Apollo.Providers.NATS/NatsCoreSubscription.cs
@@ -45,7 +45,7 @@ public async Task Subscribe(CancellationToken cancellationToken)
                 {
                     // type mapping is for endpoint types only
                     var subjectMapping = "";
-                    if (msg.Headers != null && msg.Headers.TryGetValue(ApolloHeader.MessageType, out var apolloType))
+                    if (msg.Headers != null && msg.Headers.TryGetValue(ApolloHeader.SubjectMapping, out var apolloType))
                         subjectMapping = apolloType.First() ?? "";
 
                     if (handlerOnly || subjectTypeMapping.ContainsKey(subjectMapping))
@@ -83,7 +83,7 @@ Task ProcessMessage(NatsMsg<byte[]> natsMsg)
                 Data = natsMsg.Data,
             };
 
-            if (message.Headers.TryGetValue(ApolloHeader.MessageType, out var headerType)
+            if (message.Headers.TryGetValue(ApolloHeader.SubjectMapping, out var headerType)
                 && headerType.Count > 0)
             {
                 message.MessageType =

diff --git a/src/Apollo.Providers.NATS/NatsJetStreamSubscription.cs b/src/Apollo.Providers.NATS/NatsJetStreamSubscription.cs
@@ -67,7 +67,7 @@ await js.CreateStreamAsync(
                 try
                 {
                     var subjectMapping = "";
-                    if (msg.Headers != null && msg.Headers.TryGetValue(ApolloHeader.MessageType, out var apolloType))
+                    if (msg.Headers != null && msg.Headers.TryGetValue(ApolloHeader.SubjectMapping, out var apolloType))
                         subjectMapping = apolloType.First() ?? "";
 
                     if (handlerOnly || subjectTypeMapping.ContainsKey(subjectMapping))
@@ -118,7 +118,7 @@ Task ProcessMessage(NatsJSMsg<byte[]> natsMsg)
             };
 
             var subjectMapping = "";
-            if (natsMsg.Headers != null && natsMsg.Headers.TryGetValue(ApolloHeader.MessageType, out var apolloType))
+            if (natsMsg.Headers != null && natsMsg.Headers.TryGetValue(ApolloHeader.SubjectMapping, out var apolloType))
                 subjectMapping = apolloType.First() ?? "";
 
             subjectTypeMapping.TryGetValue(subjectMapping, out var messageType);

diff --git a/src/Apollo/ApolloHeader.cs b/src/Apollo/ApolloHeader.cs
@@ -2,6 +2,7 @@ namespace Apollo;
 
 public static class ApolloHeader
 {
+    public const string SubjectMapping = "apollo-subject-mapping";
     public const string MessageType = "apollo-message-type";
     public const string MessageClrType = "apollo-message-clr-type";
     public const string MessageAction = "apollo-message-action";

diff --git a/src/Apollo/Internal/DefaultPublisher.cs b/src/Apollo/Internal/DefaultPublisher.cs
@@ -51,9 +51,10 @@ private ApolloMessage CreateApolloMessage<TMessage>(TMessage message, string act
             MessageType = messageType,
             Headers = new Dictionary<string, StringValues>
             {
-                {ApolloHeader.MessageType, subjectTypeMapper.ApolloMessageType(messageType.Name)},
-                {ApolloHeader.MessageClrType, messageType.AssemblyQualifiedName!},
-                {ApolloHeader.MessageAction, action}
+                [ApolloHeader.MessageType] = messageType.Name,
+                [ApolloHeader.SubjectMapping] = subjectTypeMapper.ApolloMessageType(messageType.Name),
+                [ApolloHeader.MessageClrType] = messageType.AssemblyQualifiedName!,
+                [ApolloHeader.MessageAction] = action
             }
         };
     }