Carael/handle nullable application properties (#49)

* Handle nullable application properties - defaults type to string if null Fixes #44
Carael · Mar 8, 2024 · 01897b0 · 01897b0
1 parent 27e6f38
commit 01897b0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/src/Core/ServiceBus.Contracts/Types/Message.cs b/src/Core/ServiceBus.Contracts/Types/Message.cs
@@ -6,4 +6,4 @@ public record Message(
     string? Subject,
     string Body,
     MessageSystemProperties SystemProperties,
-    IReadOnlyDictionary<string, object>? ApplicationProperties);
+    IReadOnlyDictionary<string, object?>? ApplicationProperties);
diff --git a/src/Core/ServiceBus/Extensions/ApplicationPropertyTypeExtensions.cs b/src/Core/ServiceBus/Extensions/ApplicationPropertyTypeExtensions.cs
@@ -4,9 +4,10 @@ namespace CrossBusExplorer.ServiceBus.Extensions
 {
     public static class ApplicationPropertyTypeExtensions
     {
-        public static ApplicationPropertyType GetApplicationPropertyType(this object value) =>
+        public static ApplicationPropertyType GetApplicationPropertyType(this object? value) =>
             value switch
             {
+                null => ApplicationPropertyType.String,
                 string _ => ApplicationPropertyType.String,
                 bool _ => ApplicationPropertyType.Bool,
                 byte _ => ApplicationPropertyType.Byte,
@@ -24,16 +25,21 @@ public static ApplicationPropertyType GetApplicationPropertyType(this object val
                 Guid _ => ApplicationPropertyType.Guid,
                 DateTime _ => ApplicationPropertyType.DateTime,
                 DateTimeOffset _ => ApplicationPropertyType.DateTimeOffset,
-                Stream _ => ApplicationPropertyType.Stream,
                 Uri _ => ApplicationPropertyType.Uri,
                 TimeSpan _ => ApplicationPropertyType.TimeSpan,
-                _ => throw new ArgumentOutOfRangeException($"Type {value.GetType()} is not supported")
+                _ => throw new ArgumentOutOfRangeException(
+                    $"Type {value?.GetType()} is not supported")
             };
 
-        public static object GetApplicationPropertyValue(
-            this string value,
+        public static object? GetApplicationPropertyValue(
+            this string? value,
             ApplicationPropertyType type)
         {
+            if (value == null)
+            {
+                return value;
+            }
+
             switch (type)
             {
                 case ApplicationPropertyType.String:
@@ -84,8 +90,6 @@ public static object GetApplicationPropertyValue(
                     return DateTime.Parse(value);
                 case ApplicationPropertyType.DateTimeOffset:
                     return DateTimeOffset.Parse(value);
-                case ApplicationPropertyType.Stream:
-                    throw new InvalidOperationException("Cannot parse Stream from string.");
                 case ApplicationPropertyType.Uri:
                     return new Uri(value);
                 case ApplicationPropertyType.TimeSpan:

diff --git a/src/Ui/Website.Host/electron.manifest.json b/src/Ui/Website.Host/electron.manifest.json
@@ -13,7 +13,7 @@
     "appId": "com.crossbusexplorer.app",
     "productName": "Cross Bus Explorer",
     "copyright": "Copyright © 2024",
-    "buildVersion": "0.4.5",
+    "buildVersion": "0.4.6",
     "compression": "maximum",
     "directories": {
       "output": "../../../bin/Desktop"

diff --git a/src/Ui/Website/Mappings/MessageMappings.cs b/src/Ui/Website/Mappings/MessageMappings.cs
@@ -48,7 +48,7 @@ public static MessageDetailsModel ToSendMessageModel(this Message message) =>
                         new KeyValueTypePair
                         {
                             Key = p.Key,
-                            Value = p.Value.ToString() ?? string.Empty,
+                            Value = p.Value?.ToString() ?? null,
                             Type = p.Value.GetApplicationPropertyType()
                         }).ToList() ?? new List<KeyValueTypePair>())
         };

diff --git a/src/Ui/Website/Models/KeyValueTypePair.cs b/src/Ui/Website/Models/KeyValueTypePair.cs
@@ -19,9 +19,9 @@ public string Key
         }
     }
 
-    private string _value;
+    private string? _value;
 
-    public string Value
+    public string? Value
     {
         get => _value;
         set