Specifying InvariantCulture for IsoDateTimeConverter used by Masstran…

…sit in JsonSerializer (#1)
Nybus-project · Oct 27, 2020 · 82e3c35 · 82e3c35
1 parent 0f2b364
commit 82e3c35
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 1 deletion.
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -1 +1,2 @@
-Renato Golia
+Renato Golia
+Elin Danielsson
diff --git a/src/MassTransit/Configuration/IServiceBusFactory.cs b/src/MassTransit/Configuration/IServiceBusFactory.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
 using MassTransit;
 using MassTransit.SubscriptionConfigurators;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 using Nybus.MassTransit;
 
 namespace Nybus.Configuration
@@ -41,6 +45,10 @@ public IServiceBus CreateServiceBus(MassTransitConnectionDescriptor connectionDe
 
                 bus.ReceiveFrom(receiveUri);
                 bus.UseJsonSerializer();
+
+                bus.ConfigureJsonSerializer(ConfigureIsoDateTimeConverters);
+                bus.ConfigureJsonDeserializer(ConfigureIsoDateTimeConverters);
+
                 bus.SetConcurrentConsumerLimit(_concurrencyLimit);
 
                 foreach (var subscription in subscriptions)
@@ -49,6 +57,18 @@ public IServiceBus CreateServiceBus(MassTransitConnectionDescriptor connectionDe
                 bus.Validate();
             });
         }
+
+        private static JsonSerializerSettings ConfigureIsoDateTimeConverters(JsonSerializerSettings settings)
+        {
+            var isoDateTimeConverters = settings.Converters.OfType<IsoDateTimeConverter>().ToArray();
+
+            foreach (var converter in isoDateTimeConverters)
+            {
+                converter.Culture = CultureInfo.InvariantCulture;
+            }
+
+            return settings;
+        }
     }
 
     public class LoopbackServiceBusFactory : IServiceBusFactory
@@ -64,12 +84,27 @@ public IServiceBus CreateServiceBus(MassTransitConnectionDescriptor connectionDe
                 bus.ReceiveFrom(receiveUri);
                 bus.UseJsonSerializer();
 
+                bus.ConfigureJsonSerializer(ConfigureIsoDateTimeConverters);
+                bus.ConfigureJsonDeserializer(ConfigureIsoDateTimeConverters);
+
                 foreach (var subscription in subscriptions)
                     bus.Subscribe(subscription);
 
                 bus.Validate();
 
             });
         }
+
+        private static JsonSerializerSettings ConfigureIsoDateTimeConverters(JsonSerializerSettings settings)
+        {
+            var isoDateTimeConverters = settings.Converters.OfType<IsoDateTimeConverter>().ToArray();
+
+            foreach (var converter in isoDateTimeConverters)
+            {
+                converter.Culture = CultureInfo.InvariantCulture;
+            }
+
+            return settings;
+        }
     }
 }