Fixed object serialization issue

src/modules/Elsa.MongoDB/Features/MongoDbFeature.cs

@@ -13,7 +13,6 @@
 using Elsa.MongoDB.Modules.Runtime;
 using Elsa.MongoDB.Options;
 using Elsa.MongoDB.Serializers;
-using Elsa.MongoDB.Stores.Management;
 using Elsa.Workflows.Core.Services;
 using Elsa.Workflows.Core.State;
 using Elsa.Workflows.Management.Contracts;
@@ -53,17 +52,17 @@ public override void Apply()
 
  Services.AddSingleton(CreateDatabase);
 
- RegisterClassMaps();
+ RegisterSerializers();
 
  AddMongoCollection<Application>(Services, "applications");
  AddMongoCollection<User>(Services, "users");
  AddMongoCollection<Role>(Services, "roles");
  AddMongoCollection<Label>(Services, "labels");
- AddMongoCollection<WorkflowDefinitionLabel>(Services, "workflow-definition-labels");
- AddMongoCollection<WorkflowDefinition>(Services, "workflow-definitions");
- AddMongoCollection<WorkflowInstance>(Services, "workflow-instances");
- AddMongoCollection<WorkflowState>(Services, "workflow-definitions");
- AddMongoCollection<WorkflowExecutionLogRecord>(Services, "workflow-instances");
+ AddMongoCollection<WorkflowDefinitionLabel>(Services, "workflow_definition_labels");
+ AddMongoCollection<WorkflowDefinition>(Services, "workflow_definitions");
+ AddMongoCollection<WorkflowInstance>(Services, "workflow_instances");
+ AddMongoCollection<WorkflowState>(Services, "workflow_definitions");
+ AddMongoCollection<WorkflowExecutionLogRecord>(Services, "workflow_instances");
  AddMongoCollection<StoredTrigger>(Services, "triggers");
  AddMongoCollection<StoredBookmark>(Services, "bookmarks");
 
@@ -83,18 +82,9 @@ public override void Apply()
  .AddHealthChecks();
  }
 
- private void RegisterClassMaps()
+ private void RegisterSerializers()
  {
- BsonClassMap.RegisterClassMap<HttpEndpointBookmarkPayload>(cm =>
- {
- cm.AutoMap();
- cm.SetDiscriminator("HttpEndpointBookmarkPayload");
- });
-
- BsonClassMap.RegisterClassMap<StoredTrigger>(cm => {
- cm.AutoMap();
- cm.GetMemberMap(c => c.Payload).SetSerializer(new PolymorphicSerializer());
- });
+ BsonSerializer.RegisterSerializer(typeof(object), new PolymorphicSerializer());
  }
 
  private static IMongoDatabase CreateDatabase(IServiceProvider sp)
@@ -103,7 +93,7 @@ private static IMongoDatabase CreateDatabase(IServiceProvider sp)
  var settings = MongoClientSettings.FromConnectionString(options.ConnectionString);
 
  settings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
- settings.ApplicationName = "elsa-workflows";
+ settings.ApplicationName = "elsa_workflows";
  settings.WriteConcern = WriteConcern.WMajority;
  settings.ReadConcern = ReadConcern.Available;
  settings.ReadPreference = ReadPreference.Nearest;

src/modules/Elsa.MongoDB/Serializers/PolymorphicSerializer.cs

@@ -1,50 +1,50 @@
-using Elsa.Http.Models;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
+using MongoDB.Bson.Serialization.Serializers;
 
 namespace Elsa.MongoDB.Serializers;
 
 public class PolymorphicSerializer : IBsonSerializer<object>
 {
- private readonly Dictionary<string, IBsonSerializer> _serializers = new Dictionary<string, IBsonSerializer>();
-
- public PolymorphicSerializer()
- {
- _serializers.Add(typeof(HttpEndpointBookmarkPayload).FullName, new HttpEndpointBookmarkPayloadSerializer());
- }
-
  public Type ValueType => typeof(object);
 
  public object Deserialize(BsonDeserializationContext context, BsonDeserializationArgs args)
  {
- var typeValue = context.Reader.ReadString();
- if (_serializers.TryGetValue(typeValue, out var serializer))
+ var reader = context.Reader;
+ var bookmark = reader.GetBookmark();
+ var bsonType = reader.GetCurrentBsonType();
+ if (bsonType == BsonType.Document)
  {
- return serializer.Deserialize(context, args);
+ var document = BsonDocumentSerializer.Instance.Deserialize(context);
+ if (document.Contains("$type") && document.Contains("$value"))
+ {
+ var typeValue = document["$type"].AsString;
+ var type = Type.GetType(typeValue);
+ var value = BsonSerializer.Deserialize(document["$value"].AsBsonDocument, type);
+ return value;
+ }
  }
- throw new BsonSerializationException($"No serializer found for type {typeValue}");
+ reader.ReturnToBookmark(bookmark);
+ return BsonValueSerializer.Instance.Deserialize(context);
  }
 
- public void Serialize(BsonSerializationContext context, BsonSerializationArgs args, object value)
+ public void Serialize(BsonSerializationContext context, BsonSerializationArgs args, object? value)
  {
- if (_serializers.TryGetValue(value.GetType().FullName, out var serializer))
+ var writer = context.Writer;
+ if (value == null)
  {
- context.Writer.WriteString(value.GetType().FullName);
- serializer.Serialize(context, args, value);
+ writer.WriteNull();
  }
  else
  {
- throw new BsonSerializationException($"No serializer found for type {value.GetType().FullName}");
+ var type = value.GetType();
+ var serializer = BsonSerializer.LookupSerializer(type);
+ writer.WriteStartDocument();
+ writer.WriteName("$type");
+ writer.WriteString(type.AssemblyQualifiedName);
+ writer.WriteName("$value");
+ serializer.Serialize(context, value);
+ writer.WriteEndDocument();
  }
  }
-
- object IBsonSerializer.Deserialize(BsonDeserializationContext context, BsonDeserializationArgs args)
- {
- return Deserialize(context, args);
- }
-
- void IBsonSerializer.Serialize(BsonSerializationContext context, BsonSerializationArgs args, object value)
- {
- Serialize(context, args, value);
- }
 }