[DEVEX-222] Added automatic type resolution

Author: oskardudycz

src/Kurrent.Client/Core/Serialization/MessageSerializer.cs

@@ -11,32 +11,6 @@ public interface IMessageSerializer {
 	public bool TryDeserialize(EventRecord messageRecord, out object? deserialized);
 }
 
-public interface IMessageTypeResolutionStrategy {
-	string ResolveTypeName(object messageData);
-
-#if NET48
-	bool TryResolveClrType(EventRecord messageRecord, out Type? type);
-#else
-	bool TryResolveClrType(EventRecord messageRecord, [NotNullWhen(true)] out Type? type);
-#endif
-}
-
-public class DefaultMessageTypeResolutionStrategy(IMessageTypeMapper messageTypeMapper) : IMessageTypeResolutionStrategy {
-	public string ResolveTypeName(object messageData) {
-		return messageTypeMapper.GetTypeName(messageData.GetType())!;
-	}
-
-#if NET48
-	public bool TryResolveClrType(EventRecord messageRecord, out Type? type){
-#else
-	public bool TryResolveClrType(EventRecord messageRecord, [NotNullWhen(true)] out Type? type) {
-#endif
-		type = messageTypeMapper.GetClrType(messageRecord.EventType);
-
-		return type != null;
-	}
-}
-
 public record MessageDefaultMetadata(
 	[property: JsonPropertyName("$clrTypeAssemblyQualifiedName")]
 	string? MessageTypeAssemblyQualifiedName,

src/Kurrent.Client/Core/Serialization/MessageTypeMapper.cs

@@ -6,53 +6,64 @@ namespace Kurrent.Client.Tests.Streams.Serialization;
 // The scanning part and registration seems to be more robust there
 // I used this for simplicity
 public interface IMessageTypeMapper {
-	void    AddType<T>(string eventTypeName);
-	void    AddType(Type eventType, string eventTypeName);
+	void    AddType<T>(string messageTypeName);
+	void    AddType(Type messageType, string eventTypeName);
 	string? GetTypeName<TEventType>();
-	string? GetTypeName(Type eventType);
-	Type?   GetClrType(string eventTypeName);
+	string? GetTypeName(Type messageType);
+	string  GetOrAddTypeName(Type clrType, Func<Type, string> getTypeName);
+	Type?   GetClrType(string messageTypeName);
+	Type?   GetOrAddClrType(string messageTypeName, Func<string, Type?> getClrType);
 }
 
 public class MessageTypeMapper : IMessageTypeMapper {
 	public static readonly MessageTypeMapper                   Instance     = new MessageTypeMapper();
 	readonly               ConcurrentDictionary<string, Type?> _typeMap     = new();
 	readonly               ConcurrentDictionary<Type, string>  _typeNameMap = new();
 
-	public void AddType<T>(string eventTypeName) => AddType(typeof(T), eventTypeName);
+	public void AddType<T>(string messageTypeName) => AddType(typeof(T), messageTypeName);
 
-	public void AddType(Type eventType, string eventTypeName) {
-		_typeNameMap.AddOrUpdate(eventType, eventTypeName, (_, typeName) => typeName);
-		_typeMap.AddOrUpdate(eventTypeName, eventType, (_, type) => type);
+	public void AddType(Type messageType, string eventTypeName) {
+		_typeNameMap.AddOrUpdate(messageType, eventTypeName, (_, typeName) => typeName);
+		_typeMap.AddOrUpdate(eventTypeName, messageType, (_, type) => type);
 	}
 
-	public string? GetTypeName<TEventType>() => GetTypeName(typeof(TEventType));
+	public string? GetTypeName<TMessageType>() => GetTypeName(typeof(TMessageType));
 
-	public string? GetTypeName(Type eventType) =>
+	public string? GetTypeName(Type messageType) =>
 #if NET48
-		_typeNameMap.TryGetValue(eventType, out var typeName) ? typeName : null;
+		_typeNameMap.TryGetValue(messageType, out var typeName) ? typeName : null;
 #else
-		_typeNameMap.GetValueOrDefault(eventType);
+		_typeNameMap.GetValueOrDefault(messageType);
 #endif
+	
+	public string GetOrAddTypeName(Type clrType, Func<Type, string> getTypeName) =>
+		_typeNameMap.GetOrAdd(clrType,
+			_ => {
+				var typeName = getTypeName(clrType);
+				
+				_typeMap.TryAdd(typeName, clrType);
 
-	public Type? GetClrType(string eventTypeName) =>
+				return typeName;
+			});
+	
+
+	public Type? GetClrType(string messageTypeName) =>
 #if NET48
-		_typeMap.TryGetValue(eventTypeName, out var clrType) ? clrType : null;
+		_typeMap.TryGetValue(messageTypeName, out var clrType) ? clrType : null;
 #else
-		_typeMap.GetValueOrDefault(eventTypeName);
+		_typeMap.GetValueOrDefault(messageTypeName);
 #endif
 
-	public Type? GetClrTypeOrAdd(string eventTypeName, Func<string, Type?> getClrType) =>
-		_typeMap.GetOrAdd(eventTypeName, getClrType);
-
-	// _ => {
-	// 	var type = TypeProvider.GetFirstMatchingTypeFromCurrentDomainAssembly(eventTypeName);
-	//
-	// 	if (type == null)
-	// 		return null;
-	//
-	// 	_typeNameMap.TryAdd(type, eventTypeName);
-	//
-	// 	return type;
-	// }
-	// );
+	public Type? GetOrAddClrType(string messageTypeName, Func<string, Type?> getClrType) =>
+		_typeMap.GetOrAdd(messageTypeName,
+			_ => {
+				var clrType = getClrType(messageTypeName);
+
+				if (clrType == null)
+					return null;
+				
+				_typeNameMap.TryAdd(clrType, messageTypeName);
+
+				return clrType;
+			});
 }

src/Kurrent.Client/Core/Serialization/MessageTypeResolutionStrategy.cs

@@ -0,0 +1,37 @@
+using System.Diagnostics.CodeAnalysis;
+using Kurrent.Client.Tests.Streams.Serialization;
+
+namespace EventStore.Client.Serialization;
+
+public interface IMessageTypeResolutionStrategy {
+	string ResolveTypeName(object messageData);
+
+#if NET48
+	bool TryResolveClrType(EventRecord messageRecord, out Type? type);
+#else
+	bool TryResolveClrType(EventRecord messageRecord, [NotNullWhen(true)] out Type? type);
+#endif
+}
+
+public class DefaultMessageTypeResolutionStrategy(IMessageTypeMapper messageTypeMapper)
+	: IMessageTypeResolutionStrategy {
+	public string ResolveTypeName(object messageData) {
+		return messageTypeMapper.GetOrAddTypeName(
+			messageData.GetType(),
+			clrType => clrType.FullName!
+		)!;
+	}
+
+#if NET48
+	public bool TryResolveClrType(EventRecord messageRecord, out Type? type) {
+#else
+	public bool TryResolveClrType(EventRecord messageRecord, [NotNullWhen(true)] out Type? type) {
+#endif
+		type = messageTypeMapper.GetOrAddClrType(
+			messageRecord.EventType,
+			TypeProvider.GetFirstMatchingTypeFromCurrentDomainAssembly
+		);
+
+		return type != null;
+	}
+}