diff --git a/src/MongoDB.Bson/BsonDefaults.cs b/src/MongoDB.Bson/BsonDefaults.cs index 9352d3228ff..a356b268759 100644 --- a/src/MongoDB.Bson/BsonDefaults.cs +++ b/src/MongoDB.Bson/BsonDefaults.cs @@ -42,7 +42,7 @@ public static IBsonSerializer DynamicArraySerializer { if (!__dynamicArraySerializerWasSet) { - __dynamicArraySerializer = BsonSerializer.LookupSerializer>(); + __dynamicArraySerializer = BsonSerializer.LookupSerializer>(); //TODO Should we change this? Maybe all the classes that are using this should use the local domain if this is not set } return __dynamicArraySerializer; } @@ -62,7 +62,7 @@ public static IBsonSerializer DynamicDocumentSerializer { if (!__dynamicDocumentSerializerWasSet) { - __dynamicDocumentSerializer = BsonSerializer.LookupSerializer(); + __dynamicDocumentSerializer = BsonSerializer.LookupSerializer(); //TODO ?? } return __dynamicDocumentSerializer; } diff --git a/src/MongoDB.Bson/BsonExtensionMethods.cs b/src/MongoDB.Bson/BsonExtensionMethods.cs index bcb41a8271f..12ce893ac6d 100644 --- a/src/MongoDB.Bson/BsonExtensionMethods.cs +++ b/src/MongoDB.Bson/BsonExtensionMethods.cs @@ -68,6 +68,31 @@ public static byte[] ToBson( BsonBinaryWriterSettings writerSettings = null, IBsonSerializer serializer = null, Action configurator = null, + BsonSerializationArgs args = default, + int estimatedBsonSize = 0) => ToBson(obj, nominalType, BsonSerializer.DefaultSerializationDomain, writerSettings, + serializer, configurator, args, estimatedBsonSize); + + /// + /// //TODO + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static byte[] ToBson( + this object obj, + Type nominalType, + IBsonSerializationDomain domain, + BsonBinaryWriterSettings writerSettings = null, + IBsonSerializer serializer = null, + Action configurator = null, BsonSerializationArgs args = default(BsonSerializationArgs), int estimatedBsonSize = 0) { @@ -84,7 +109,7 @@ public static byte[] ToBson( if (serializer == null) { - serializer = BsonSerializer.LookupSerializer(nominalType); + serializer = domain.LookupSerializer(nominalType); } if (serializer.ValueType != nominalType) { @@ -138,7 +163,28 @@ public static BsonDocument ToBsonDocument( Type nominalType, IBsonSerializer serializer = null, Action configurator = null, - BsonSerializationArgs args = default(BsonSerializationArgs)) + BsonSerializationArgs args = default) => ToBsonDocument(obj, nominalType, + BsonSerializer.DefaultSerializationDomain, serializer, configurator, args); + + /// + /// //TODO + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static BsonDocument ToBsonDocument( + this object obj, + Type nominalType, + IBsonSerializationDomain domain, + IBsonSerializer serializer = null, + Action configurator = null, + BsonSerializationArgs args = default) { if (nominalType == null) { @@ -165,7 +211,7 @@ public static BsonDocument ToBsonDocument( return convertibleToBsonDocument.ToBsonDocument(); // use the provided ToBsonDocument method } - serializer = BsonSerializer.LookupSerializer(nominalType); + serializer = domain.LookupSerializer(nominalType); } if (serializer.ValueType != nominalType) { @@ -226,6 +272,29 @@ public static string ToJson( JsonWriterSettings writerSettings = null, IBsonSerializer serializer = null, Action configurator = null, + BsonSerializationArgs args = default) + => ToJson(obj, nominalType, BsonSerializer.DefaultSerializationDomain, writerSettings, serializer, configurator, args); + + /// + /// //TODO + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + /// + public static string ToJson( + this object obj, + Type nominalType, + IBsonSerializationDomain domain, + JsonWriterSettings writerSettings = null, + IBsonSerializer serializer = null, + Action configurator = null, BsonSerializationArgs args = default(BsonSerializationArgs)) { if (nominalType == null) @@ -236,7 +305,7 @@ public static string ToJson( if (serializer == null) { - serializer = BsonSerializer.LookupSerializer(nominalType); + serializer = domain.LookupSerializer(nominalType); } if (serializer.ValueType != nominalType) { diff --git a/src/MongoDB.Bson/IO/BsonBinaryReaderSettings.cs b/src/MongoDB.Bson/IO/BsonBinaryReaderSettings.cs index 72305ed0169..7d10322db70 100644 --- a/src/MongoDB.Bson/IO/BsonBinaryReaderSettings.cs +++ b/src/MongoDB.Bson/IO/BsonBinaryReaderSettings.cs @@ -136,7 +136,8 @@ protected override BsonReaderSettings CloneImplementation() Encoding = _encoding, FixOldBinarySubTypeOnInput = _fixOldBinarySubTypeOnInput, FixOldDateTimeMaxValueOnInput = _fixOldDateTimeMaxValueOnInput, - MaxDocumentSize = _maxDocumentSize + MaxDocumentSize = _maxDocumentSize, + SerializationDomain = SerializationDomain, //TODO This can be improved }; return clone; diff --git a/src/MongoDB.Bson/IO/BsonBinaryWriterSettings.cs b/src/MongoDB.Bson/IO/BsonBinaryWriterSettings.cs index 96c8f3168de..93da7f95a2d 100644 --- a/src/MongoDB.Bson/IO/BsonBinaryWriterSettings.cs +++ b/src/MongoDB.Bson/IO/BsonBinaryWriterSettings.cs @@ -122,7 +122,8 @@ protected override BsonWriterSettings CloneImplementation() Encoding = _encoding, FixOldBinarySubTypeOnOutput = _fixOldBinarySubTypeOnOutput, MaxDocumentSize = _maxDocumentSize, - MaxSerializationDepth = MaxSerializationDepth + MaxSerializationDepth = MaxSerializationDepth, + SerializationDomain = SerializationDomain, }; return clone; } diff --git a/src/MongoDB.Bson/IO/BsonDocumentReaderSettings.cs b/src/MongoDB.Bson/IO/BsonDocumentReaderSettings.cs index 3b87c603ffd..b1d78974a3a 100644 --- a/src/MongoDB.Bson/IO/BsonDocumentReaderSettings.cs +++ b/src/MongoDB.Bson/IO/BsonDocumentReaderSettings.cs @@ -67,7 +67,7 @@ public static BsonDocumentReaderSettings Defaults /// A clone of the settings. protected override BsonReaderSettings CloneImplementation() { - var clone = new BsonDocumentReaderSettings(); + var clone = new BsonDocumentReaderSettings { SerializationDomain = SerializationDomain }; //TODO This can be improved return clone; } } diff --git a/src/MongoDB.Bson/IO/BsonReaderSettings.cs b/src/MongoDB.Bson/IO/BsonReaderSettings.cs index 649c02ff59c..36b7fc1e58e 100644 --- a/src/MongoDB.Bson/IO/BsonReaderSettings.cs +++ b/src/MongoDB.Bson/IO/BsonReaderSettings.cs @@ -14,6 +14,7 @@ */ using System; +using MongoDB.Bson.Serialization; namespace MongoDB.Bson.IO { @@ -24,6 +25,7 @@ public abstract class BsonReaderSettings { // private fields private bool _isFrozen; + private IBsonSerializationDomain _serializationDomain; // constructors /// @@ -77,6 +79,19 @@ public BsonReaderSettings FrozenCopy() } } + /// + /// //TODO + /// + public IBsonSerializationDomain SerializationDomain + { + get => _serializationDomain; + set + { + if (_isFrozen) { ThrowFrozenException(); } + _serializationDomain = value; + } + } + // protected methods /// /// Creates a clone of the settings. diff --git a/src/MongoDB.Bson/IO/BsonWriterSettings.cs b/src/MongoDB.Bson/IO/BsonWriterSettings.cs index 06957993d70..c4730dce269 100644 --- a/src/MongoDB.Bson/IO/BsonWriterSettings.cs +++ b/src/MongoDB.Bson/IO/BsonWriterSettings.cs @@ -14,6 +14,7 @@ */ using System; +using MongoDB.Bson.Serialization; namespace MongoDB.Bson.IO { @@ -25,6 +26,7 @@ public abstract class BsonWriterSettings // private fields private bool _isFrozen; private int _maxSerializationDepth = BsonDefaults.MaxSerializationDepth; + private IBsonSerializationDomain _serializationDomain; // constructors /// @@ -92,6 +94,19 @@ public BsonWriterSettings FrozenCopy() } } + /// + /// //TODO + /// + public IBsonSerializationDomain SerializationDomain + { + get => _serializationDomain; + set + { + if (_isFrozen) { ThrowFrozenException(); } + _serializationDomain = value; + } + } + // protected methods /// /// Creates a clone of the settings. diff --git a/src/MongoDB.Bson/IO/IBsonReader.cs b/src/MongoDB.Bson/IO/IBsonReader.cs index 14af4722a33..e42c4a188db 100644 --- a/src/MongoDB.Bson/IO/IBsonReader.cs +++ b/src/MongoDB.Bson/IO/IBsonReader.cs @@ -62,7 +62,7 @@ public interface IBsonReader : IDisposable /// /// Pops the settings. /// - void PopSettings(); + void PopSettings(); //TODO Why do we have push and pop methods? They are not used /// /// Pushes new settings for the reader. diff --git a/src/MongoDB.Bson/IO/JsonReaderSettings.cs b/src/MongoDB.Bson/IO/JsonReaderSettings.cs index 383d4f7271f..f44b0e1000e 100644 --- a/src/MongoDB.Bson/IO/JsonReaderSettings.cs +++ b/src/MongoDB.Bson/IO/JsonReaderSettings.cs @@ -68,7 +68,7 @@ public static JsonReaderSettings Defaults /// A clone of the settings. protected override BsonReaderSettings CloneImplementation() { - var clone = new JsonReaderSettings(); + var clone = new JsonReaderSettings { SerializationDomain = SerializationDomain }; //TODO This can be improved return clone; } } diff --git a/src/MongoDB.Bson/ObjectModel/BsonDocumentWrapper.cs b/src/MongoDB.Bson/ObjectModel/BsonDocumentWrapper.cs index 09edc32dbfa..2640dbe5614 100644 --- a/src/MongoDB.Bson/ObjectModel/BsonDocumentWrapper.cs +++ b/src/MongoDB.Bson/ObjectModel/BsonDocumentWrapper.cs @@ -91,9 +91,19 @@ public object Wrapped /// The nominal type of the wrapped object. /// The wrapped object. /// A BsonDocumentWrapper. - public static BsonDocumentWrapper Create(TNominalType value) + public static BsonDocumentWrapper Create(TNominalType value) => + Create(value, BsonSerializer.DefaultSerializationDomain); + + /// + /// //TODO + /// + /// + /// + /// + /// + public static BsonDocumentWrapper Create(TNominalType value, IBsonSerializationDomain domain) { - return Create(typeof(TNominalType), value); + return Create(typeof(TNominalType), value, domain); } /// @@ -102,9 +112,19 @@ public static BsonDocumentWrapper Create(TNominalType value) /// The nominal type of the wrapped object. /// The wrapped object. /// A BsonDocumentWrapper. - public static BsonDocumentWrapper Create(Type nominalType, object value) + public static BsonDocumentWrapper Create(Type nominalType, object value) => + Create(nominalType, value, BsonSerializer.DefaultSerializationDomain); + + /// + /// //TODO + /// + /// + /// + /// + /// + public static BsonDocumentWrapper Create(Type nominalType, object value, IBsonSerializationDomain domain) { - var serializer = BsonSerializer.LookupSerializer(nominalType); + var serializer = domain.LookupSerializer(nominalType); //TODO ?? return new BsonDocumentWrapper(value, serializer); } @@ -114,14 +134,25 @@ public static BsonDocumentWrapper Create(Type nominalType, object value) /// The nominal type of the wrapped objects. /// A list of wrapped objects. /// A list of BsonDocumentWrappers. - public static IEnumerable CreateMultiple(IEnumerable values) + public static IEnumerable CreateMultiple(IEnumerable values) => + CreateMultiple(values, BsonSerializer.DefaultSerializationDomain); + + /// + /// //TODO + /// + /// + /// + /// + /// + /// + public static IEnumerable CreateMultiple(IEnumerable values, IBsonSerializationDomain domain) { if (values == null) { throw new ArgumentNullException("values"); } - var serializer = BsonSerializer.LookupSerializer(typeof(TNominalType)); + var serializer = domain.LookupSerializer(typeof(TNominalType)); return values.Select(v => new BsonDocumentWrapper(v, serializer)); } @@ -131,7 +162,18 @@ public static IEnumerable CreateMultiple(IEnu /// The nominal type of the wrapped object. /// A list of wrapped objects. /// A list of BsonDocumentWrappers. - public static IEnumerable CreateMultiple(Type nominalType, IEnumerable values) + public static IEnumerable CreateMultiple(Type nominalType, IEnumerable values) => + CreateMultiple(nominalType, values, BsonSerializer.DefaultSerializationDomain); + + /// + /// //TODO + /// + /// + /// + /// + /// + /// + public static IEnumerable CreateMultiple(Type nominalType, IEnumerable values, IBsonSerializationDomain domain) { if (nominalType == null) { @@ -142,7 +184,7 @@ public static IEnumerable CreateMultiple(Type nominalType, throw new ArgumentNullException("values"); } - var serializer = BsonSerializer.LookupSerializer(nominalType); + var serializer = domain.LookupSerializer(nominalType); return values.Cast().Select(v => new BsonDocumentWrapper(v, serializer)); } diff --git a/src/MongoDB.Bson/Serialization/BsonClassMap.cs b/src/MongoDB.Bson/Serialization/BsonClassMap.cs index 87239a33bf5..e14b55c8ea5 100644 --- a/src/MongoDB.Bson/Serialization/BsonClassMap.cs +++ b/src/MongoDB.Bson/Serialization/BsonClassMap.cs @@ -31,15 +31,9 @@ namespace MongoDB.Bson.Serialization /// public class BsonClassMap { - // private static fields - private readonly static Dictionary __classMaps = new Dictionary(); - private readonly static Queue __knownTypesQueue = new Queue(); - private static int __freezeNestingLevel = 0; - // private fields private readonly Type _classType; private readonly List _creatorMaps; - private readonly IConventionPack _conventionPack; private readonly bool _isAnonymous; private readonly List _allMemberMaps; // includes inherited member maps private readonly ReadOnlyCollection _allMemberMapsReadonly; @@ -70,7 +64,6 @@ public BsonClassMap(Type classType) { _classType = classType; _creatorMaps = new List(); - _conventionPack = ConventionRegistry.Lookup(classType); _isAnonymous = classType.IsAnonymousType(); _allMemberMaps = new List(); _allMemberMapsReadonly = _allMemberMaps.AsReadOnly(); @@ -124,14 +117,6 @@ public IEnumerable CreatorMaps get { return _creatorMaps; } } - /// - /// Gets the conventions used for auto mapping. - /// - public IConventionPack ConventionPack - { - get { return _conventionPack; } - } - /// /// Gets the declared member maps (only for members declared in this class). /// @@ -282,103 +267,32 @@ public static Type GetMemberInfoType(MemberInfo memberInfo) /// Gets all registered class maps. /// /// All registered class maps. - public static IEnumerable GetRegisteredClassMaps() - { - BsonSerializer.ConfigLock.EnterReadLock(); - try - { - return __classMaps.Values.ToList(); // return a copy for thread safety - } - finally - { - BsonSerializer.ConfigLock.ExitReadLock(); - } - } + public static IEnumerable GetRegisteredClassMaps() => + BsonSerializer.DefaultSerializationDomain.BsonClassMap.GetRegisteredClassMaps(); /// /// Checks whether a class map is registered for a type. /// /// The type to check. /// True if there is a class map registered for the type. - public static bool IsClassMapRegistered(Type type) - { - if (type == null) - { - throw new ArgumentNullException("type"); - } - - BsonSerializer.ConfigLock.EnterReadLock(); - try - { - return __classMaps.ContainsKey(type); - } - finally - { - BsonSerializer.ConfigLock.ExitReadLock(); - } - } + public static bool IsClassMapRegistered(Type type) => + BsonSerializer.DefaultSerializationDomain.BsonClassMap.IsClassMapRegistered(type); /// /// Looks up a class map (will AutoMap the class if no class map is registered). /// /// The class type. /// The class map. - public static BsonClassMap LookupClassMap(Type classType) - { - if (classType == null) - { - throw new ArgumentNullException("classType"); - } - - BsonSerializer.ConfigLock.EnterReadLock(); - try - { - if (__classMaps.TryGetValue(classType, out var classMap)) - { - if (classMap.IsFrozen) - { - return classMap; - } - } - } - finally - { - BsonSerializer.ConfigLock.ExitReadLock(); - } - - // automatically create a new classMap for classType and register it (unless another thread does first) - // do the work of speculatively creating a new class map outside of holding any lock - var classMapDefinition = typeof(BsonClassMap<>); - var classMapType = classMapDefinition.MakeGenericType(classType); - var newClassMap = (BsonClassMap)Activator.CreateInstance(classMapType); - newClassMap.AutoMap(); - - BsonSerializer.ConfigLock.EnterWriteLock(); - try - { - if (!__classMaps.TryGetValue(classType, out var classMap)) - { - RegisterClassMap(newClassMap); - classMap = newClassMap; - } - - return classMap.Freeze(); - } - finally - { - BsonSerializer.ConfigLock.ExitWriteLock(); - } - } + public static BsonClassMap LookupClassMap(Type classType) => + BsonSerializer.DefaultSerializationDomain.BsonClassMap.LookupClassMap(classType); /// /// Creates and registers a class map. /// /// The class. /// The class map. - public static BsonClassMap RegisterClassMap() - { - return RegisterClassMap(cm => { cm.AutoMap(); }); - } + public static BsonClassMap RegisterClassMap()=> + BsonSerializer.DefaultSerializationDomain.BsonClassMap.RegisterClassMap(); /// /// Creates and registers a class map. @@ -387,35 +301,14 @@ public static BsonClassMap RegisterClassMap() /// The class map initializer. /// The class map. public static BsonClassMap RegisterClassMap(Action> classMapInitializer) - { - var classMap = new BsonClassMap(classMapInitializer); - RegisterClassMap(classMap); - return classMap; - } + => BsonSerializer.DefaultSerializationDomain.BsonClassMap.RegisterClassMap(classMapInitializer); /// /// Registers a class map. /// /// The class map. public static void RegisterClassMap(BsonClassMap classMap) - { - if (classMap == null) - { - throw new ArgumentNullException("classMap"); - } - - BsonSerializer.ConfigLock.EnterWriteLock(); - try - { - // note: class maps can NOT be replaced (because derived classes refer to existing instance) - __classMaps.Add(classMap.ClassType, classMap); - BsonSerializer.RegisterDiscriminator(classMap.ClassType, classMap.Discriminator); - } - finally - { - BsonSerializer.ConfigLock.ExitWriteLock(); - } - } + => BsonSerializer.DefaultSerializationDomain.BsonClassMap.RegisterClassMap(classMap); /// /// Registers a class map if it is not already registered. @@ -423,16 +316,7 @@ public static void RegisterClassMap(BsonClassMap classMap) /// The class. /// True if this call registered the class map, false if the class map was already registered. public static bool TryRegisterClassMap() - { - return TryRegisterClassMap(ClassMapFactory); - - static BsonClassMap ClassMapFactory() - { - var classMap = new BsonClassMap(); - classMap.AutoMap(); - return classMap; - } - } + => BsonSerializer.DefaultSerializationDomain.BsonClassMap.TryRegisterClassMap(); /// /// Registers a class map if it is not already registered. @@ -441,19 +325,7 @@ static BsonClassMap ClassMapFactory() /// The class map. /// True if this call registered the class map, false if the class map was already registered. public static bool TryRegisterClassMap(BsonClassMap classMap) - { - if (classMap == null) - { - throw new ArgumentNullException(nameof(classMap)); - } - - return TryRegisterClassMap(ClassMapFactory); - - BsonClassMap ClassMapFactory() - { - return classMap; - } - } + => BsonSerializer.DefaultSerializationDomain.BsonClassMap.TryRegisterClassMap(classMap); /// /// Registers a class map if it is not already registered. @@ -462,19 +334,7 @@ BsonClassMap ClassMapFactory() /// The class map initializer (only called if the class map is not already registered). /// True if this call registered the class map, false if the class map was already registered. public static bool TryRegisterClassMap(Action> classMapInitializer) - { - if (classMapInitializer == null) - { - throw new ArgumentNullException(nameof(classMapInitializer)); - } - - return TryRegisterClassMap(ClassMapFactory); - - BsonClassMap ClassMapFactory() - { - return new BsonClassMap(classMapInitializer); - } - } + => BsonSerializer.DefaultSerializationDomain.BsonClassMap.TryRegisterClassMap(classMapInitializer); /// /// Registers a class map if it is not already registered. @@ -483,54 +343,22 @@ BsonClassMap ClassMapFactory() /// The class map factory (only called if the class map is not already registered). /// True if this call registered the class map, false if the class map was already registered. public static bool TryRegisterClassMap(Func> classMapFactory) - { - if (classMapFactory == null) - { - throw new ArgumentNullException(nameof(classMapFactory)); - } - - BsonSerializer.ConfigLock.EnterReadLock(); - try - { - if (__classMaps.ContainsKey(typeof(TClass))) - { - return false; - } - } - finally - { - BsonSerializer.ConfigLock.ExitReadLock(); - } - - BsonSerializer.ConfigLock.EnterWriteLock(); - try - { - if (__classMaps.ContainsKey(typeof(TClass))) - { - return false; - } - else - { - // create a classMap for TClass and register it - var classMap = classMapFactory(); - RegisterClassMap(classMap); - return true; - } - } - finally - { - BsonSerializer.ConfigLock.ExitWriteLock(); - } - } + => BsonSerializer.DefaultSerializationDomain.BsonClassMap.TryRegisterClassMap(classMapFactory); // public methods /// /// Automaps the class. /// - public void AutoMap() + public void AutoMap() => AutoMap(BsonSerializer.DefaultSerializationDomain); + + /// + /// //TODO + /// + /// + public void AutoMap(IBsonSerializationDomain serializationDomain) { if (_frozen) { ThrowFrozenException(); } - AutoMapClass(); + AutoMapClass(serializationDomain); } /// @@ -573,13 +401,29 @@ obj is BsonClassMap other && /// public override int GetHashCode() => 0; + internal class FreezeContext + { + public int FreezeNestingLevel { get; set; } = 0; + public Queue KnownTypesQueue { get; set; } = new(); + public IBsonSerializationDomain SerializationDomain { get; set; } + } + /// /// Freezes the class map. /// /// The frozen class map. - public BsonClassMap Freeze() + public BsonClassMap Freeze() => Freeze(BsonSerializer.DefaultSerializationDomain); + + internal BsonClassMap Freeze(IBsonSerializationDomain domain) + { + var freezeContext = new FreezeContext { SerializationDomain = domain }; + return Freeze(freezeContext); + } + + private BsonClassMap Freeze(FreezeContext context) //TODO This is not completely correct, because LookupClassMap calls freeze { - BsonSerializer.ConfigLock.EnterReadLock(); + var configLock = (context.SerializationDomain as IBsonSerializationDomainInternal)!.ConfigLock; //TODO This is ugly + configLock.EnterReadLock(); try { if (_frozen) @@ -589,15 +433,15 @@ public BsonClassMap Freeze() } finally { - BsonSerializer.ConfigLock.ExitReadLock(); + configLock.ExitReadLock(); } - BsonSerializer.ConfigLock.EnterWriteLock(); + configLock.EnterWriteLock(); try { if (!_frozen) { - __freezeNestingLevel++; + context.FreezeNestingLevel++; try { var baseType = _classType.GetTypeInfo().BaseType; @@ -605,9 +449,9 @@ public BsonClassMap Freeze() { if (_baseClassMap == null) { - _baseClassMap = LookupClassMap(baseType); + _baseClassMap = context.SerializationDomain.BsonClassMap.LookupClassMap(baseType); } - _baseClassMap.Freeze(); + _baseClassMap.Freeze(context); //TODO This is not necessary, because LookupClassMap will only return a frozen class map _discriminatorIsRequired |= _baseClassMap._discriminatorIsRequired; _hasRootClass |= (_isRootClass || _baseClassMap.HasRootClass); _allMemberMaps.AddRange(_baseClassMap.AllMemberMaps); @@ -699,28 +543,28 @@ public BsonClassMap Freeze() // this avoids infinite recursion when going back down the inheritance tree while processing known types foreach (var knownType in _knownTypes) { - __knownTypesQueue.Enqueue(knownType); + context.KnownTypesQueue.Enqueue(knownType); } // if we are back to the first level go ahead and process any queued known types - if (__freezeNestingLevel == 1) + if (context.FreezeNestingLevel == 1) { - while (__knownTypesQueue.Count != 0) + while (context.KnownTypesQueue.Count != 0) { - var knownType = __knownTypesQueue.Dequeue(); - LookupClassMap(knownType); // will AutoMap and/or Freeze knownType if necessary + var knownType = context.KnownTypesQueue.Dequeue(); + context.SerializationDomain.BsonClassMap.LookupClassMap(knownType); // will AutoMap and/or Freeze knownType if necessary } } } finally { - __freezeNestingLevel--; + context.FreezeNestingLevel--; } } } finally { - BsonSerializer.ConfigLock.ExitWriteLock(); + configLock.ExitWriteLock(); } return this; } @@ -1360,9 +1204,10 @@ IDiscriminatorConvention LookupDiscriminatorConvention() } // private methods - private void AutoMapClass() + private void AutoMapClass(IBsonSerializationDomain serializationDomain) { - new ConventionRunner(_conventionPack).Apply(this); + var conventionPack = serializationDomain.ConventionRegistry.Lookup(_classType); + new ConventionRunner(conventionPack).Apply(this); foreach (var memberMap in _declaredMemberMaps) { diff --git a/src/MongoDB.Bson/Serialization/BsonClassMapDomain.cs b/src/MongoDB.Bson/Serialization/BsonClassMapDomain.cs new file mode 100644 index 00000000000..7732ac9742e --- /dev/null +++ b/src/MongoDB.Bson/Serialization/BsonClassMapDomain.cs @@ -0,0 +1,263 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Reflection; + +namespace MongoDB.Bson.Serialization; + +internal class BsonClassMapDomain : IBsonClassMapDomain +{ + // private fields + private readonly IBsonSerializationDomain _serializationDomain; + private readonly Dictionary _classMaps = new(); + + public BsonClassMapDomain(BsonSerializationDomain serializationDomain) + { + _serializationDomain = serializationDomain; + } + + /// + /// Gets all registered class maps. + /// + /// All registered class maps. + public IEnumerable GetRegisteredClassMaps() + { + BsonSerializer.ConfigLock.EnterReadLock(); //TODO It would make sense to look at this after the PR by Robert is merged + try + { + return _classMaps.Values.ToList(); // return a copy for thread safety + } + finally + { + BsonSerializer.ConfigLock.ExitReadLock(); + } + } + + /// + /// Checks whether a class map is registered for a type. + /// + /// The type to check. + /// True if there is a class map registered for the type. + public bool IsClassMapRegistered(Type type) + { + if (type == null) + { + throw new ArgumentNullException("type"); + } + + BsonSerializer.ConfigLock.EnterReadLock(); + try + { + return _classMaps.ContainsKey(type); + } + finally + { + BsonSerializer.ConfigLock.ExitReadLock(); + } + } + + /// + /// Looks up a class map (will AutoMap the class if no class map is registered). + /// + /// The class type. + /// The class map. + public BsonClassMap LookupClassMap(Type classType) + { + if (classType == null) + { + throw new ArgumentNullException("classType"); + } + + BsonSerializer.ConfigLock.EnterReadLock(); + try + { + if (_classMaps.TryGetValue(classType, out var classMap)) + { + if (classMap.IsFrozen) + { + return classMap; + } + } + } + finally + { + BsonSerializer.ConfigLock.ExitReadLock(); + } + + // automatically create a new classMap for classType and register it (unless another thread does first) + // do the work of speculatively creating a new class map outside of holding any lock + var classMapDefinition = typeof(BsonClassMap<>); + var classMapType = classMapDefinition.MakeGenericType(classType); + var newClassMap = (BsonClassMap)Activator.CreateInstance(classMapType); + newClassMap.AutoMap(_serializationDomain); + + BsonSerializer.ConfigLock.EnterWriteLock(); + try + { + if (!_classMaps.TryGetValue(classType, out var classMap)) + { + RegisterClassMap(newClassMap); + classMap = newClassMap; + } + + return classMap.Freeze(); + } + finally + { + BsonSerializer.ConfigLock.ExitWriteLock(); + } + } + + /// + /// Creates and registers a class map. + /// + /// The class. + /// The class map. + public BsonClassMap RegisterClassMap() + { + return RegisterClassMap(cm => { cm.AutoMap(_serializationDomain); }); + } + + /// + /// Creates and registers a class map. + /// + /// The class. + /// The class map initializer. + /// The class map. + public BsonClassMap RegisterClassMap(Action> classMapInitializer) + { + var classMap = new BsonClassMap(classMapInitializer); + RegisterClassMap(classMap); + return classMap; + } + + /// + /// Registers a class map. + /// + /// The class map. + public void RegisterClassMap(BsonClassMap classMap) + { + if (classMap == null) + { + throw new ArgumentNullException("classMap"); + } + + BsonSerializer.ConfigLock.EnterWriteLock(); + try + { + // note: class maps can NOT be replaced (because derived classes refer to existing instance) + _classMaps.Add(classMap.ClassType, classMap); + BsonSerializer.RegisterDiscriminator(classMap.ClassType, classMap.Discriminator); + } + finally + { + BsonSerializer.ConfigLock.ExitWriteLock(); + } + } + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// True if this call registered the class map, false if the class map was already registered. + public bool TryRegisterClassMap() + { + return TryRegisterClassMap(() => ClassMapFactory(_serializationDomain)); + + static BsonClassMap ClassMapFactory(IBsonSerializationDomain serializationDomain) + { + var classMap = new BsonClassMap(); + classMap.AutoMap(serializationDomain); + return classMap; + } + } + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// The class map. + /// True if this call registered the class map, false if the class map was already registered. + public bool TryRegisterClassMap(BsonClassMap classMap) + { + if (classMap == null) + { + throw new ArgumentNullException(nameof(classMap)); + } + + return TryRegisterClassMap(ClassMapFactory); + + BsonClassMap ClassMapFactory() + { + return classMap; + } + } + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// The class map initializer (only called if the class map is not already registered). + /// True if this call registered the class map, false if the class map was already registered. + public bool TryRegisterClassMap(Action> classMapInitializer) + { + if (classMapInitializer == null) + { + throw new ArgumentNullException(nameof(classMapInitializer)); + } + + return TryRegisterClassMap(ClassMapFactory); + + BsonClassMap ClassMapFactory() + { + return new BsonClassMap(classMapInitializer); + } + } + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// The class map factory (only called if the class map is not already registered). + /// True if this call registered the class map, false if the class map was already registered. + public bool TryRegisterClassMap(Func> classMapFactory) + { + if (classMapFactory == null) + { + throw new ArgumentNullException(nameof(classMapFactory)); + } + + BsonSerializer.ConfigLock.EnterReadLock(); + try + { + if (_classMaps.ContainsKey(typeof(TClass))) + { + return false; + } + } + finally + { + BsonSerializer.ConfigLock.ExitReadLock(); + } + + BsonSerializer.ConfigLock.EnterWriteLock(); + try + { + if (_classMaps.ContainsKey(typeof(TClass))) + { + return false; + } + else + { + // create a classMap for TClass and register it + var classMap = classMapFactory(); + RegisterClassMap(classMap); + return true; + } + } + finally + { + BsonSerializer.ConfigLock.ExitWriteLock(); + } + } +} \ No newline at end of file diff --git a/src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs b/src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs index ac088360c2d..16ee04bb8ba 100644 --- a/src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs +++ b/src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs @@ -41,7 +41,7 @@ public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry !typeof(Array).GetTypeInfo().IsAssignableFrom(type) && !typeof(Enum).GetTypeInfo().IsAssignableFrom(type)) { - var classMap = BsonClassMap.LookupClassMap(type); + var classMap = serializerRegistry.SerializationDomain.BsonClassMap.LookupClassMap(type); var classMapSerializerDefinition = typeof(BsonClassMapSerializer<>); var classMapSerializerType = classMapSerializerDefinition.MakeGenericType(type); return (IBsonSerializer)Activator.CreateInstance(classMapSerializerType, classMap); diff --git a/src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs b/src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs index 03ab3137326..2c614b81c00 100644 --- a/src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs +++ b/src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs @@ -28,6 +28,7 @@ public class BsonDeserializationContext private readonly IBsonSerializer _dynamicArraySerializer; private readonly IBsonSerializer _dynamicDocumentSerializer; private readonly IBsonReader _reader; + private readonly IBsonSerializationDomain _serializationDomain; // constructors private BsonDeserializationContext( @@ -40,6 +41,7 @@ private BsonDeserializationContext( _allowDuplicateElementNames = allowDuplicateElementNames; _dynamicArraySerializer = dynamicArraySerializer; _dynamicDocumentSerializer = dynamicDocumentSerializer; + _serializationDomain = (reader as BsonReader)!.Settings?.SerializationDomain ?? BsonSerializer.DefaultSerializationDomain; } // public properties @@ -54,6 +56,11 @@ public bool AllowDuplicateElementNames get { return _allowDuplicateElementNames; } } + /// + /// //TODO + /// + internal IBsonSerializationDomain SerializationDomain => _serializationDomain; + /// /// Gets the dynamic array serializer. /// diff --git a/src/MongoDB.Bson/Serialization/BsonMemberMap.cs b/src/MongoDB.Bson/Serialization/BsonMemberMap.cs index b10971d5249..8374a3f906a 100644 --- a/src/MongoDB.Bson/Serialization/BsonMemberMap.cs +++ b/src/MongoDB.Bson/Serialization/BsonMemberMap.cs @@ -294,14 +294,21 @@ obj is BsonMemberMap other && /// Gets the serializer. /// /// The serializer. - public IBsonSerializer GetSerializer() + public IBsonSerializer GetSerializer() => GetSerializer(BsonSerializer.DefaultSerializationDomain); + + /// + /// //TODO + /// + /// + /// + public IBsonSerializer GetSerializer(IBsonSerializationDomain domain) { if (_serializer == null) { // return special serializer for BsonValue members that handles the _csharpnull representation if (_memberTypeIsBsonValue) { - var wrappedSerializer = BsonSerializer.LookupSerializer(_memberType); + var wrappedSerializer = domain.LookupSerializer(_memberType); var isBsonArraySerializer = wrappedSerializer is IBsonArraySerializer; var isBsonDocumentSerializer = wrappedSerializer is IBsonDocumentSerializer; @@ -329,7 +336,7 @@ public IBsonSerializer GetSerializer() } else { - _serializer = BsonSerializer.LookupSerializer(_memberType); + _serializer = domain.LookupSerializer(_memberType); } } return _serializer; diff --git a/src/MongoDB.Bson/Serialization/BsonSerializationContext.cs b/src/MongoDB.Bson/Serialization/BsonSerializationContext.cs index 5ab93777ceb..66ce861b054 100644 --- a/src/MongoDB.Bson/Serialization/BsonSerializationContext.cs +++ b/src/MongoDB.Bson/Serialization/BsonSerializationContext.cs @@ -26,6 +26,7 @@ public class BsonSerializationContext // private fields private readonly Func _isDynamicType; private readonly IBsonWriter _writer; + private readonly IBsonSerializationDomain _serializationDomain; // constructors private BsonSerializationContext( @@ -34,9 +35,15 @@ private BsonSerializationContext( { _writer = writer; _isDynamicType = isDynamicType; + _serializationDomain = writer.Settings?.SerializationDomain ?? BsonSerializer.DefaultSerializationDomain; } // public properties + /// + /// //TODO + /// + internal IBsonSerializationDomain SerializationDomain => _serializationDomain; + /// /// Gets a function that, when executed, will indicate whether the type /// is a dynamic type. diff --git a/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs b/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs new file mode 100644 index 00000000000..8a4c89b246b --- /dev/null +++ b/src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs @@ -0,0 +1,830 @@ +using System; +using System.Collections.Concurrent; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Reflection; +using System.Threading; +using MongoDB.Bson.IO; +using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Conventions; +using MongoDB.Bson.Serialization.IdGenerators; + +namespace MongoDB.Bson.Serialization +{ + /// + /// A class that represents the BSON serialization functionality. + /// + internal class BsonSerializationDomain : IBsonSerializationDomainInternal, IDisposable + { + // private fields + private ReaderWriterLockSlim _configLock = new(LockRecursionPolicy.SupportsRecursion); + private IBsonClassMapDomain _classMapDomain; + private IConventionRegistryDomain _conventionRegistryDomain; + private Dictionary _idGenerators = new(); + private Dictionary _discriminatorConventions = new(); + private Dictionary> _discriminators = new(); + private HashSet _discriminatedTypes = new(); + private BsonSerializerRegistry _serializerRegistry; + private TypeMappingSerializationProvider _typeMappingSerializationProvider; + + // ConcurrentDictionary is being used as a concurrent set of Type. The values will always be null. + private ConcurrentDictionary _typesWithRegisteredKnownTypes = new(); + + private bool _useNullIdChecker; + private bool _useZeroIdChecker; + + // constructor + public BsonSerializationDomain(string name = null) //TODO name is used for testing + { + CreateSerializerRegistry(); + CreateSubDomains(); + RegisterIdGenerators(); + Name = name ?? "CUSTOM"; //TODO remove after testing is done + } + + public string Name { get; private set; } + + // public properties + /// + /// Gets the serializer registry. + /// + public IBsonSerializerRegistry SerializerRegistry + { + get { return _serializerRegistry; } + } + + /// + /// Gets or sets whether to use the NullIdChecker on reference Id types that don't have an IdGenerator registered. + /// + public bool UseNullIdChecker + { + get { return _useNullIdChecker; } + set { _useNullIdChecker = value; } + } + + public bool UseNullIdCheckerEnabled => UseNullIdChecker; + + /// + /// Gets or sets whether to use the ZeroIdChecker on value Id types that don't have an IdGenerator registered. + /// + public bool UseZeroIdChecker + { + get { return _useZeroIdChecker; } + set { _useZeroIdChecker = value; } + } + + public bool UseZeroIdCheckerEnabled => UseZeroIdChecker; + + // internal properties + public ReaderWriterLockSlim ConfigLock + { + get { return _configLock; } + } + + /// + /// Deserializes an object from a BsonDocument. + /// + /// The nominal type of the object. + /// The BsonDocument. + /// The configurator. + /// A deserialized value. + public TNominalType Deserialize(BsonDocument document, + Action configurator = null) + { + using (var bsonReader = new BsonDocumentReader(document)) + { + return Deserialize(bsonReader, configurator); + } + } + + /// + /// Deserializes a value. + /// + /// The nominal type of the object. + /// The BsonReader. + /// The configurator. + /// A deserialized value. + public TNominalType Deserialize(IBsonReader bsonReader, + Action configurator = null) + { + var serializer = LookupSerializer(); + var context = BsonDeserializationContext.CreateRoot(bsonReader, configurator); + return serializer.Deserialize(context); + } + + /// + /// Deserializes an object from a BSON byte array. + /// + /// The nominal type of the object. + /// The BSON byte array. + /// The configurator. + /// A deserialized value. + public TNominalType Deserialize(byte[] bytes, + Action configurator = null) + { + using (var buffer = new ByteArrayBuffer(bytes, isReadOnly: true)) + using (var stream = new ByteBufferStream(buffer)) + { + return Deserialize(stream, configurator); + } + } + + /// + /// Deserializes an object from a BSON Stream. + /// + /// The nominal type of the object. + /// The BSON Stream. + /// The configurator. + /// A deserialized value. + public TNominalType Deserialize(Stream stream, + Action configurator = null) + { + using (var bsonReader = new BsonBinaryReader(stream)) + { + return Deserialize(bsonReader, configurator); + } + } + + /// + /// Deserializes an object from a JSON string. + /// + /// The nominal type of the object. + /// The JSON string. + /// The configurator. + /// A deserialized value. + public TNominalType Deserialize(string json, + Action configurator = null) + { + using (var bsonReader = new JsonReader(json)) + { + return Deserialize(bsonReader, configurator); + } + } + + /// + /// Deserializes an object from a JSON TextReader. + /// + /// The nominal type of the object. + /// The JSON TextReader. + /// The configurator. + /// A deserialized value. + public TNominalType Deserialize(TextReader textReader, + Action configurator = null) + { + using (var bsonReader = new JsonReader(textReader)) + { + return Deserialize(bsonReader, configurator); + } + } + + /// + /// Deserializes an object from a BsonDocument. + /// + /// The BsonDocument. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + public object Deserialize(BsonDocument document, Type nominalType, + Action configurator = null) + { + using (var bsonReader = new BsonDocumentReader(document)) + { + return Deserialize(bsonReader, nominalType, configurator); + } + } + + /// + /// Deserializes a value. + /// + /// The BsonReader. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + public object Deserialize(IBsonReader bsonReader, Type nominalType, + Action configurator = null) + { + var serializer = LookupSerializer(nominalType); + var context = BsonDeserializationContext.CreateRoot(bsonReader, configurator); + return serializer.Deserialize(context); + } + + /// + /// Deserializes an object from a BSON byte array. + /// + /// The BSON byte array. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + public object Deserialize(byte[] bytes, Type nominalType, + Action configurator = null) + { + using (var buffer = new ByteArrayBuffer(bytes, isReadOnly: true)) + using (var stream = new ByteBufferStream(buffer)) + { + return Deserialize(stream, nominalType, configurator); + } + } + + /// + /// Deserializes an object from a BSON Stream. + /// + /// The BSON Stream. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + public object Deserialize(Stream stream, Type nominalType, + Action configurator = null) + { + using (var bsonReader = new BsonBinaryReader(stream)) + { + return Deserialize(bsonReader, nominalType, configurator); + } + } + + /// + /// Deserializes an object from a JSON string. + /// + /// The JSON string. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + public object Deserialize(string json, Type nominalType, + Action configurator = null) + { + using (var bsonReader = new JsonReader(json)) + { + return Deserialize(bsonReader, nominalType, configurator); + } + } + + /// + /// Deserializes an object from a JSON TextReader. + /// + /// The JSON TextReader. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + public object Deserialize(TextReader textReader, Type nominalType, + Action configurator = null) + { + using (var bsonReader = new JsonReader(textReader)) + { + return Deserialize(bsonReader, nominalType, configurator); + } + } + + public IDiscriminatorConvention GetOrRegisterDiscriminatorConvention(Type type, + IDiscriminatorConvention discriminatorConvention) + { + _configLock.EnterReadLock(); + try + { + if (_discriminatorConventions.TryGetValue(type, out var registeredDiscriminatorConvention)) + { + return registeredDiscriminatorConvention; + } + } + finally + { + _configLock.ExitReadLock(); + } + + _configLock.EnterWriteLock(); + try + { + if (_discriminatorConventions.TryGetValue(type, out var registeredDiscrimantorConvention)) + { + return registeredDiscrimantorConvention; + } + + RegisterDiscriminatorConvention(type, discriminatorConvention); + return discriminatorConvention; + } + finally + { + _configLock.ExitWriteLock(); + } + } + + public bool IsDiscriminatorConventionRegisteredAtThisLevel(Type type) + { + _configLock.EnterReadLock(); + try + { + return _discriminatorConventions.ContainsKey(type); + } + finally + { + _configLock.ExitReadLock(); + } + } + + /// + /// Returns whether the given type has any discriminators registered for any of its subclasses. + /// + /// A Type. + /// True if the type is discriminated. + public bool IsTypeDiscriminated(Type type) + { + var typeInfo = type.GetTypeInfo(); + return typeInfo.IsInterface || _discriminatedTypes.Contains(type); + } + + /// + /// Looks up the actual type of an object to be deserialized. + /// + /// The nominal type of the object. + /// The discriminator. + /// The actual type of the object. + public Type LookupActualType(Type nominalType, BsonValue discriminator) + { + if (discriminator == null) + { + return nominalType; + } + + // note: EnsureKnownTypesAreRegistered handles its own locking so call from outside any lock + EnsureKnownTypesAreRegistered(nominalType); + + _configLock.EnterReadLock(); + try + { + Type actualType = null; + + HashSet hashSet; + var nominalTypeInfo = nominalType.GetTypeInfo(); + if (_discriminators.TryGetValue(discriminator, out hashSet)) + { + foreach (var type in hashSet) + { + if (nominalTypeInfo.IsAssignableFrom(type)) + { + if (actualType == null) + { + actualType = type; + } + else + { + string message = string.Format("Ambiguous discriminator '{0}'.", discriminator); + throw new BsonSerializationException(message); + } + } + } + + // no need for additional checks, we found the right type + if (actualType != null) + { + return actualType; + } + } + + if (discriminator.IsString) + { + actualType = TypeNameDiscriminator.GetActualType(discriminator.AsString); // see if it's a Type name + } + + if (actualType == null) + { + string message = string.Format("Unknown discriminator value '{0}'.", discriminator); + throw new BsonSerializationException(message); + } + + if (!nominalTypeInfo.IsAssignableFrom(actualType)) + { + string message = string.Format( + "Actual type {0} is not assignable to expected type {1}.", + actualType.FullName, nominalType.FullName); + throw new BsonSerializationException(message); + } + + return actualType; + } + finally + { + _configLock.ExitReadLock(); + } + } + + /// + /// Looks up the discriminator convention for a type. + /// + /// The type. + /// A discriminator convention. + public IDiscriminatorConvention LookupDiscriminatorConvention(Type type) + { + _configLock.EnterReadLock(); + try + { + IDiscriminatorConvention convention; + if (_discriminatorConventions.TryGetValue(type, out convention)) + { + return convention; + } + } + finally + { + _configLock.ExitReadLock(); + } + + _configLock.EnterWriteLock(); + try + { + IDiscriminatorConvention convention; + if (!_discriminatorConventions.TryGetValue(type, out convention)) + { + var typeInfo = type.GetTypeInfo(); + if (type == typeof(object)) + { + // if there is no convention registered for object register the default one + convention = new ObjectDiscriminatorConvention("_t"); + RegisterDiscriminatorConvention(typeof(object), convention); + } + else if (typeInfo.IsInterface) + { + // TODO: should convention for interfaces be inherited from parent interfaces? + convention = LookupDiscriminatorConvention(typeof(object)); + RegisterDiscriminatorConvention(type, convention); + } + else + { + // inherit the discriminator convention from the closest parent (that isn't object) that has one + // otherwise default to the standard scalar convention + Type parentType = typeInfo.BaseType; + while (true) + { + if (parentType == typeof(object)) + { + convention = StandardDiscriminatorConvention.Scalar; + break; + } + + if (_discriminatorConventions.TryGetValue(parentType, out convention)) + { + break; + } + + parentType = parentType.GetTypeInfo().BaseType; + } + + // register this convention for all types between this and the parent type where we found the convention + var unregisteredType = type; + while (unregisteredType != parentType) + { + RegisterDiscriminatorConvention(unregisteredType, convention); + unregisteredType = unregisteredType.GetTypeInfo().BaseType; + } + } + } + + return convention; + } + finally + { + _configLock.ExitWriteLock(); + } + } + + /// + /// Looks up an IdGenerator. + /// + /// The Id type. + /// An IdGenerator for the Id type. + public IIdGenerator LookupIdGenerator(Type type) + { + _configLock.EnterReadLock(); + try + { + IIdGenerator idGenerator; + if (_idGenerators.TryGetValue(type, out idGenerator)) + { + return idGenerator; + } + } + finally + { + _configLock.ExitReadLock(); + } + + _configLock.EnterWriteLock(); + try + { + IIdGenerator idGenerator; + if (!_idGenerators.TryGetValue(type, out idGenerator)) + { + var typeInfo = type.GetTypeInfo(); + if (typeInfo.IsValueType && _useZeroIdChecker) + { + var iEquatableDefinition = typeof(IEquatable<>); + var iEquatableType = iEquatableDefinition.MakeGenericType(type); + if (iEquatableType.GetTypeInfo().IsAssignableFrom(type)) + { + var zeroIdCheckerDefinition = typeof(ZeroIdChecker<>); + var zeroIdCheckerType = zeroIdCheckerDefinition.MakeGenericType(type); + idGenerator = (IIdGenerator)Activator.CreateInstance(zeroIdCheckerType); + } + } + else if (_useNullIdChecker) + { + idGenerator = NullIdChecker.Instance; + } + else + { + idGenerator = null; + } + + _idGenerators[type] = idGenerator; // remember it even if it's null + } + + return idGenerator; + } + finally + { + _configLock.ExitWriteLock(); + } + } + + /// + /// Looks up a serializer for a Type. + /// + /// The type. + /// A serializer for type T. + public IBsonSerializer LookupSerializer() + { + return (IBsonSerializer)LookupSerializer(typeof(T)); + } + + /// + /// Looks up a serializer for a Type. + /// + /// The Type. + /// A serializer for the Type. + public IBsonSerializer LookupSerializer(Type type) + { + return _serializerRegistry.GetSerializer(type); + } + + /// + /// Registers the discriminator for a type. + /// + /// The type. + /// The discriminator. + public void RegisterDiscriminator(Type type, BsonValue discriminator) + { + var typeInfo = type.GetTypeInfo(); + if (typeInfo.IsInterface) + { + var message = string.Format("Discriminators can only be registered for classes, not for interface {0}.", + type.FullName); + throw new BsonSerializationException(message); + } + + _configLock.EnterWriteLock(); + try + { + HashSet hashSet; + if (!_discriminators.TryGetValue(discriminator, out hashSet)) + { + hashSet = new HashSet(); + _discriminators.Add(discriminator, hashSet); + } + + if (!hashSet.Contains(type)) + { + hashSet.Add(type); + + // mark all base types as discriminated (so we know that it's worth reading a discriminator) + for (var baseType = typeInfo.BaseType; baseType != null; baseType = baseType.GetTypeInfo().BaseType) + { + _discriminatedTypes.Add(baseType); + } + } + } + finally + { + _configLock.ExitWriteLock(); + } + } + + /// + /// Registers the discriminator convention for a type. + /// + /// Type type. + /// The discriminator convention. + public void RegisterDiscriminatorConvention(Type type, IDiscriminatorConvention convention) + { + _configLock.EnterWriteLock(); + try + { + if (!_discriminatorConventions.ContainsKey(type)) + { + _discriminatorConventions.Add(type, convention); + } + else + { + var message = string.Format("There is already a discriminator convention registered for type {0}.", + type.FullName); + throw new BsonSerializationException(message); + } + } + finally + { + _configLock.ExitWriteLock(); + } + } + + /// + /// Registers a generic serializer definition for a generic type. + /// + /// The generic type. + /// The generic serializer definition. + public void RegisterGenericSerializerDefinition( + Type genericTypeDefinition, + Type genericSerializerDefinition) + { + _typeMappingSerializationProvider.RegisterMapping(genericTypeDefinition, genericSerializerDefinition); + } + + /// + /// Registers an IdGenerator for an Id Type. + /// + /// The Id Type. + /// The IdGenerator for the Id Type. + public void RegisterIdGenerator(Type type, IIdGenerator idGenerator) + { + _configLock.EnterWriteLock(); + try + { + _idGenerators[type] = idGenerator; + } + finally + { + _configLock.ExitWriteLock(); + } + } + + /// + /// Registers a serialization provider. + /// + /// The serialization provider. + public void RegisterSerializationProvider(IBsonSerializationProvider provider) + { + _serializerRegistry.RegisterSerializationProvider(provider); + } + + /// + /// Registers a serializer for a type. + /// + /// The type. + /// The serializer. + public void RegisterSerializer(IBsonSerializer serializer) + { + RegisterSerializer(typeof(T), serializer); + } + + /// + /// Registers a serializer for a type. + /// + /// The type. + /// The serializer. + public void RegisterSerializer(Type type, IBsonSerializer serializer) + { + _serializerRegistry.RegisterSerializer(type, serializer); + } + + /// + /// Serializes a value. + /// + /// The nominal type of the object. + /// The BsonWriter. + /// The object. + /// The serialization context configurator. + /// The serialization args. + public void Serialize( + IBsonWriter bsonWriter, + TNominalType value, + Action configurator = null, + BsonSerializationArgs args = default(BsonSerializationArgs)) + { + args.SetOrValidateNominalType(typeof(TNominalType), ""); + var serializer = LookupSerializer(); + var context = BsonSerializationContext.CreateRoot(bsonWriter, configurator); + serializer.Serialize(context, args, value); + } + + /// + /// Serializes a value. + /// + /// The BsonWriter. + /// The nominal type of the object. + /// The object. + /// The serialization context configurator. + /// The serialization args. + public void Serialize( + IBsonWriter bsonWriter, + Type nominalType, + object value, + Action configurator = null, + BsonSerializationArgs args = default(BsonSerializationArgs)) + { + args.SetOrValidateNominalType(nominalType, "nominalType"); + var serializer = LookupSerializer(nominalType); + var context = BsonSerializationContext.CreateRoot(bsonWriter, configurator); + serializer.Serialize(context, args, value); + } + + public IBsonClassMapDomain BsonClassMap => _classMapDomain; + + public IConventionRegistryDomain ConventionRegistry => _conventionRegistryDomain; + + /// + /// Tries to register a serializer for a type. + /// + /// The serializer. + /// The type. + /// True if the serializer was registered on this call, false if the same serializer was already registered on a previous call, throws an exception if a different serializer was already registered. + public bool TryRegisterSerializer(Type type, IBsonSerializer serializer) + { + return _serializerRegistry.TryRegisterSerializer(type, serializer); + } + + /// + /// Tries to register a serializer for a type. + /// + /// The type. + /// The serializer. + /// True if the serializer was registered on this call, false if the same serializer was already registered on a previous call, throws an exception if a different serializer was already registered. + public bool TryRegisterSerializer(IBsonSerializer serializer) + { + return TryRegisterSerializer(typeof(T), serializer); + } + + // internal methods + public void EnsureKnownTypesAreRegistered(Type nominalType) + { + if (_typesWithRegisteredKnownTypes.ContainsKey(nominalType)) + { + return; + } + + _configLock.EnterWriteLock(); + try + { + if (!_typesWithRegisteredKnownTypes.ContainsKey(nominalType)) + { + // only call LookupClassMap for classes with a BsonKnownTypesAttribute + var hasKnownTypesAttribute = nominalType.GetTypeInfo() + .GetCustomAttributes(typeof(BsonKnownTypesAttribute), inherit: false).Any(); + if (hasKnownTypesAttribute) + { + // try and force a scan of the known types + LookupSerializer(nominalType); + } + + // NOTE: The nominalType MUST be added to __typesWithRegisteredKnownTypes after all registration + // work is done to ensure that other threads don't access a partially registered nominalType + // when performing the initial check above outside the __config lock. + _typesWithRegisteredKnownTypes[nominalType] = null; + } + } + finally + { + _configLock.ExitWriteLock(); + } + } + + public void Dispose() + { + _configLock.Dispose(); + } + + // private methods + private void CreateSerializerRegistry() + { + _serializerRegistry = new BsonSerializerRegistry(this); + _typeMappingSerializationProvider = new TypeMappingSerializationProvider(); + + // order matters. It's in reverse order of how they'll get consumed + _serializerRegistry.RegisterSerializationProvider(new BsonClassMapSerializationProvider()); + _serializerRegistry.RegisterSerializationProvider(new DiscriminatedInterfaceSerializationProvider()); + _serializerRegistry.RegisterSerializationProvider(new CollectionsSerializationProvider()); + _serializerRegistry.RegisterSerializationProvider(new PrimitiveSerializationProvider()); + _serializerRegistry.RegisterSerializationProvider(new AttributedSerializationProvider()); + _serializerRegistry.RegisterSerializationProvider(_typeMappingSerializationProvider); + _serializerRegistry.RegisterSerializationProvider(new BsonObjectModelSerializationProvider()); + } + + private void CreateSubDomains() + { + _classMapDomain = new BsonClassMapDomain(this); + _conventionRegistryDomain = new ConventionRegistryDomain(); + } + + private void RegisterIdGenerators() + { + RegisterIdGenerator(typeof(BsonObjectId), BsonObjectIdGenerator.Instance); + RegisterIdGenerator(typeof(Guid), GuidGenerator.Instance); + RegisterIdGenerator(typeof(ObjectId), ObjectIdGenerator.Instance); + } + } +} \ No newline at end of file diff --git a/src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs b/src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs index b2ffb587183..bb19d0bd0e3 100644 --- a/src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs +++ b/src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs @@ -26,7 +26,7 @@ public abstract class BsonSerializationProviderBase : IRegistryAwareBsonSerializ /// public virtual IBsonSerializer GetSerializer(Type type) { - return GetSerializer(type, BsonSerializer.SerializerRegistry); + return GetSerializer(type, BsonSerializer.SerializerRegistry); //TODO We can keep this as is } /// @@ -40,7 +40,7 @@ public virtual IBsonSerializer GetSerializer(Type type) /// A serializer. protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDefinition, params Type[] typeArguments) { - return CreateGenericSerializer(serializerTypeDefinition, typeArguments, BsonSerializer.SerializerRegistry); + return CreateGenericSerializer(serializerTypeDefinition, typeArguments, BsonSerializer.SerializerRegistry); //TODO We can keep this as is } /// @@ -65,7 +65,7 @@ protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDef /// A serializer. protected virtual IBsonSerializer CreateSerializer(Type serializerType) { - return CreateSerializer(serializerType, BsonSerializer.SerializerRegistry); + return CreateSerializer(serializerType, BsonSerializer.SerializerRegistry); //TODO We can keep this as is } /// diff --git a/src/MongoDB.Bson/Serialization/BsonSerializer.cs b/src/MongoDB.Bson/Serialization/BsonSerializer.cs index b10676062f4..cfb0f44d356 100644 --- a/src/MongoDB.Bson/Serialization/BsonSerializer.cs +++ b/src/MongoDB.Bson/Serialization/BsonSerializer.cs @@ -14,18 +14,10 @@ */ using System; -using System.Collections.Concurrent; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Reflection; using System.Threading; - -// don't add using statement for MongoDB.Bson.Serialization.Serializers to minimize dependencies on DefaultSerializer using MongoDB.Bson.IO; -using MongoDB.Bson.Serialization.Attributes; using MongoDB.Bson.Serialization.Conventions; -using MongoDB.Bson.Serialization.IdGenerators; namespace MongoDB.Bson.Serialization { @@ -34,43 +26,32 @@ namespace MongoDB.Bson.Serialization /// public static class BsonSerializer { - // private static fields - private static ReaderWriterLockSlim __configLock = new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion); - private static Dictionary __idGenerators = new Dictionary(); - private static Dictionary __discriminatorConventions = new Dictionary(); - private static Dictionary> __discriminators = new Dictionary>(); - private static HashSet __discriminatedTypes = new HashSet(); - private static BsonSerializerRegistry __serializerRegistry; - private static TypeMappingSerializationProvider __typeMappingSerializationProvider; - // ConcurrentDictionary is being used as a concurrent set of Type. The values will always be null. - private static ConcurrentDictionary __typesWithRegisteredKnownTypes = new ConcurrentDictionary(); - - private static bool __useNullIdChecker = false; - private static bool __useZeroIdChecker = false; + private static readonly IBsonSerializationDomainInternal _serializationDomain; // static constructor static BsonSerializer() { - CreateSerializerRegistry(); - RegisterIdGenerators(); + _serializationDomain = new BsonSerializationDomain("MAIN"); } + /// + /// //TODO + /// + public static IBsonSerializationDomain DefaultSerializationDomain => _serializationDomain; + // public static properties /// /// Gets the serializer registry. /// - public static IBsonSerializerRegistry SerializerRegistry - { - get { return __serializerRegistry; } - } + public static IBsonSerializerRegistry SerializerRegistry => _serializationDomain.SerializerRegistry; /// /// Gets or sets whether to use the NullIdChecker on reference Id types that don't have an IdGenerator registered. /// public static bool UseNullIdChecker { - get { return __useNullIdChecker; } - set { __useNullIdChecker = value; } + get => _serializationDomain.UseNullIdChecker; + set => _serializationDomain.UseNullIdChecker = value; } /// @@ -78,17 +59,21 @@ public static bool UseNullIdChecker /// public static bool UseZeroIdChecker { - get { return __useZeroIdChecker; } - set { __useZeroIdChecker = value; } + get => _serializationDomain.UseZeroIdChecker; + set => _serializationDomain.UseZeroIdChecker = value; } // internal static properties - internal static ReaderWriterLockSlim ConfigLock - { - get { return __configLock; } - } + internal static ReaderWriterLockSlim ConfigLock => _serializationDomain.ConfigLock; // public static methods + + /// + /// //TODO + /// + /// + public static IBsonSerializationDomain CreateSerializationDomain() => new BsonSerializationDomain(); + /// /// Deserializes an object from a BsonDocument. /// @@ -97,12 +82,7 @@ internal static ReaderWriterLockSlim ConfigLock /// The configurator. /// A deserialized value. public static TNominalType Deserialize(BsonDocument document, Action configurator = null) - { - using (var bsonReader = new BsonDocumentReader(document)) - { - return Deserialize(bsonReader, configurator); - } - } + => _serializationDomain.Deserialize(document, configurator); /// /// Deserializes a value. @@ -112,11 +92,7 @@ public static TNominalType Deserialize(BsonDocument document, Acti /// The configurator. /// A deserialized value. public static TNominalType Deserialize(IBsonReader bsonReader, Action configurator = null) - { - var serializer = LookupSerializer(); - var context = BsonDeserializationContext.CreateRoot(bsonReader, configurator); - return serializer.Deserialize(context); - } + => _serializationDomain.Deserialize(bsonReader, configurator); /// /// Deserializes an object from a BSON byte array. @@ -126,13 +102,7 @@ public static TNominalType Deserialize(IBsonReader bsonReader, Act /// The configurator. /// A deserialized value. public static TNominalType Deserialize(byte[] bytes, Action configurator = null) - { - using (var buffer = new ByteArrayBuffer(bytes, isReadOnly: true)) - using (var stream = new ByteBufferStream(buffer)) - { - return Deserialize(stream, configurator); - } - } + => _serializationDomain.Deserialize(bytes, configurator); /// /// Deserializes an object from a BSON Stream. @@ -142,12 +112,7 @@ public static TNominalType Deserialize(byte[] bytes, ActionThe configurator. /// A deserialized value. public static TNominalType Deserialize(Stream stream, Action configurator = null) - { - using (var bsonReader = new BsonBinaryReader(stream)) - { - return Deserialize(bsonReader, configurator); - } - } + => _serializationDomain.Deserialize(stream, configurator); /// /// Deserializes an object from a JSON string. @@ -157,12 +122,7 @@ public static TNominalType Deserialize(Stream stream, ActionThe configurator. /// A deserialized value. public static TNominalType Deserialize(string json, Action configurator = null) - { - using (var bsonReader = new JsonReader(json)) - { - return Deserialize(bsonReader, configurator); - } - } + => _serializationDomain.Deserialize(json, configurator); /// /// Deserializes an object from a JSON TextReader. @@ -172,12 +132,7 @@ public static TNominalType Deserialize(string json, ActionThe configurator. /// A deserialized value. public static TNominalType Deserialize(TextReader textReader, Action configurator = null) - { - using (var bsonReader = new JsonReader(textReader)) - { - return Deserialize(bsonReader, configurator); - } - } + => _serializationDomain.Deserialize(textReader, configurator); /// /// Deserializes an object from a BsonDocument. @@ -187,12 +142,7 @@ public static TNominalType Deserialize(TextReader textReader, Acti /// The configurator. /// A deserialized value. public static object Deserialize(BsonDocument document, Type nominalType, Action configurator = null) - { - using (var bsonReader = new BsonDocumentReader(document)) - { - return Deserialize(bsonReader, nominalType, configurator); - } - } + => _serializationDomain.Deserialize(document, nominalType, configurator); /// /// Deserializes a value. @@ -202,11 +152,7 @@ public static object Deserialize(BsonDocument document, Type nominalType, Action /// The configurator. /// A deserialized value. public static object Deserialize(IBsonReader bsonReader, Type nominalType, Action configurator = null) - { - var serializer = LookupSerializer(nominalType); - var context = BsonDeserializationContext.CreateRoot(bsonReader, configurator); - return serializer.Deserialize(context); - } + => _serializationDomain.Deserialize(bsonReader, nominalType, configurator); /// /// Deserializes an object from a BSON byte array. @@ -216,13 +162,7 @@ public static object Deserialize(IBsonReader bsonReader, Type nominalType, Actio /// The configurator. /// A deserialized value. public static object Deserialize(byte[] bytes, Type nominalType, Action configurator = null) - { - using (var buffer = new ByteArrayBuffer(bytes, isReadOnly: true)) - using (var stream = new ByteBufferStream(buffer)) - { - return Deserialize(stream, nominalType, configurator); - } - } + => _serializationDomain.Deserialize(bytes, nominalType, configurator); /// /// Deserializes an object from a BSON Stream. @@ -232,12 +172,7 @@ public static object Deserialize(byte[] bytes, Type nominalType, ActionThe configurator. /// A deserialized value. public static object Deserialize(Stream stream, Type nominalType, Action configurator = null) - { - using (var bsonReader = new BsonBinaryReader(stream)) - { - return Deserialize(bsonReader, nominalType, configurator); - } - } + => _serializationDomain.Deserialize(stream, nominalType, configurator); /// /// Deserializes an object from a JSON string. @@ -247,12 +182,7 @@ public static object Deserialize(Stream stream, Type nominalType, ActionThe configurator. /// A deserialized value. public static object Deserialize(string json, Type nominalType, Action configurator = null) - { - using (var bsonReader = new JsonReader(json)) - { - return Deserialize(bsonReader, nominalType, configurator); - } - } + => _serializationDomain.Deserialize(json, nominalType, configurator); /// /// Deserializes an object from a JSON TextReader. @@ -262,57 +192,13 @@ public static object Deserialize(string json, Type nominalType, ActionThe configurator. /// A deserialized value. public static object Deserialize(TextReader textReader, Type nominalType, Action configurator = null) - { - using (var bsonReader = new JsonReader(textReader)) - { - return Deserialize(bsonReader, nominalType, configurator); - } - } + => _serializationDomain.Deserialize(textReader, nominalType, configurator); internal static IDiscriminatorConvention GetOrRegisterDiscriminatorConvention(Type type, IDiscriminatorConvention discriminatorConvention) - { - __configLock.EnterReadLock(); - try - { - if (__discriminatorConventions.TryGetValue(type, out var registeredDiscriminatorConvention)) - { - return registeredDiscriminatorConvention; - } - } - finally - { - __configLock.ExitReadLock(); - } - - __configLock.EnterWriteLock(); - try - { - if (__discriminatorConventions.TryGetValue(type, out var registeredDiscrimantorConvention)) - { - return registeredDiscrimantorConvention; - } - - RegisterDiscriminatorConvention(type, discriminatorConvention); - return discriminatorConvention; - } - finally - { - __configLock.ExitWriteLock(); - } - } + => _serializationDomain.GetOrRegisterDiscriminatorConvention(type, discriminatorConvention); internal static bool IsDiscriminatorConventionRegisteredAtThisLevel(Type type) - { - __configLock.EnterReadLock(); - try - { - return __discriminatorConventions.ContainsKey(type); - } - finally - { - __configLock.ExitReadLock(); - } - } + => _serializationDomain.IsDiscriminatorConventionRegisteredAtThisLevel(type); /// /// Returns whether the given type has any discriminators registered for any of its subclasses. @@ -320,10 +206,7 @@ internal static bool IsDiscriminatorConventionRegisteredAtThisLevel(Type type) /// A Type. /// True if the type is discriminated. public static bool IsTypeDiscriminated(Type type) - { - var typeInfo = type.GetTypeInfo(); - return typeInfo.IsInterface || __discriminatedTypes.Contains(type); - } + => _serializationDomain.IsTypeDiscriminated(type); /// /// Looks up the actual type of an object to be deserialized. @@ -332,73 +215,7 @@ public static bool IsTypeDiscriminated(Type type) /// The discriminator. /// The actual type of the object. public static Type LookupActualType(Type nominalType, BsonValue discriminator) - { - if (discriminator == null) - { - return nominalType; - } - - // note: EnsureKnownTypesAreRegistered handles its own locking so call from outside any lock - EnsureKnownTypesAreRegistered(nominalType); - - __configLock.EnterReadLock(); - try - { - Type actualType = null; - - HashSet hashSet; - var nominalTypeInfo = nominalType.GetTypeInfo(); - if (__discriminators.TryGetValue(discriminator, out hashSet)) - { - foreach (var type in hashSet) - { - if (nominalTypeInfo.IsAssignableFrom(type)) - { - if (actualType == null) - { - actualType = type; - } - else - { - string message = string.Format("Ambiguous discriminator '{0}'.", discriminator); - throw new BsonSerializationException(message); - } - } - } - - // no need for additional checks, we found the right type - if (actualType != null) - { - return actualType; - } - } - - if (discriminator.IsString) - { - actualType = TypeNameDiscriminator.GetActualType(discriminator.AsString); // see if it's a Type name - } - - if (actualType == null) - { - string message = string.Format("Unknown discriminator value '{0}'.", discriminator); - throw new BsonSerializationException(message); - } - - if (!nominalTypeInfo.IsAssignableFrom(actualType)) - { - string message = string.Format( - "Actual type {0} is not assignable to expected type {1}.", - actualType.FullName, nominalType.FullName); - throw new BsonSerializationException(message); - } - - return actualType; - } - finally - { - __configLock.ExitReadLock(); - } - } + => _serializationDomain.LookupActualType(nominalType, discriminator); /// /// Looks up the discriminator convention for a type. @@ -406,76 +223,7 @@ public static Type LookupActualType(Type nominalType, BsonValue discriminator) /// The type. /// A discriminator convention. public static IDiscriminatorConvention LookupDiscriminatorConvention(Type type) - { - __configLock.EnterReadLock(); - try - { - IDiscriminatorConvention convention; - if (__discriminatorConventions.TryGetValue(type, out convention)) - { - return convention; - } - } - finally - { - __configLock.ExitReadLock(); - } - - __configLock.EnterWriteLock(); - try - { - IDiscriminatorConvention convention; - if (!__discriminatorConventions.TryGetValue(type, out convention)) - { - var typeInfo = type.GetTypeInfo(); - if (type == typeof(object)) - { - // if there is no convention registered for object register the default one - convention = new ObjectDiscriminatorConvention("_t"); - RegisterDiscriminatorConvention(typeof(object), convention); - } - else if (typeInfo.IsInterface) - { - // TODO: should convention for interfaces be inherited from parent interfaces? - convention = LookupDiscriminatorConvention(typeof(object)); - RegisterDiscriminatorConvention(type, convention); - } - else - { - // inherit the discriminator convention from the closest parent (that isn't object) that has one - // otherwise default to the standard scalar convention - Type parentType = typeInfo.BaseType; - while (true) - { - if (parentType == typeof(object)) - { - convention = StandardDiscriminatorConvention.Scalar; - break; - } - if (__discriminatorConventions.TryGetValue(parentType, out convention)) - { - break; - } - parentType = parentType.GetTypeInfo().BaseType; - } - - // register this convention for all types between this and the parent type where we found the convention - var unregisteredType = type; - while (unregisteredType != parentType) - { - RegisterDiscriminatorConvention(unregisteredType, convention); - unregisteredType = unregisteredType.GetTypeInfo().BaseType; - } - } - } - - return convention; - } - finally - { - __configLock.ExitWriteLock(); - } - } + => _serializationDomain.LookupDiscriminatorConvention(type); /// /// Looks up an IdGenerator. @@ -483,78 +231,21 @@ public static IDiscriminatorConvention LookupDiscriminatorConvention(Type type) /// The Id type. /// An IdGenerator for the Id type. public static IIdGenerator LookupIdGenerator(Type type) - { - __configLock.EnterReadLock(); - try - { - IIdGenerator idGenerator; - if (__idGenerators.TryGetValue(type, out idGenerator)) - { - return idGenerator; - } - } - finally - { - __configLock.ExitReadLock(); - } - - __configLock.EnterWriteLock(); - try - { - IIdGenerator idGenerator; - if (!__idGenerators.TryGetValue(type, out idGenerator)) - { - var typeInfo = type.GetTypeInfo(); - if (typeInfo.IsValueType && __useZeroIdChecker) - { - var iEquatableDefinition = typeof(IEquatable<>); - var iEquatableType = iEquatableDefinition.MakeGenericType(type); - if (iEquatableType.GetTypeInfo().IsAssignableFrom(type)) - { - var zeroIdCheckerDefinition = typeof(ZeroIdChecker<>); - var zeroIdCheckerType = zeroIdCheckerDefinition.MakeGenericType(type); - idGenerator = (IIdGenerator)Activator.CreateInstance(zeroIdCheckerType); - } - } - else if (__useNullIdChecker) - { - idGenerator = NullIdChecker.Instance; - } - else - { - idGenerator = null; - } - - __idGenerators[type] = idGenerator; // remember it even if it's null - } - - return idGenerator; - } - finally - { - __configLock.ExitWriteLock(); - } - } + => _serializationDomain.LookupIdGenerator(type); /// /// Looks up a serializer for a Type. /// /// The type. /// A serializer for type T. - public static IBsonSerializer LookupSerializer() - { - return (IBsonSerializer)LookupSerializer(typeof(T)); - } + public static IBsonSerializer LookupSerializer() => _serializationDomain.LookupSerializer(); /// /// Looks up a serializer for a Type. /// /// The Type. /// A serializer for the Type. - public static IBsonSerializer LookupSerializer(Type type) - { - return __serializerRegistry.GetSerializer(type); - } + public static IBsonSerializer LookupSerializer(Type type) => _serializationDomain.LookupSerializer(type); /// /// Registers the discriminator for a type. @@ -562,40 +253,7 @@ public static IBsonSerializer LookupSerializer(Type type) /// The type. /// The discriminator. public static void RegisterDiscriminator(Type type, BsonValue discriminator) - { - var typeInfo = type.GetTypeInfo(); - if (typeInfo.IsInterface) - { - var message = string.Format("Discriminators can only be registered for classes, not for interface {0}.", type.FullName); - throw new BsonSerializationException(message); - } - - __configLock.EnterWriteLock(); - try - { - HashSet hashSet; - if (!__discriminators.TryGetValue(discriminator, out hashSet)) - { - hashSet = new HashSet(); - __discriminators.Add(discriminator, hashSet); - } - - if (!hashSet.Contains(type)) - { - hashSet.Add(type); - - // mark all base types as discriminated (so we know that it's worth reading a discriminator) - for (var baseType = typeInfo.BaseType; baseType != null; baseType = baseType.GetTypeInfo().BaseType) - { - __discriminatedTypes.Add(baseType); - } - } - } - finally - { - __configLock.ExitWriteLock(); - } - } + => _serializationDomain.RegisterDiscriminator(type, discriminator); /// /// Registers the discriminator convention for a type. @@ -603,37 +261,15 @@ public static void RegisterDiscriminator(Type type, BsonValue discriminator) /// Type type. /// The discriminator convention. public static void RegisterDiscriminatorConvention(Type type, IDiscriminatorConvention convention) - { - __configLock.EnterWriteLock(); - try - { - if (!__discriminatorConventions.ContainsKey(type)) - { - __discriminatorConventions.Add(type, convention); - } - else - { - var message = string.Format("There is already a discriminator convention registered for type {0}.", type.FullName); - throw new BsonSerializationException(message); - } - } - finally - { - __configLock.ExitWriteLock(); - } - } + => _serializationDomain.RegisterDiscriminatorConvention(type, convention); /// /// Registers a generic serializer definition for a generic type. /// /// The generic type. /// The generic serializer definition. - public static void RegisterGenericSerializerDefinition( - Type genericTypeDefinition, - Type genericSerializerDefinition) - { - __typeMappingSerializationProvider.RegisterMapping(genericTypeDefinition, genericSerializerDefinition); - } + public static void RegisterGenericSerializerDefinition(Type genericTypeDefinition, Type genericSerializerDefinition) + => _serializationDomain.RegisterGenericSerializerDefinition(genericTypeDefinition, genericSerializerDefinition); /// /// Registers an IdGenerator for an Id Type. @@ -641,26 +277,14 @@ public static void RegisterGenericSerializerDefinition( /// The Id Type. /// The IdGenerator for the Id Type. public static void RegisterIdGenerator(Type type, IIdGenerator idGenerator) - { - __configLock.EnterWriteLock(); - try - { - __idGenerators[type] = idGenerator; - } - finally - { - __configLock.ExitWriteLock(); - } - } + => _serializationDomain.RegisterIdGenerator(type, idGenerator); /// /// Registers a serialization provider. /// /// The serialization provider. public static void RegisterSerializationProvider(IBsonSerializationProvider provider) - { - __serializerRegistry.RegisterSerializationProvider(provider); - } + => _serializationDomain.RegisterSerializationProvider(provider); /// /// Registers a serializer for a type. @@ -668,9 +292,7 @@ public static void RegisterSerializationProvider(IBsonSerializationProvider prov /// The type. /// The serializer. public static void RegisterSerializer(IBsonSerializer serializer) - { - RegisterSerializer(typeof(T), serializer); - } + => _serializationDomain.RegisterSerializer(serializer); /// /// Registers a serializer for a type. @@ -678,9 +300,7 @@ public static void RegisterSerializer(IBsonSerializer serializer) /// The type. /// The serializer. public static void RegisterSerializer(Type type, IBsonSerializer serializer) - { - __serializerRegistry.RegisterSerializer(type, serializer); - } + => _serializationDomain.RegisterSerializer(type, serializer); /// /// Serializes a value. @@ -694,13 +314,8 @@ public static void Serialize( IBsonWriter bsonWriter, TNominalType value, Action configurator = null, - BsonSerializationArgs args = default(BsonSerializationArgs)) - { - args.SetOrValidateNominalType(typeof(TNominalType), ""); - var serializer = LookupSerializer(); - var context = BsonSerializationContext.CreateRoot(bsonWriter, configurator); - serializer.Serialize(context, args, value); - } + BsonSerializationArgs args = default) + => _serializationDomain.Serialize(bsonWriter, value, configurator, args); /// /// Serializes a value. @@ -716,12 +331,7 @@ public static void Serialize( object value, Action configurator = null, BsonSerializationArgs args = default(BsonSerializationArgs)) - { - args.SetOrValidateNominalType(nominalType, "nominalType"); - var serializer = LookupSerializer(nominalType); - var context = BsonSerializationContext.CreateRoot(bsonWriter, configurator); - serializer.Serialize(context, args, value); - } + => _serializationDomain.Serialize(bsonWriter, nominalType, value, configurator, args); /// /// Tries to register a serializer for a type. @@ -730,9 +340,7 @@ public static void Serialize( /// The type. /// True if the serializer was registered on this call, false if the same serializer was already registered on a previous call, throws an exception if a different serializer was already registered. public static bool TryRegisterSerializer(Type type, IBsonSerializer serializer) - { - return __serializerRegistry.TryRegisterSerializer(type, serializer); - } + => _serializationDomain.TryRegisterSerializer(type, serializer); /// /// Tries to register a serializer for a type. @@ -741,64 +349,10 @@ public static bool TryRegisterSerializer(Type type, IBsonSerializer serializer) /// The serializer. /// True if the serializer was registered on this call, false if the same serializer was already registered on a previous call, throws an exception if a different serializer was already registered. public static bool TryRegisterSerializer(IBsonSerializer serializer) - { - return TryRegisterSerializer(typeof(T), serializer); - } + => _serializationDomain.TryRegisterSerializer(serializer); // internal static methods internal static void EnsureKnownTypesAreRegistered(Type nominalType) - { - if (__typesWithRegisteredKnownTypes.ContainsKey(nominalType)) - { - return; - } - - __configLock.EnterWriteLock(); - try - { - if (!__typesWithRegisteredKnownTypes.ContainsKey(nominalType)) - { - // only call LookupClassMap for classes with a BsonKnownTypesAttribute - var hasKnownTypesAttribute = nominalType.GetTypeInfo().GetCustomAttributes(typeof(BsonKnownTypesAttribute), inherit: false).Any(); - if (hasKnownTypesAttribute) - { - // try and force a scan of the known types - LookupSerializer(nominalType); - } - - // NOTE: The nominalType MUST be added to __typesWithRegisteredKnownTypes after all registration - // work is done to ensure that other threads don't access a partially registered nominalType - // when performing the initial check above outside the __config lock. - __typesWithRegisteredKnownTypes[nominalType] = null; - } - } - finally - { - __configLock.ExitWriteLock(); - } - } - - // private static methods - private static void CreateSerializerRegistry() - { - __serializerRegistry = new BsonSerializerRegistry(); - __typeMappingSerializationProvider = new TypeMappingSerializationProvider(); - - // order matters. It's in reverse order of how they'll get consumed - __serializerRegistry.RegisterSerializationProvider(new BsonClassMapSerializationProvider()); - __serializerRegistry.RegisterSerializationProvider(new DiscriminatedInterfaceSerializationProvider()); - __serializerRegistry.RegisterSerializationProvider(new CollectionsSerializationProvider()); - __serializerRegistry.RegisterSerializationProvider(new PrimitiveSerializationProvider()); - __serializerRegistry.RegisterSerializationProvider(new AttributedSerializationProvider()); - __serializerRegistry.RegisterSerializationProvider(__typeMappingSerializationProvider); - __serializerRegistry.RegisterSerializationProvider(new BsonObjectModelSerializationProvider()); - } - - private static void RegisterIdGenerators() - { - RegisterIdGenerator(typeof(BsonObjectId), BsonObjectIdGenerator.Instance); - RegisterIdGenerator(typeof(Guid), GuidGenerator.Instance); - RegisterIdGenerator(typeof(ObjectId), ObjectIdGenerator.Instance); - } + => _serializationDomain.EnsureKnownTypesAreRegistered(nominalType); } } diff --git a/src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs b/src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs index 429386f6019..ff80f900443 100644 --- a/src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs +++ b/src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs @@ -28,19 +28,35 @@ public sealed class BsonSerializerRegistry : IBsonSerializerRegistry private readonly ConcurrentDictionary _cache; private readonly ConcurrentStack _serializationProviders; private readonly Func _createSerializer; + private readonly IBsonSerializationDomain _serializationDomain; // constructors /// /// Initializes a new instance of the class. /// - public BsonSerializerRegistry() + public BsonSerializerRegistry(): + this(BsonSerializer.DefaultSerializationDomain) + { + } + + /// + /// //TODO + /// + /// + public BsonSerializerRegistry(IBsonSerializationDomain serializationDomain) { _cache = new ConcurrentDictionary(); _serializationProviders = new ConcurrentStack(); _createSerializer = CreateSerializer; + _serializationDomain = serializationDomain; } // public methods + /// + /// //TODO + /// + public IBsonSerializationDomain SerializationDomain => _serializationDomain; + /// /// Gets the serializer for the specified . /// If none is already registered, the serialization providers will be used to create a serializer and it will be automatically registered. diff --git a/src/MongoDB.Bson/Serialization/Conventions/AttributeConventionPack.cs b/src/MongoDB.Bson/Serialization/Conventions/AttributeConventionPack.cs index 77f0bc0cb78..0799dd6c13f 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/AttributeConventionPack.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/AttributeConventionPack.cs @@ -87,7 +87,9 @@ public void Apply(BsonCreatorMap creatorMap) } } - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { var attributes = memberMap.MemberInfo.GetCustomAttributes(inherit: false).OfType(); var groupings = attributes.GroupBy(a => (a is BsonSerializerAttribute) ? 1 : 2); @@ -100,7 +102,9 @@ public void Apply(BsonMemberMap memberMap) } } - public void PostProcess(BsonClassMap classMap) + public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultSerializationDomain); + + public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) { foreach (var attribute in classMap.ClassType.GetTypeInfo().GetCustomAttributes(inherit: false).OfType()) { diff --git a/src/MongoDB.Bson/Serialization/Conventions/CamelCaseElementNameConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/CamelCaseElementNameConvention.cs index dd249c11359..2a24166d4f9 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/CamelCaseElementNameConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/CamelCaseElementNameConvention.cs @@ -24,11 +24,11 @@ namespace MongoDB.Bson.Serialization.Conventions public class CamelCaseElementNameConvention : ConventionBase, IMemberMapConvention { // public methods - /// - /// Applies a modification to the member map. - /// - /// The member map. - public void Apply(BsonMemberMap memberMap) + /// + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { string name = memberMap.MemberName; name = GetElementName(name); diff --git a/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistry.cs b/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistry.cs index f54934d6ed3..582693d64e4 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistry.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistry.cs @@ -14,7 +14,6 @@ */ using System; -using System.Collections.Generic; namespace MongoDB.Bson.Serialization.Conventions { @@ -23,60 +22,14 @@ namespace MongoDB.Bson.Serialization.Conventions /// public static class ConventionRegistry { - // private static fields - private readonly static List __conventionPacks = new List(); - private readonly static object __lock = new object(); - - // static constructors - static ConventionRegistry() - { - Register("__defaults__", DefaultConventionPack.Instance, t => true); - Register("__attributes__", AttributeConventionPack.Instance, t => true); - } - // public static methods /// /// Looks up the effective set of conventions that apply to a type. /// /// The type. /// The conventions for that type. - public static IConventionPack Lookup(Type type) - { - if (type == null) - { - throw new ArgumentNullException("type"); - } - - lock (__lock) - { - var pack = new ConventionPack(); - - // append any attribute packs (usually just one) at the end so attributes are processed last - var attributePacks = new List(); - foreach (var container in __conventionPacks) - { - if (container.Filter(type)) - { - - if (container.Name == "__attributes__") - { - attributePacks.Add(container.Pack); - } - else - { - pack.Append(container.Pack); - } - } - } - - foreach (var attributePack in attributePacks) - { - pack.Append(attributePack); - } - - return pack; - } - } + public static IConventionPack Lookup(Type type) => + BsonSerializer.DefaultSerializationDomain.ConventionRegistry.Lookup(type); /// /// Registers the conventions. @@ -84,33 +37,8 @@ public static IConventionPack Lookup(Type type) /// The name. /// The conventions. /// The filter. - public static void Register(string name, IConventionPack conventions, Func filter) - { - if (name == null) - { - throw new ArgumentNullException("name"); - } - if (conventions == null) - { - throw new ArgumentNullException("conventions"); - } - if (filter == null) - { - throw new ArgumentNullException("filter"); - } - - lock (__lock) - { - var container = new ConventionPackContainer - { - Filter = filter, - Name = name, - Pack = conventions - }; - - __conventionPacks.Add(container); - } - } + public static void Register(string name, IConventionPack conventions, Func filter) => + BsonSerializer.DefaultSerializationDomain.ConventionRegistry.Register(name, conventions, filter); /// /// Removes the conventions specified by the given name. @@ -119,25 +47,7 @@ public static void Register(string name, IConventionPack conventions, FuncRemoving a convention allows the removal of the special __defaults__ conventions /// and the __attributes__ conventions for those who want to completely customize the /// experience. - public static void Remove(string name) - { - if (name == null) - { - throw new ArgumentNullException("name"); - } - - lock (__lock) - { - __conventionPacks.RemoveAll(x => x.Name == name); - } - } - - // private class - private class ConventionPackContainer - { - public Func Filter; - public string Name; - public IConventionPack Pack; - } + public static void Remove(string name) => + BsonSerializer.DefaultSerializationDomain.ConventionRegistry.Remove(name); } } diff --git a/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistryDomain.cs b/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistryDomain.cs new file mode 100644 index 00000000000..3bf5a4935fe --- /dev/null +++ b/src/MongoDB.Bson/Serialization/Conventions/ConventionRegistryDomain.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; + +namespace MongoDB.Bson.Serialization.Conventions +{ + internal class ConventionRegistryDomain : IConventionRegistryDomain + { + private readonly List _conventionPacks = []; + private readonly object _lock = new(); + + // constructors + internal ConventionRegistryDomain() + { + Register("__defaults__", DefaultConventionPack.Instance, t => true); + Register("__attributes__", AttributeConventionPack.Instance, t => true); + } + + // public static methods + /// + /// Looks up the effective set of conventions that apply to a type. + /// + /// The type. + /// The conventions for that type. + public IConventionPack Lookup(Type type) + { + if (type == null) + { + throw new ArgumentNullException("type"); + } + + lock (_lock) + { + var pack = new ConventionPack(); + + // append any attribute packs (usually just one) at the end so attributes are processed last + var attributePacks = new List(); + foreach (var container in _conventionPacks) + { + if (container.Filter(type)) + { + + if (container.Name == "__attributes__") + { + attributePacks.Add(container.Pack); + } + else + { + pack.Append(container.Pack); + } + } + } + + foreach (var attributePack in attributePacks) + { + pack.Append(attributePack); + } + + return pack; + } + } + + /// + /// Registers the conventions. + /// + /// The name. + /// The conventions. + /// The filter. + public void Register(string name, IConventionPack conventions, Func filter) + { + if (name == null) + { + throw new ArgumentNullException("name"); + } + + if (conventions == null) + { + throw new ArgumentNullException("conventions"); + } + + if (filter == null) + { + throw new ArgumentNullException("filter"); + } + + lock (_lock) + { + var container = new ConventionPackContainer + { + Filter = filter, + Name = name, + Pack = conventions + }; + + _conventionPacks.Add(container); + } + } + + /// + /// Removes the conventions specified by the given name. + /// + /// The name. + /// Removing a convention allows the removal of the special __defaults__ conventions + /// and the __attributes__ conventions for those who want to completely customize the + /// experience. + public void Remove(string name) + { + if (name == null) + { + throw new ArgumentNullException("name"); + } + + lock (_lock) + { + _conventionPacks.RemoveAll(x => x.Name == name); + } + } + + // private class + private class ConventionPackContainer + { + public Func Filter; + public string Name; + public IConventionPack Pack; + } + } +} \ No newline at end of file diff --git a/src/MongoDB.Bson/Serialization/Conventions/DelegateMemberMapConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/DelegateMemberMapConvention.cs index 80cafe70046..3f9a9b5eb77 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/DelegateMemberMapConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/DelegateMemberMapConvention.cs @@ -46,7 +46,10 @@ public DelegateMemberMapConvention(string name, Action action) /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { _action(memberMap); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/DelegatePostProcessingConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/DelegatePostProcessingConvention.cs index 8c535f842f0..a8f11d061c7 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/DelegatePostProcessingConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/DelegatePostProcessingConvention.cs @@ -46,7 +46,10 @@ public DelegatePostProcessingConvention(string name, Action action /// Applies a post processing modification to the class map. /// /// The class map. - public void PostProcess(BsonClassMap classMap) + public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) { _action(classMap); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/EnumRepresentationConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/EnumRepresentationConvention.cs index 55ad9a00b9e..b2f5e5953d8 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/EnumRepresentationConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/EnumRepresentationConvention.cs @@ -47,7 +47,10 @@ public EnumRepresentationConvention(BsonType representation) /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { var memberType = memberMap.MemberType; var memberTypeInfo = memberType.GetTypeInfo(); diff --git a/src/MongoDB.Bson/Serialization/Conventions/HierarchicalDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/HierarchicalDiscriminatorConvention.cs index beebf06230e..d24210ff5b4 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/HierarchicalDiscriminatorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/HierarchicalDiscriminatorConvention.cs @@ -41,10 +41,14 @@ public HierarchicalDiscriminatorConvention(string elementName) /// The nominal type. /// The actual type. /// The discriminator value. - public override BsonValue GetDiscriminator(Type nominalType, Type actualType) + public override BsonValue GetDiscriminator(Type nominalType, Type actualType) => + GetDiscriminator(nominalType, actualType, BsonSerializer.DefaultSerializationDomain); + + /// + public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain) { // TODO: this isn't quite right, not all classes are serialized using a class map serializer - var classMap = BsonClassMap.LookupClassMap(actualType); + var classMap = domain.BsonClassMap.LookupClassMap(actualType); if (actualType != nominalType || classMap.DiscriminatorIsRequired || classMap.HasRootClass) { if (classMap.HasRootClass && !classMap.IsRootClass) diff --git a/src/MongoDB.Bson/Serialization/Conventions/IConventionRegistryDomain.cs b/src/MongoDB.Bson/Serialization/Conventions/IConventionRegistryDomain.cs new file mode 100644 index 00000000000..d7ff791518d --- /dev/null +++ b/src/MongoDB.Bson/Serialization/Conventions/IConventionRegistryDomain.cs @@ -0,0 +1,31 @@ +using System; + +namespace MongoDB.Bson.Serialization.Conventions +{ + /// + /// //TODO + /// + public interface IConventionRegistryDomain + { + /// + /// //TODO + /// + /// + /// + IConventionPack Lookup(Type type); + + /// + /// //TODO + /// + /// + /// + /// + void Register(string name, IConventionPack conventions, Func filter); + + /// + /// //TODO + /// + /// + void Remove(string name); + } +} \ No newline at end of file diff --git a/src/MongoDB.Bson/Serialization/Conventions/IDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IDiscriminatorConvention.cs index 242d0b557b2..11fa1528f01 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/IDiscriminatorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/IDiscriminatorConvention.cs @@ -36,6 +36,15 @@ public interface IDiscriminatorConvention /// The actual type. Type GetActualType(IBsonReader bsonReader, Type nominalType); + /// + /// //TODO + /// + /// + /// + /// + /// + Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain); + /// /// Gets the discriminator value for an actual type. /// @@ -43,5 +52,15 @@ public interface IDiscriminatorConvention /// The actual type. /// The discriminator value. BsonValue GetDiscriminator(Type nominalType, Type actualType); + + /// + /// //TODO + /// + /// + /// + /// + /// + BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain); + } } diff --git a/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs index b05f40d64ad..c32583b45b4 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/IMemberMapConvention.cs @@ -25,5 +25,13 @@ public interface IMemberMapConvention : IConvention /// /// The member map. void Apply(BsonMemberMap memberMap); + + /// + /// //TODO + /// + /// + /// + void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain); + } } diff --git a/src/MongoDB.Bson/Serialization/Conventions/IPostProcessingConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IPostProcessingConvention.cs index ddb7a095df5..d2d8df84944 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/IPostProcessingConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/IPostProcessingConvention.cs @@ -25,5 +25,12 @@ public interface IPostProcessingConvention : IConvention /// /// The class map. void PostProcess(BsonClassMap classMap); + + /// + /// //TODO + /// + /// + /// + void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain); } } diff --git a/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfDefaultConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfDefaultConvention.cs index aede146fe8c..a6b09d71019 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfDefaultConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfDefaultConvention.cs @@ -37,7 +37,10 @@ public IgnoreIfDefaultConvention(bool ignoreIfDefault) /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { memberMap.SetIgnoreIfDefault(_ignoreIfDefault); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfNullConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfNullConvention.cs index c99f694fe81..6dfeaacf2d7 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfNullConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/IgnoreIfNullConvention.cs @@ -37,7 +37,10 @@ public IgnoreIfNullConvention(bool ignoreIfNull) /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { memberMap.SetIgnoreIfNull(_ignoreIfNull); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs index 81f31d14444..596983abe3b 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/LookupIdGeneratorConvention.cs @@ -23,19 +23,19 @@ namespace MongoDB.Bson.Serialization.Conventions /// public class LookupIdGeneratorConvention : ConventionBase, IPostProcessingConvention { - // public methods - /// - /// Applies a post processing modification to the class map. - /// - /// The class map. - public void PostProcess(BsonClassMap classMap) + /// + public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) { var idMemberMap = classMap.IdMemberMap; if (idMemberMap != null) { if (idMemberMap.IdGenerator == null) { - var idGenerator = BsonSerializer.LookupIdGenerator(idMemberMap.MemberType); + //or we pass the domain to the BsonClassMap. The first probably makes more sense, but it's messier. + var idGenerator = domain.LookupIdGenerator(idMemberMap.MemberType); if (idGenerator != null) { idMemberMap.SetIdGenerator(idGenerator); diff --git a/src/MongoDB.Bson/Serialization/Conventions/MemberDefaultValueConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/MemberDefaultValueConvention.cs index 51ff212c300..4a4bea208d7 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/MemberDefaultValueConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/MemberDefaultValueConvention.cs @@ -43,7 +43,10 @@ public MemberDefaultValueConvention(Type type, object defaultValue) /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { if (memberMap.MemberType == _type) { diff --git a/src/MongoDB.Bson/Serialization/Conventions/MemberNameElementNameConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/MemberNameElementNameConvention.cs index bdee9118a15..1a715e8991d 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/MemberNameElementNameConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/MemberNameElementNameConvention.cs @@ -28,7 +28,10 @@ public class MemberNameElementNameConvention : ConventionBase, IMemberMapConvent /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { memberMap.SetElementName(memberMap.MemberName); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/NoIdMemberConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/NoIdMemberConvention.cs index 82d295cb42f..4d47f56b750 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/NoIdMemberConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/NoIdMemberConvention.cs @@ -30,7 +30,10 @@ public class NoIdMemberConvention : ConventionBase, IPostProcessingConvention /// Applies a post processing modification to the class map. /// /// The class map. - public void PostProcess(BsonClassMap classMap) + public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) { classMap.SetIdMember(null); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs index 9a0a7683368..63c9d91df20 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs @@ -86,7 +86,11 @@ obj is ObjectDiscriminatorConvention other && /// The reader. /// The nominal type. /// The actual type. - public Type GetActualType(IBsonReader bsonReader, Type nominalType) + public Type GetActualType(IBsonReader bsonReader, Type nominalType) => + GetActualType(bsonReader, nominalType, BsonSerializer.DefaultSerializationDomain); + + /// + public Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain) { // the BsonReader is sitting at the value whose actual type needs to be found var bsonType = bsonReader.GetCurrentBsonType(); @@ -135,7 +139,7 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType) { discriminator = discriminator.AsBsonArray.Last(); // last item is leaf class discriminator } - actualType = BsonSerializer.LookupActualType(nominalType, discriminator); + actualType = domain.LookupActualType(nominalType, discriminator); } bsonReader.ReturnToBookmark(bookmark); return actualType; @@ -155,6 +159,12 @@ public BsonValue GetDiscriminator(Type nominalType, Type actualType) return TypeNameDiscriminator.GetDiscriminator(actualType); } + /// + public BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } + /// public override int GetHashCode() => 0; } diff --git a/src/MongoDB.Bson/Serialization/Conventions/ObjectSerializerAllowedTypesConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ObjectSerializerAllowedTypesConvention.cs index add1d581121..96d5117905b 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/ObjectSerializerAllowedTypesConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/ObjectSerializerAllowedTypesConvention.cs @@ -150,7 +150,10 @@ public bool AllowDefaultFrameworkTypes /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { var serializer = memberMap.GetSerializer(); diff --git a/src/MongoDB.Bson/Serialization/Conventions/ResetMemberMapsConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ResetMemberMapsConvention.cs index ef21036c3e3..81ff334c553 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/ResetMemberMapsConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/ResetMemberMapsConvention.cs @@ -25,7 +25,10 @@ public class ResetMemberMapsConvention : ConventionBase, IMemberMapConvention /// Applies a modification to the member map. /// /// The member map. - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { memberMap.Reset(); } diff --git a/src/MongoDB.Bson/Serialization/Conventions/ScalarDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/ScalarDiscriminatorConvention.cs index 7adf745fa25..e8fba249a7d 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/ScalarDiscriminatorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/ScalarDiscriminatorConvention.cs @@ -39,10 +39,14 @@ public ScalarDiscriminatorConvention(string elementName) /// The nominal type. /// The actual type. /// The discriminator value. - public override BsonValue GetDiscriminator(Type nominalType, Type actualType) + public override BsonValue GetDiscriminator(Type nominalType, Type actualType) => + GetDiscriminator(nominalType, actualType, BsonSerializer.DefaultSerializationDomain); + + /// + public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain) { // TODO: this isn't quite right, not all classes are serialized using a class map serializer - var classMap = BsonClassMap.LookupClassMap(actualType); + var classMap = domain.BsonClassMap.LookupClassMap(actualType); if (actualType != nominalType || classMap.DiscriminatorIsRequired) { return classMap.Discriminator; diff --git a/src/MongoDB.Bson/Serialization/Conventions/StandardDiscriminatorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/StandardDiscriminatorConvention.cs index ca4d2cbc117..85c2226cd99 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/StandardDiscriminatorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/StandardDiscriminatorConvention.cs @@ -94,17 +94,21 @@ obj is StandardDiscriminatorConvention other && /// The reader. /// The nominal type. /// The actual type. - public Type GetActualType(IBsonReader bsonReader, Type nominalType) + public Type GetActualType(IBsonReader bsonReader, Type nominalType) => + GetActualType(bsonReader, nominalType, BsonSerializer.DefaultSerializationDomain); + + /// + public Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain) { // the BsonReader is sitting at the value whose actual type needs to be found var bsonType = bsonReader.GetCurrentBsonType(); if (bsonType == BsonType.Document) { // ensure KnownTypes of nominalType are registered (so IsTypeDiscriminated returns correct answer) - BsonSerializer.EnsureKnownTypesAreRegistered(nominalType); + (domain as IBsonSerializationDomainInternal)!.EnsureKnownTypesAreRegistered(nominalType); //TODO Should we move Ensure... to the public interface? // we can skip looking for a discriminator if nominalType has no discriminated sub types - if (BsonSerializer.IsTypeDiscriminated(nominalType)) + if (domain.IsTypeDiscriminated(nominalType)) { var bookmark = bsonReader.GetBookmark(); bsonReader.ReadStartDocument(); @@ -117,7 +121,7 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType) { discriminator = discriminator.AsBsonArray.Last(); // last item is leaf class discriminator } - actualType = BsonSerializer.LookupActualType(nominalType, discriminator); + actualType = domain.LookupActualType(nominalType, discriminator); } bsonReader.ReturnToBookmark(bookmark); return actualType; @@ -135,6 +139,9 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType) /// The discriminator value. public abstract BsonValue GetDiscriminator(Type nominalType, Type actualType); + /// + public abstract BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain); + /// public override int GetHashCode() => 0; } diff --git a/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs index 923936d1508..64ae3ea628b 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/StringIdStoredAsObjectIdConvention.cs @@ -26,7 +26,10 @@ namespace MongoDB.Bson.Serialization.Conventions public class StringIdStoredAsObjectIdConvention : ConventionBase, IMemberMapConvention { /// - public void Apply(BsonMemberMap memberMap) + public void Apply(BsonMemberMap memberMap) => Apply(memberMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) { if (memberMap != memberMap.ClassMap.IdMemberMap) { @@ -38,7 +41,7 @@ public void Apply(BsonMemberMap memberMap) return; } - var defaultStringSerializer = BsonSerializer.LookupSerializer(typeof(string)); + var defaultStringSerializer = domain.LookupSerializer(typeof(string)); if (memberMap.GetSerializer() != defaultStringSerializer) { return; diff --git a/src/MongoDB.Bson/Serialization/Conventions/StringObjectIdIdGeneratorConvention.cs b/src/MongoDB.Bson/Serialization/Conventions/StringObjectIdIdGeneratorConvention.cs index 618d7213aec..ebcacdf76b5 100644 --- a/src/MongoDB.Bson/Serialization/Conventions/StringObjectIdIdGeneratorConvention.cs +++ b/src/MongoDB.Bson/Serialization/Conventions/StringObjectIdIdGeneratorConvention.cs @@ -29,7 +29,10 @@ public class StringObjectIdIdGeneratorConvention : ConventionBase, IPostProcessi /// Applies a post processing modification to the class map. /// /// The class map. - public void PostProcess(BsonClassMap classMap) + public void PostProcess(BsonClassMap classMap) => PostProcess(classMap, BsonSerializer.DefaultSerializationDomain); + + /// + public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) { var idMemberMap = classMap.IdMemberMap; if (idMemberMap != null) diff --git a/src/MongoDB.Bson/Serialization/IBsonClassMapDomain.cs b/src/MongoDB.Bson/Serialization/IBsonClassMapDomain.cs new file mode 100644 index 00000000000..0c569076ccb --- /dev/null +++ b/src/MongoDB.Bson/Serialization/IBsonClassMapDomain.cs @@ -0,0 +1,99 @@ +/* Copyright 2010-present MongoDB Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System; +using System.Collections.Generic; +using System.Reflection; + +namespace MongoDB.Bson.Serialization +{ + /// + /// //TODO + /// + public interface IBsonClassMapDomain + { + /// + /// Gets all registered class maps. + /// + /// All registered class maps. + IEnumerable GetRegisteredClassMaps(); + + /// + /// Checks whether a class map is registered for a type. + /// + /// The type to check. + /// True if there is a class map registered for the type. + bool IsClassMapRegistered(Type type); + + /// + /// Looks up a class map (will AutoMap the class if no class map is registered). + /// + /// The class type. + /// The class map. + BsonClassMap LookupClassMap(Type classType); + + /// + /// Creates and registers a class map. + /// + /// The class. + /// The class map. + BsonClassMap RegisterClassMap(); + + /// + /// Creates and registers a class map. + /// + /// The class. + /// The class map initializer. + /// The class map. + BsonClassMap RegisterClassMap(Action> classMapInitializer); + + /// + /// Registers a class map. + /// + /// The class map. + void RegisterClassMap(BsonClassMap classMap); + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// True if this call registered the class map, false if the class map was already registered. + bool TryRegisterClassMap(); + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// The class map. + /// True if this call registered the class map, false if the class map was already registered. + bool TryRegisterClassMap(BsonClassMap classMap); + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// The class map initializer (only called if the class map is not already registered). + /// True if this call registered the class map, false if the class map was already registered. + bool TryRegisterClassMap(Action> classMapInitializer); + + /// + /// Registers a class map if it is not already registered. + /// + /// The class. + /// The class map factory (only called if the class map is not already registered). + /// True if this call registered the class map, false if the class map was already registered. + bool TryRegisterClassMap(Func> classMapFactory); + } +} \ No newline at end of file diff --git a/src/MongoDB.Bson/Serialization/IBsonIdProvider.cs b/src/MongoDB.Bson/Serialization/IBsonIdProvider.cs index 6cb9ba4a811..c7ca28414b4 100644 --- a/src/MongoDB.Bson/Serialization/IBsonIdProvider.cs +++ b/src/MongoDB.Bson/Serialization/IBsonIdProvider.cs @@ -32,6 +32,17 @@ public interface IBsonIdProvider /// True if the document has an Id. bool GetDocumentId(object document, out object id, out Type idNominalType, out IIdGenerator idGenerator); + /// + /// //TODO + /// + /// + /// + /// + /// + /// + /// + bool GetDocumentId(object document, IBsonSerializationDomain domain, out object id, out Type idNominalType, out IIdGenerator idGenerator); + /// /// Sets the document Id. /// diff --git a/src/MongoDB.Bson/Serialization/IBsonSerializationDomain.cs b/src/MongoDB.Bson/Serialization/IBsonSerializationDomain.cs new file mode 100644 index 00000000000..7885b5b0be0 --- /dev/null +++ b/src/MongoDB.Bson/Serialization/IBsonSerializationDomain.cs @@ -0,0 +1,324 @@ +using System; +using System.IO; +using System.Threading; +using MongoDB.Bson.IO; +using MongoDB.Bson.Serialization.Conventions; + +namespace MongoDB.Bson.Serialization +{ + /// + /// //TODO + /// + public interface IBsonSerializationDomain + { + /// + /// Returns whether the given type has any discriminators registered for any of its subclasses. + /// + /// A Type. + /// True if the type is discriminated. + bool IsTypeDiscriminated(Type type); + + /// + /// Looks up the actual type of an object to be deserialized. + /// + /// The nominal type of the object. + /// The discriminator. + /// The actual type of the object. + Type LookupActualType(Type nominalType, BsonValue discriminator); + + /// + /// Looks up the discriminator convention for a type. + /// + /// The type. + /// A discriminator convention. + IDiscriminatorConvention LookupDiscriminatorConvention(Type type); + + /// + /// Looks up an IdGenerator. + /// + /// The Id type. + /// An IdGenerator for the Id type. + IIdGenerator LookupIdGenerator(Type type); + + /// + /// Looks up a serializer for a Type. + /// + /// The type. + /// A serializer for type T. + IBsonSerializer LookupSerializer(); + + /// + /// Looks up a serializer for a Type. + /// + /// The Type. + /// A serializer for the Type. + IBsonSerializer LookupSerializer(Type type); + + /// + /// Gets the serializer registry. + /// + IBsonSerializerRegistry SerializerRegistry { get; } + + /// + /// Registers the discriminator for a type. + /// + /// The type. + /// The discriminator. + void RegisterDiscriminator(Type type, BsonValue discriminator); + + /// + /// Registers the discriminator convention for a type. + /// + /// Type type. + /// The discriminator convention. + void RegisterDiscriminatorConvention(Type type, IDiscriminatorConvention convention); + + /// + /// Registers a generic serializer definition for a generic type. + /// + /// The generic type. + /// The generic serializer definition. + void RegisterGenericSerializerDefinition( + Type genericTypeDefinition, + Type genericSerializerDefinition); + + /// + /// Registers an IdGenerator for an Id Type. + /// + /// The Id Type. + /// The IdGenerator for the Id Type. + void RegisterIdGenerator(Type type, IIdGenerator idGenerator); + + /// + /// Registers a serialization provider. + /// + /// The serialization provider. + void RegisterSerializationProvider(IBsonSerializationProvider provider); + + /// + /// Registers a serializer for a type. + /// + /// The type. + /// The serializer. + void RegisterSerializer(IBsonSerializer serializer); + + /// + /// Registers a serializer for a type. + /// + /// The type. + /// The serializer. + void RegisterSerializer(Type type, IBsonSerializer serializer); + + /// + /// Tries to register a serializer for a type. + /// + /// The serializer. + /// The type. + /// True if the serializer was registered on this call, false if the same serializer was already registered on a previous call, throws an exception if a different serializer was already registered. + bool TryRegisterSerializer(Type type, IBsonSerializer serializer); + + /// + /// Tries to register a serializer for a type. + /// + /// The type. + /// The serializer. + /// True if the serializer was registered on this call, false if the same serializer was already registered on a previous call, throws an exception if a different serializer was already registered. + bool TryRegisterSerializer(IBsonSerializer serializer); + + /// + /// Gets or sets whether to use the NullIdChecker on reference Id types that don't have an IdGenerator registered. + /// + bool UseNullIdChecker { get; set; } + + /// + /// Gets or sets whether to use the ZeroIdChecker on value Id types that don't have an IdGenerator registered. + /// + bool UseZeroIdChecker { get; set; } + + /// + /// Deserializes an object from a BsonDocument. + /// + /// The nominal type of the object. + /// The BsonDocument. + /// The configurator. + /// A deserialized value. + TNominalType Deserialize(BsonDocument document, + Action configurator = null); + + /// + /// Deserializes a value. + /// + /// The nominal type of the object. + /// The BsonReader. + /// The configurator. + /// A deserialized value. + TNominalType Deserialize(IBsonReader bsonReader, + Action configurator = null); + + /// + /// Deserializes an object from a BSON byte array. + /// + /// The nominal type of the object. + /// The BSON byte array. + /// The configurator. + /// A deserialized value. + TNominalType Deserialize(byte[] bytes, + Action configurator = null); + + /// + /// Deserializes an object from a BSON Stream. + /// + /// The nominal type of the object. + /// The BSON Stream. + /// The configurator. + /// A deserialized value. + TNominalType Deserialize(Stream stream, + Action configurator = null); + + /// + /// Deserializes an object from a JSON string. + /// + /// The nominal type of the object. + /// The JSON string. + /// The configurator. + /// A deserialized value. + TNominalType Deserialize(string json, + Action configurator = null); + + /// + /// Deserializes an object from a JSON TextReader. + /// + /// The nominal type of the object. + /// The JSON TextReader. + /// The configurator. + /// A deserialized value. + TNominalType Deserialize(TextReader textReader, + Action configurator = null); + + /// + /// Deserializes an object from a BsonDocument. + /// + /// The BsonDocument. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + object Deserialize(BsonDocument document, Type nominalType, + Action configurator = null); + + /// + /// Deserializes a value. + /// + /// The BsonReader. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + object Deserialize(IBsonReader bsonReader, Type nominalType, + Action configurator = null); + + /// + /// Deserializes an object from a BSON byte array. + /// + /// The BSON byte array. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + object Deserialize(byte[] bytes, Type nominalType, + Action configurator = null); + + /// + /// Deserializes an object from a BSON Stream. + /// + /// The BSON Stream. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + object Deserialize(Stream stream, Type nominalType, + Action configurator = null); + + /// + /// Deserializes an object from a JSON string. + /// + /// The JSON string. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + object Deserialize(string json, Type nominalType, + Action configurator = null); + + /// + /// Deserializes an object from a JSON TextReader. + /// + /// The JSON TextReader. + /// The nominal type of the object. + /// The configurator. + /// A deserialized value. + object Deserialize(TextReader textReader, Type nominalType, + Action configurator = null); + + /// + /// Serializes a value. + /// + /// The nominal type of the object. + /// The BsonWriter. + /// The object. + /// The serialization context configurator. + /// The serialization args. + void Serialize( + IBsonWriter bsonWriter, + TNominalType value, + Action configurator = null, + BsonSerializationArgs args = default(BsonSerializationArgs)); + + /// + /// Serializes a value. + /// + /// The BsonWriter. + /// The nominal type of the object. + /// The object. + /// The serialization context configurator. + /// The serialization args. + void Serialize( + IBsonWriter bsonWriter, + Type nominalType, + object value, + Action configurator = null, + BsonSerializationArgs args = default(BsonSerializationArgs)); + + /// + /// //TODO + /// + IBsonClassMapDomain BsonClassMap { get; } + + /// + /// //TODO + /// + IConventionRegistryDomain ConventionRegistry { get; } + } + + internal interface IBsonSerializationDomainInternal : IBsonSerializationDomain + { + /// + /// //TODO + /// + /// + void EnsureKnownTypesAreRegistered(Type nominalType); + + /// + /// //TODO + /// + /// + /// + /// + IDiscriminatorConvention GetOrRegisterDiscriminatorConvention(Type type, + IDiscriminatorConvention discriminatorConvention); + + /// + /// //TODO + /// + /// + /// + bool IsDiscriminatorConventionRegisteredAtThisLevel(Type type); + + ReaderWriterLockSlim ConfigLock { get; } + } +} \ No newline at end of file diff --git a/src/MongoDB.Bson/Serialization/IBsonSerializerExtensions.cs b/src/MongoDB.Bson/Serialization/IBsonSerializerExtensions.cs index fd5998c93b3..18ef341df5d 100644 --- a/src/MongoDB.Bson/Serialization/IBsonSerializerExtensions.cs +++ b/src/MongoDB.Bson/Serialization/IBsonSerializerExtensions.cs @@ -58,7 +58,7 @@ public static TValue Deserialize(this IBsonSerializer serializer public static IDiscriminatorConvention GetDiscriminatorConvention(this IBsonSerializer serializer) => serializer is IHasDiscriminatorConvention hasDiscriminatorConvention ? hasDiscriminatorConvention.DiscriminatorConvention - : BsonSerializer.LookupDiscriminatorConvention(serializer.ValueType); + : BsonSerializer.LookupDiscriminatorConvention(serializer.ValueType); //TODO We can keep this as is /// /// Serializes a value. diff --git a/src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs b/src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs index 9a9d5f6b8f9..f23ce17703e 100644 --- a/src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs +++ b/src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs @@ -22,6 +22,11 @@ namespace MongoDB.Bson.Serialization /// public interface IBsonSerializerRegistry { + /// + /// //TODO + /// + public IBsonSerializationDomain SerializationDomain { get; } + /// /// Gets the serializer for the specified . /// diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonClassMapSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonClassMapSerializer.cs index fdcd59916ed..a509e6ee17a 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/BsonClassMapSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/BsonClassMapSerializer.cs @@ -96,7 +96,7 @@ public override TClass Deserialize(BsonDeserializationContext context, BsonDeser return DeserializeClass(context); } - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); return (TClass)serializer.Deserialize(context); } @@ -326,6 +326,11 @@ public bool GetDocumentId( out object id, out Type idNominalType, out IIdGenerator idGenerator) + => GetDocumentId(document, BsonSerializer.DefaultSerializationDomain, out id, out idNominalType, out idGenerator); + + /// + public bool GetDocumentId(object document, IBsonSerializationDomain domain, out object id, out Type idNominalType, + out IIdGenerator idGenerator) { var idMemberMap = _classMap.IdMemberMap; if (idMemberMap != null) @@ -392,7 +397,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati return; } - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); serializer.Serialize(context, args, value); } @@ -566,7 +571,7 @@ private object DeserializeMemberValue(BsonDeserializationContext context, BsonMe { try { - return memberMap.GetSerializer().Deserialize(context); + return memberMap.GetSerializer(context.SerializationDomain).Deserialize(context); } catch (Exception ex) { @@ -684,7 +689,7 @@ private void SerializeNormalMember(BsonSerializationContext context, object obj, } bsonWriter.WriteName(memberMap.ElementName); - memberMap.GetSerializer().Serialize(context, value); + memberMap.GetSerializer(context.SerializationDomain).Serialize(context, value); } private bool ShouldSerializeDiscriminator(Type nominalType) diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonDocumentSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonDocumentSerializer.cs index 2ba62a8294c..34657599b2e 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/BsonDocumentSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/BsonDocumentSerializer.cs @@ -81,6 +81,11 @@ public bool GetDocumentId( object document, out object id, out Type idNominalType, + out IIdGenerator idGenerator) => GetDocumentId(document, BsonSerializer.DefaultSerializationDomain, out id, + out idNominalType, out idGenerator); + + /// + public bool GetDocumentId(object document, IBsonSerializationDomain domain, out object id, out Type idNominalType, out IIdGenerator idGenerator) { var bsonDocument = (BsonDocument)document; @@ -89,7 +94,7 @@ public bool GetDocumentId( if (bsonDocument.TryGetValue("_id", out idBsonValue)) { id = idBsonValue; - idGenerator = BsonSerializer.LookupIdGenerator(id.GetType()); + idGenerator = domain.LookupIdGenerator(id.GetType()); if (idGenerator == null) { diff --git a/src/MongoDB.Bson/Serialization/Serializers/BsonValueSerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/BsonValueSerializerBase.cs index e3a5776870c..0f636ae834b 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/BsonValueSerializerBase.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/BsonValueSerializerBase.cs @@ -70,7 +70,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati var actualType = value.GetType(); if (actualType != ValueType && !args.SerializeAsNominalType) { - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); serializer.Serialize(context, value); return; } diff --git a/src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs index 07723b9cddb..963d97655ef 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs @@ -47,7 +47,7 @@ public override TValue Deserialize(BsonDeserializationContext context, BsonDeser } else { - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); return (TValue)serializer.Deserialize(context, args); } } @@ -75,7 +75,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati } else { - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); serializer.Serialize(context, value); } } diff --git a/src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs index 96b708d8aa6..3ae2562a928 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/DictionarySerializerBase.cs @@ -58,7 +58,7 @@ public DictionarySerializerBase() /// /// The dictionary representation. public DictionarySerializerBase(DictionaryRepresentation dictionaryRepresentation) - : this(dictionaryRepresentation, BsonSerializer.LookupSerializer(), BsonSerializer.LookupSerializer()) + : this(dictionaryRepresentation, BsonSerializer.LookupSerializer(), BsonSerializer.LookupSerializer()) //TODO We can keep this as is { } @@ -386,7 +386,7 @@ public DictionarySerializerBase() /// /// The dictionary representation. public DictionarySerializerBase(DictionaryRepresentation dictionaryRepresentation) - : this(dictionaryRepresentation, BsonSerializer.SerializerRegistry) + : this(dictionaryRepresentation, BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs index ca2fef6fe07..2ace50407f1 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs @@ -41,14 +41,14 @@ public sealed class DiscriminatedInterfaceSerializer : // where TInterface is an interface { #region static - private static IBsonSerializer CreateInterfaceSerializer() + private static IBsonSerializer CreateInterfaceSerializer(IBsonSerializationDomain domain) { var classMapDefinition = typeof(BsonClassMap<>); var classMapType = classMapDefinition.MakeGenericType(typeof(TInterface)); var classMap = (BsonClassMap)Activator.CreateInstance(classMapType); - classMap.AutoMap(); - classMap.SetDiscriminatorConvention(BsonSerializer.LookupDiscriminatorConvention(typeof(TInterface))); - classMap.Freeze(); + classMap.AutoMap(domain); + classMap.SetDiscriminatorConvention(domain.LookupDiscriminatorConvention(typeof(TInterface))); + classMap.Freeze(domain); return new BsonClassMapSerializer(classMap); } #endregion @@ -75,7 +75,7 @@ public DiscriminatedInterfaceSerializer() /// interfaceType /// interfaceType public DiscriminatedInterfaceSerializer(IDiscriminatorConvention discriminatorConvention) - : this(discriminatorConvention, CreateInterfaceSerializer()) + : this(discriminatorConvention, interfaceSerializer: null) { } @@ -87,7 +87,22 @@ public DiscriminatedInterfaceSerializer(IDiscriminatorConvention discriminatorCo /// interfaceType /// interfaceType public DiscriminatedInterfaceSerializer(IDiscriminatorConvention discriminatorConvention, IBsonSerializer interfaceSerializer) + : this(discriminatorConvention, interfaceSerializer, BsonSerializer.DefaultSerializationDomain) { + } + + /// + /// //TODO + /// + /// + /// + /// + /// + /// + public DiscriminatedInterfaceSerializer(IDiscriminatorConvention discriminatorConvention, IBsonSerializer interfaceSerializer, IBsonSerializationDomain domain) + { + interfaceSerializer ??= CreateInterfaceSerializer(domain); + var interfaceTypeInfo = typeof(TInterface).GetTypeInfo(); if (!interfaceTypeInfo.IsInterface) { @@ -97,7 +112,7 @@ public DiscriminatedInterfaceSerializer(IDiscriminatorConvention discriminatorCo _interfaceType = typeof(TInterface); _discriminatorConvention = discriminatorConvention ?? interfaceSerializer.GetDiscriminatorConvention(); - _objectSerializer = BsonSerializer.LookupSerializer(); + _objectSerializer = domain.LookupSerializer(); if (_objectSerializer is ObjectSerializer standardObjectSerializer) { _objectSerializer = standardObjectSerializer.WithDiscriminatorConvention(_discriminatorConvention); @@ -147,7 +162,7 @@ public override TInterface Deserialize(BsonDeserializationContext context, BsonD throw new FormatException(message); } - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); return (TInterface)serializer.Deserialize(context, args); } } diff --git a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedWrapperSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedWrapperSerializer.cs index d7d5be76596..e1d52bd9e0c 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedWrapperSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/DiscriminatedWrapperSerializer.cs @@ -74,7 +74,7 @@ public override TValue Deserialize(BsonDeserializationContext context, BsonDeser var bsonReader = context.Reader; var nominalType = args.NominalType; var actualType = _discriminatorConvention.GetActualType(bsonReader, nominalType); - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); TValue value = default(TValue); _helper.DeserializeMembers(context, (elementName, flag) => diff --git a/src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs index d020fd3895d..84f14ac3493 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/DynamicDocumentBaseSerializer.cs @@ -26,8 +26,8 @@ namespace MongoDB.Bson.Serialization.Serializers /// The dynamic type. public abstract class DynamicDocumentBaseSerializer : SerializerBase where T : class, IDynamicMetaObjectProvider { - // private static fields - private static readonly IBsonSerializer __objectSerializer = BsonSerializer.LookupSerializer(); + // private fields + private IBsonSerializer __objectSerializer; // constructors /// @@ -58,7 +58,7 @@ public override T Deserialize(BsonDeserializationContext context, BsonDeserializ while (bsonReader.ReadBsonType() != BsonType.EndOfDocument) { var name = bsonReader.ReadName(); - var value = __objectSerializer.Deserialize(dynamicContext); + var value = GetObjectSerializer(context.SerializationDomain).Deserialize(dynamicContext); SetValueForMember(document, name, value); } bsonReader.ReadEndDocument(); @@ -101,7 +101,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati if (TryGetValueForMember(value, memberName, out memberValue)) { bsonWriter.WriteName(memberName); - __objectSerializer.Serialize(dynamicContext, memberValue); + GetObjectSerializer(context.SerializationDomain).Serialize(dynamicContext, memberValue); } } bsonWriter.WriteEndDocument(); @@ -142,5 +142,11 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati /// The value. /// true if the member should be serialized; otherwise false. protected abstract bool TryGetValueForMember(T document, string memberName, out object value); + + //private methods + private IBsonSerializer GetObjectSerializer(IBsonSerializationDomain domain) + { + return __objectSerializer ??= domain.LookupSerializer(); + } } } diff --git a/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs b/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs index 5d810b01861..32bc8a95663 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/EnumerableSerializerBase.cs @@ -35,7 +35,7 @@ public abstract class EnumerableSerializerBase : SerializerBase, /// Initializes a new instance of the class. /// protected EnumerableSerializerBase() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -234,7 +234,7 @@ public abstract class EnumerableSerializerBase : SerializerBase class. /// protected EnumerableSerializerBase() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/ExpandoObjectSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ExpandoObjectSerializer.cs index 7160bc11288..4491cfdfe36 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/ExpandoObjectSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/ExpandoObjectSerializer.cs @@ -35,8 +35,17 @@ public sealed class ExpandoObjectSerializer : DynamicDocumentBaseSerializer class. /// public ExpandoObjectSerializer() + :this(BsonSerializer.DefaultSerializationDomain.SerializerRegistry) { - _listSerializer = BsonSerializer.LookupSerializer>(); + } + + /// + /// //TODO + /// + /// + public ExpandoObjectSerializer(IBsonSerializerRegistry serializerRegistry) + { + _listSerializer = serializerRegistry.GetSerializer>(); } /// diff --git a/src/MongoDB.Bson/Serialization/Serializers/IEnumerableDeserializingAsCollectionSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/IEnumerableDeserializingAsCollectionSerializer.cs index a5ce3afa28d..e7f705259a6 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/IEnumerableDeserializingAsCollectionSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/IEnumerableDeserializingAsCollectionSerializer.cs @@ -50,7 +50,7 @@ private static void EnsureTIEnumerableIsAnInterface() /// Initializes a new instance of the IEnumerableDeserializingAsCollectionSerializer class. /// public IEnumerableDeserializingAsCollectionSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs index fc8cdf81829..988127b8fa4 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/ImpliedImplementationInterfaceSerializer.cs @@ -52,7 +52,7 @@ public sealed class ImpliedImplementationInterfaceSerializer class. /// public ImpliedImplementationInterfaceSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -279,7 +279,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati } else { - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); serializer.Serialize(context, value); } } diff --git a/src/MongoDB.Bson/Serialization/Serializers/KeyValuePairSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/KeyValuePairSerializer.cs index ea1f59ac971..9f9ccb66051 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/KeyValuePairSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/KeyValuePairSerializer.cs @@ -66,7 +66,7 @@ public KeyValuePairSerializer() /// /// The representation. public KeyValuePairSerializer(BsonType representation) - : this(representation, BsonSerializer.SerializerRegistry) + : this(representation, BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/NullableSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/NullableSerializer.cs index 8740bdd3a9b..f55c2dd9e06 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/NullableSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/NullableSerializer.cs @@ -64,7 +64,7 @@ public sealed class NullableSerializer : /// Initializes a new instance of the class. /// public NullableSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs index 36e4403718c..8afcac9d601 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/ObjectSerializer.cs @@ -67,7 +67,7 @@ public sealed class ObjectSerializer : ClassSerializerBase, IHasDiscrimi /// Initializes a new instance of the class. /// public ObjectSerializer() - : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object))) + : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object))) //TODO We can keep this as is { } @@ -96,7 +96,7 @@ public ObjectSerializer(IDiscriminatorConvention discriminatorConvention, GuidRe /// /// A delegate that determines what types are allowed. public ObjectSerializer(Func allowedTypes) - : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object)), allowedTypes) + : this(BsonSerializer.LookupDiscriminatorConvention(typeof(object)), allowedTypes) //TODO We can keep this as is { } @@ -389,7 +389,7 @@ private object DeserializeDiscriminatedValue(BsonDeserializationContext context, } else { - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); var polymorphicSerializer = serializer as IBsonPolymorphicSerializer; if (polymorphicSerializer != null && polymorphicSerializer.IsDiscriminatorCompatibleWithObjectSerializer) { @@ -438,7 +438,7 @@ private void SerializeDiscriminatedValue(BsonSerializationContext context, BsonS throw new BsonSerializationException($"Type {actualType.FullName} is not configured as a type that is allowed to be serialized for this instance of ObjectSerializer."); } - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); var polymorphicSerializer = serializer as IBsonPolymorphicSerializer; if (polymorphicSerializer != null && polymorphicSerializer.IsDiscriminatorCompatibleWithObjectSerializer) diff --git a/src/MongoDB.Bson/Serialization/Serializers/SerializeAsNominalTypeSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/SerializeAsNominalTypeSerializer.cs index 065ae3873f9..068496a8ad0 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/SerializeAsNominalTypeSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/SerializeAsNominalTypeSerializer.cs @@ -32,7 +32,7 @@ public sealed class SerializeAsNominalTypeSerializer /// Initializes a new instance of the class. /// public SerializeAsNominalTypeSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/ThreeDimensionalArraySerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/ThreeDimensionalArraySerializer.cs index c2aaf3998fb..96c2221e071 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/ThreeDimensionalArraySerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/ThreeDimensionalArraySerializer.cs @@ -34,7 +34,7 @@ public sealed class ThreeDimensionalArraySerializer : /// Initializes a new instance of the class. /// public ThreeDimensionalArraySerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/TupleSerializers.cs b/src/MongoDB.Bson/Serialization/Serializers/TupleSerializers.cs index a5b1e5f290a..140f40c9259 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/TupleSerializers.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/TupleSerializers.cs @@ -114,7 +114,7 @@ public sealed class TupleSerializer : SealedClassSerializerBase>, /// Initializes a new instance of the class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -208,7 +208,7 @@ public sealed class TupleSerializer : SealedClassSerializerBase class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -318,7 +318,7 @@ public sealed class TupleSerializer : SealedClassSerializerBase class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -443,7 +443,7 @@ public sealed class TupleSerializer : SealedClassSerializerBase< /// Initializes a new instance of the class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -585,7 +585,7 @@ public sealed class TupleSerializer : SealedClassSerializerB /// Initializes a new instance of the class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -743,7 +743,7 @@ public sealed class TupleSerializer : SealedClassSeriali /// Initializes a new instance of the class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -917,7 +917,7 @@ public sealed class TupleSerializer : SealedClassSer /// Initializes a new instance of the class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -1107,7 +1107,7 @@ public sealed class TupleSerializer : SealedC /// Initializes a new instance of the class. /// public TupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/TwoDimensionalArraySerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/TwoDimensionalArraySerializer.cs index afe701dd1c3..a23618a0780 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/TwoDimensionalArraySerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/TwoDimensionalArraySerializer.cs @@ -34,7 +34,7 @@ public sealed class TwoDimensionalArraySerializer : /// Initializes a new instance of the class. /// public TwoDimensionalArraySerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Bson/Serialization/Serializers/UndiscriminatedActualTypeSerializer.cs b/src/MongoDB.Bson/Serialization/Serializers/UndiscriminatedActualTypeSerializer.cs index 1587a979163..240ac575b1b 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/UndiscriminatedActualTypeSerializer.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/UndiscriminatedActualTypeSerializer.cs @@ -62,7 +62,7 @@ public override void Serialize(BsonSerializationContext context, BsonSerializati else { var actualType = value.GetType(); - var serializer = BsonSerializer.LookupSerializer(actualType); + var serializer = context.SerializationDomain.LookupSerializer(actualType); args.NominalType = actualType; serializer.Serialize(context, args, value); } diff --git a/src/MongoDB.Bson/Serialization/Serializers/ValueTupleSerializers.cs b/src/MongoDB.Bson/Serialization/Serializers/ValueTupleSerializers.cs index d0f52484e58..ba90fc15104 100644 --- a/src/MongoDB.Bson/Serialization/Serializers/ValueTupleSerializers.cs +++ b/src/MongoDB.Bson/Serialization/Serializers/ValueTupleSerializers.cs @@ -75,7 +75,7 @@ public sealed class ValueTupleSerializer : StructSerializerBase class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -193,7 +193,7 @@ public sealed class ValueTupleSerializer : StructSerializerBase class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -329,7 +329,7 @@ public sealed class ValueTupleSerializer : StructSerializerBase class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -483,7 +483,7 @@ public sealed class ValueTupleSerializer : StructSerializerBase< /// Initializes a new instance of the class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -655,7 +655,7 @@ public sealed class ValueTupleSerializer : StructSerializerB /// Initializes a new instance of the class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -845,7 +845,7 @@ public sealed class ValueTupleSerializer : StructSeriali /// Initializes a new instance of the class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -1053,7 +1053,7 @@ public sealed class ValueTupleSerializer : StructSer /// Initializes a new instance of the class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } @@ -1280,7 +1280,7 @@ public sealed class ValueTupleSerializer : St /// Initializes a new instance of the class. /// public ValueTupleSerializer() - : this(BsonSerializer.SerializerRegistry) + : this(BsonSerializer.SerializerRegistry) //TODO We can keep this as is { } diff --git a/src/MongoDB.Driver/AggregateExpressionDefinition.cs b/src/MongoDB.Driver/AggregateExpressionDefinition.cs index 85ae3f37e6a..eb898f917f0 100644 --- a/src/MongoDB.Driver/AggregateExpressionDefinition.cs +++ b/src/MongoDB.Driver/AggregateExpressionDefinition.cs @@ -140,7 +140,7 @@ internal ExpressionAggregateExpressionDefinition( public override BsonValue Render(RenderArgs args) { var contextData = _contextData?.With("SerializerRegistry", args.SerializerRegistry); - return LinqProviderAdapter.TranslateExpressionToAggregateExpression(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions, contextData); + return LinqProviderAdapter.TranslateExpressionToAggregateExpression(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions, contextData); } } diff --git a/src/MongoDB.Driver/Core/Operations/CursorBatchDeserializationHelper.cs b/src/MongoDB.Driver/Core/Operations/CursorBatchDeserializationHelper.cs index 27ff4252dc0..6fa3bd744a3 100644 --- a/src/MongoDB.Driver/Core/Operations/CursorBatchDeserializationHelper.cs +++ b/src/MongoDB.Driver/Core/Operations/CursorBatchDeserializationHelper.cs @@ -44,6 +44,8 @@ public static List DeserializeBatch(RawBsonArray batch, IB if (messageEncoderSettings != null) { readerSettings.Encoding = messageEncoderSettings.GetOrDefault(MessageEncoderSettingsName.ReadEncoding, Utf8Encodings.Strict); + readerSettings.SerializationDomain = + messageEncoderSettings.GetOrDefault(MessageEncoderSettingsName.SerializationDomain, null); }; using (var stream = new ByteBufferStream(batch.Slice, ownsBuffer: false)) diff --git a/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBase.cs b/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBase.cs index e8e6e58b61d..8627e586689 100644 --- a/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBase.cs +++ b/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBase.cs @@ -17,6 +17,7 @@ using System.Text; using MongoDB.Bson; using MongoDB.Bson.IO; +using MongoDB.Bson.Serialization; using MongoDB.Driver.Core.Misc; namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.BinaryEncoders @@ -102,6 +103,8 @@ public BsonBinaryWriter CreateBinaryWriter() writerSettings.Encoding = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.WriteEncoding, writerSettings.Encoding); writerSettings.MaxDocumentSize = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.MaxDocumentSize, writerSettings.MaxDocumentSize); writerSettings.MaxSerializationDepth = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.MaxSerializationDepth, writerSettings.MaxSerializationDepth); + writerSettings.SerializationDomain = + _encoderSettings.GetOrDefault(MessageEncoderSettingsName.SerializationDomain, null); //TODO Using null here to find issues faster } return new BsonBinaryWriter(_stream, writerSettings); } diff --git a/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/JsonEncoders/MessageJsonEncoderBase.cs b/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/JsonEncoders/MessageJsonEncoderBase.cs index 0a54dc96a30..94841a2a2ec 100644 --- a/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/JsonEncoders/MessageJsonEncoderBase.cs +++ b/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/JsonEncoders/MessageJsonEncoderBase.cs @@ -17,6 +17,7 @@ using System.IO; using MongoDB.Bson; using MongoDB.Bson.IO; +using MongoDB.Bson.Serialization; using MongoDB.Driver.Core.Misc; namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.JsonEncoders @@ -65,6 +66,8 @@ public JsonWriter CreateJsonWriter() writerSettings.NewLineChars = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.NewLineChars, ""); writerSettings.OutputMode = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.OutputMode, JsonOutputMode.Shell); writerSettings.ShellVersion = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.ShellVersion, new Version(2, 6, 0)); + writerSettings.SerializationDomain = + _encoderSettings.GetOrDefault(MessageEncoderSettingsName.SerializationDomain, null); //TODO Using null here to find issues faster } return new JsonWriter(_textWriter, writerSettings); } diff --git a/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs b/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs index 30c2e33e2fd..55f3caff990 100644 --- a/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs +++ b/src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs @@ -41,6 +41,7 @@ internal static class MessageEncoderSettingsName public const string ShellVersion = nameof(ShellVersion); // other encoders (if any) might use additional settings + public const string SerializationDomain = nameof(SerializationDomain); } internal sealed class MessageEncoderSettings : IEnumerable> diff --git a/src/MongoDB.Driver/FieldDefinition.cs b/src/MongoDB.Driver/FieldDefinition.cs index ccc7327cc3d..9affbd0d5ce 100644 --- a/src/MongoDB.Driver/FieldDefinition.cs +++ b/src/MongoDB.Driver/FieldDefinition.cs @@ -242,7 +242,7 @@ public LambdaExpression Expression /// public override RenderedFieldDefinition Render(RenderArgs args) { - return LinqProviderAdapter.TranslateExpressionToField(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions); + return LinqProviderAdapter.TranslateExpressionToField(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions); } } @@ -275,7 +275,7 @@ public Expression> Expression /// public override RenderedFieldDefinition Render(RenderArgs args) { - return LinqProviderAdapter.TranslateExpressionToField(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions, args.PathRenderArgs.AllowScalarValueForArray); + return LinqProviderAdapter.TranslateExpressionToField(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions, args.PathRenderArgs.AllowScalarValueForArray); } } diff --git a/src/MongoDB.Driver/FilterDefinition.cs b/src/MongoDB.Driver/FilterDefinition.cs index a7e727110af..12e03969c72 100644 --- a/src/MongoDB.Driver/FilterDefinition.cs +++ b/src/MongoDB.Driver/FilterDefinition.cs @@ -205,11 +205,11 @@ public override BsonDocument Render(RenderArgs args) { if (args.RenderForElemMatch) { - return LinqProviderAdapter.TranslateExpressionToElemMatchFilter(_expression, elementSerializer: args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions); + return LinqProviderAdapter.TranslateExpressionToElemMatchFilter(_expression, elementSerializer: args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions); } else { - return LinqProviderAdapter.TranslateExpressionToFilter(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions); + return LinqProviderAdapter.TranslateExpressionToFilter(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions); } } } diff --git a/src/MongoDB.Driver/IInheritableMongoClientSettings.cs b/src/MongoDB.Driver/IInheritableMongoClientSettings.cs index 04eb99990f3..797141137d4 100644 --- a/src/MongoDB.Driver/IInheritableMongoClientSettings.cs +++ b/src/MongoDB.Driver/IInheritableMongoClientSettings.cs @@ -16,6 +16,7 @@ using System; using System.Text; using MongoDB.Bson; +using MongoDB.Bson.Serialization; namespace MongoDB.Driver { @@ -24,6 +25,7 @@ internal interface IInheritableMongoClientSettings ReadConcern ReadConcern { get; } UTF8Encoding ReadEncoding { get; } ReadPreference ReadPreference { get; } + IBsonSerializationDomain SerializationDomain { get; } WriteConcern WriteConcern { get; } UTF8Encoding WriteEncoding { get; } } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/GroupingWithOutputExpressionStageDefinitions.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/GroupingWithOutputExpressionStageDefinitions.cs index 1e40aa1347f..d285262c25f 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/GroupingWithOutputExpressionStageDefinitions.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/GroupingWithOutputExpressionStageDefinitions.cs @@ -43,8 +43,8 @@ public override RenderedPipelineStageDefinition Render(RenderArgs x.Render().AsBsonDocument); @@ -53,18 +53,18 @@ public override RenderedPipelineStageDefinition Render(RenderArgs inputSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, out IBsonSerializer groupingOutputSerializer); private AstStage RenderProjectStage( IBsonSerializer inputSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, out IBsonSerializer outputSerializer) { var partiallyEvaluatedOutput = (Expression>)PartialEvaluator.EvaluatePartially(_output); - var context = TranslationContext.Create(partiallyEvaluatedOutput, translationOptions); + var context = TranslationContext.Create(partiallyEvaluatedOutput, translationOptions, serializationDomain); var outputTranslation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, partiallyEvaluatedOutput, inputSerializer, asRoot: true); var (projectStage, projectSerializer) = ProjectionHelper.CreateProjectStage(outputTranslation); outputSerializer = (IBsonSerializer)projectSerializer; @@ -101,12 +101,12 @@ public BucketWithOutputExpressionStageDefinition( protected override AstStage RenderGroupingStage( IBsonSerializer inputSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, out IBsonSerializer> groupingOutputSerializer) { var partiallyEvaluatedGroupBy = (Expression>)PartialEvaluator.EvaluatePartially(_groupBy); - var context = TranslationContext.Create(partiallyEvaluatedGroupBy, translationOptions); + var context = TranslationContext.Create(partiallyEvaluatedGroupBy, translationOptions, serializationDomain); var groupByTranslation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, partiallyEvaluatedGroupBy, inputSerializer, asRoot: true); var valueSerializer = (IBsonSerializer)groupByTranslation.Serializer; @@ -145,12 +145,12 @@ public BucketAutoWithOutputExpressionStageDefinition( protected override AstStage RenderGroupingStage( IBsonSerializer inputSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, out IBsonSerializer, TInput>> groupingOutputSerializer) { var partiallyEvaluatedGroupBy = (Expression>)PartialEvaluator.EvaluatePartially(_groupBy); - var context = TranslationContext.Create(partiallyEvaluatedGroupBy, translationOptions); + var context = TranslationContext.Create(partiallyEvaluatedGroupBy, translationOptions, serializationDomain); var groupByTranslation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, partiallyEvaluatedGroupBy, inputSerializer, asRoot: true); var valueSerializer = (IBsonSerializer)groupByTranslation.Serializer; @@ -183,12 +183,12 @@ public GroupWithOutputExpressionStageDefinition( protected override AstStage RenderGroupingStage( IBsonSerializer inputSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, out IBsonSerializer> groupingOutputSerializer) { var partiallyEvaluatedGroupBy = (Expression>)PartialEvaluator.EvaluatePartially(_groupBy); - var context = TranslationContext.Create(partiallyEvaluatedGroupBy, translationOptions); + var context = TranslationContext.Create(partiallyEvaluatedGroupBy, translationOptions, serializationDomain); var groupByTranslation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, partiallyEvaluatedGroupBy, inputSerializer, asRoot: true); var pushElements = AstExpression.AccumulatorField("_elements", AstUnaryAccumulatorOperator.Push, AstExpression.Var("ROOT", isCurrent: true)); var groupBySerializer = (IBsonSerializer)groupByTranslation.Serializer; diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/ISetWindowFieldsPartitionSerializer.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/ISetWindowFieldsPartitionSerializer.cs index 2be9f49a1b3..69ccc07e370 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/ISetWindowFieldsPartitionSerializer.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Serializers/ISetWindowFieldsPartitionSerializer.cs @@ -61,13 +61,11 @@ public void Serialize(BsonSerializationContext context, BsonSerializationArgs ar throw new InvalidOperationException("This serializer is not intended to be used."); } - public void Serialize(BsonSerializationContext context, BsonSerializationArgs args, object value) { throw new InvalidOperationException("This serializer is not intended to be used."); } - object IBsonSerializer.Deserialize(BsonDeserializationContext context, BsonDeserializationArgs args) { throw new InvalidOperationException("This serializer is not intended to be used."); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ArrayLengthExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ArrayLengthExpressionToAggregationExpressionTranslator.cs index 19ac1af57e4..dfb9e96eeb8 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ArrayLengthExpressionToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ArrayLengthExpressionToAggregationExpressionTranslator.cs @@ -28,7 +28,7 @@ public static AggregationExpression Translate(TranslationContext context, UnaryE var arrayExpression = expression.Operand; var arrayTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, arrayExpression); var ast = AstExpression.Size(arrayTranslation.Ast); - var serializer = BsonSerializer.LookupSerializer(expression.Type); + var serializer = context.SerializationDomain.LookupSerializer(expression.Type); return new AggregationExpression(expression, ast, serializer); } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConstantExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConstantExpressionToAggregationExpressionTranslator.cs index d4c74a22b09..b7e4daf8b0e 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConstantExpressionToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConstantExpressionToAggregationExpressionTranslator.cs @@ -23,10 +23,10 @@ namespace MongoDB.Driver.Linq.Linq3Implementation.Translators.ExpressionToAggreg { internal static class ConstantExpressionToAggregationExpressionTranslator { - public static AggregationExpression Translate(ConstantExpression constantExpression) + public static AggregationExpression Translate(TranslationContext context, ConstantExpression constantExpression) { var constantType = constantExpression.Type; - var constantSerializer = StandardSerializers.TryGetSerializer(constantType, out var serializer) ? serializer : BsonSerializer.LookupSerializer(constantType); + var constantSerializer = StandardSerializers.TryGetSerializer(constantType, out var serializer) ? serializer : context.SerializationDomain.LookupSerializer(constantType); return Translate(constantExpression, constantSerializer); } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConvertExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConvertExpressionToAggregationExpressionTranslator.cs index f4517ab8135..c485a7fc53b 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConvertExpressionToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ConvertExpressionToAggregationExpressionTranslator.cs @@ -44,13 +44,13 @@ sourceExpression is UnaryExpression unarySourceExpression && } var sourceTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, sourceExpression); - return Translate(expression, sourceType, targetType, sourceTranslation); + return Translate(context, expression, sourceType, targetType, sourceTranslation); } throw new ExpressionNotSupportedException(expression); } - private static AggregationExpression Translate(UnaryExpression expression, Type sourceType, Type targetType, AggregationExpression sourceTranslation) + private static AggregationExpression Translate(TranslationContext context, UnaryExpression expression, Type sourceType, Type targetType, AggregationExpression sourceTranslation) { if (targetType == sourceType) { @@ -60,12 +60,12 @@ private static AggregationExpression Translate(UnaryExpression expression, Type // from Nullable must be handled before to Nullable if (IsConvertFromNullableType(sourceType)) { - return TranslateConvertFromNullableType(expression, sourceType, targetType, sourceTranslation); + return TranslateConvertFromNullableType(context, expression, sourceType, targetType, sourceTranslation); } if (IsConvertToNullableType(targetType)) { - return TranslateConvertToNullableType(expression, sourceType, targetType, sourceTranslation); + return TranslateConvertToNullableType(context, expression, sourceType, targetType, sourceTranslation); } // from here on we know there are no longer any Nullable types involved @@ -97,7 +97,7 @@ private static AggregationExpression Translate(UnaryExpression expression, Type if (IsConvertToDerivedType(sourceType, targetType)) { - return TranslateConvertToDerivedType(expression, targetType, sourceTranslation); + return TranslateConvertToDerivedType(context, expression, targetType, sourceTranslation); } var ast = sourceTranslation.Ast; @@ -177,10 +177,9 @@ private static AggregationExpression TranslateConvertToBaseType(UnaryExpression return new AggregationExpression(expression, sourceTranslation.Ast, downcastingSerializer); } - private static AggregationExpression TranslateConvertToDerivedType(UnaryExpression expression, Type targetType, AggregationExpression sourceTranslation) + private static AggregationExpression TranslateConvertToDerivedType(TranslationContext context, UnaryExpression expression, Type targetType, AggregationExpression sourceTranslation) { - var serializer = BsonSerializer.LookupSerializer(targetType); - + var serializer = context.SerializationDomain.LookupSerializer(targetType); return new AggregationExpression(expression, sourceTranslation.Ast, serializer); } @@ -218,7 +217,7 @@ private static AggregationExpression TranslateConvertEnumToUnderlyingType(UnaryE return new AggregationExpression(expression, sourceTranslation.Ast, targetSerializer); } - private static AggregationExpression TranslateConvertFromNullableType(UnaryExpression expression, Type sourceType, Type targetType, AggregationExpression sourceTranslation) + private static AggregationExpression TranslateConvertFromNullableType(TranslationContext context, UnaryExpression expression, Type sourceType, Type targetType, AggregationExpression sourceTranslation) { if (sourceType.IsNullable(out var sourceValueType)) { @@ -226,7 +225,7 @@ private static AggregationExpression TranslateConvertFromNullableType(UnaryExpre var sourceNullableSerializer = (INullableSerializer)sourceTranslation.Serializer; var sourceValueSerializer = sourceNullableSerializer.ValueSerializer; var sourceValueAggregationExpression = new AggregationExpression(expression.Operand, sourceAst, sourceValueSerializer); - var convertTranslation = Translate(expression, sourceValueType, targetType, sourceValueAggregationExpression); + var convertTranslation = Translate(context, expression, sourceValueType, targetType, sourceValueAggregationExpression); // note: we would have liked to throw a query execution error here if the value is null and the target type is not nullable but there is no way to do that in MQL // so we just return null instead and the user must check for null themselves if they want to define what happens when the value is null @@ -242,7 +241,7 @@ private static AggregationExpression TranslateConvertFromNullableType(UnaryExpre throw new ExpressionNotSupportedException(expression, because: "sourceType is not nullable"); } - private static AggregationExpression TranslateConvertToNullableType(UnaryExpression expression, Type sourceType, Type targetType, AggregationExpression sourceTranslation) + private static AggregationExpression TranslateConvertToNullableType(TranslationContext context, UnaryExpression expression, Type sourceType, Type targetType, AggregationExpression sourceTranslation) { if (sourceType.IsNullable()) { @@ -252,7 +251,7 @@ private static AggregationExpression TranslateConvertToNullableType(UnaryExpress if (targetType.IsNullable(out var targetValueType)) { - var convertTranslation = Translate(expression, sourceType, targetValueType, sourceTranslation); + var convertTranslation = Translate(context, expression, sourceType, targetValueType, sourceTranslation); var nullableSerializer = NullableSerializer.Create(convertTranslation.Serializer); return new AggregationExpression(expression, convertTranslation.Ast, nullableSerializer); } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ExpressionToAggregationExpressionTranslator.cs index 81a4dfc6ae7..a88ffb55ea1 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ExpressionToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/ExpressionToAggregationExpressionTranslator.cs @@ -67,7 +67,7 @@ public static AggregationExpression Translate(TranslationContext context, Expres case ExpressionType.Conditional: return ConditionalExpressionToAggregationExpressionTranslator.Translate(context, (ConditionalExpression)expression); case ExpressionType.Constant: - return ConstantExpressionToAggregationExpressionTranslator.Translate((ConstantExpression)expression); + return ConstantExpressionToAggregationExpressionTranslator.Translate(context, (ConstantExpression)expression); case ExpressionType.Index: return IndexExpressionToAggregationExpressionTranslator.Translate(context, (IndexExpression)expression); case ExpressionType.ListInit: diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberInitExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberInitExpressionToAggregationExpressionTranslator.cs index e1a8cd5f399..6f91e0c2bca 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberInitExpressionToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MemberInitExpressionToAggregationExpressionTranslator.cs @@ -70,7 +70,7 @@ public static AggregationExpression Translate( var constructorArgumentExpression = constructorArguments[i]; var constructorArgumentTranslation = ExpressionToAggregationExpressionTranslator.Translate(context, constructorArgumentExpression); var constructorArgumentType = constructorArgumentExpression.Type; - var constructorArgumentSerializer = constructorArgumentTranslation.Serializer ?? BsonSerializer.LookupSerializer(constructorArgumentType); + var constructorArgumentSerializer = constructorArgumentTranslation.Serializer ?? context.SerializationDomain.LookupSerializer(constructorArgumentType); var memberMap = EnsureMemberMap(expression, classMap, creatorMapParameter); EnsureDefaultValue(memberMap); var memberSerializer = CoerceSourceSerializerToMemberSerializer(memberMap, constructorArgumentSerializer); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/CeilingMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/CeilingMethodToAggregationExpressionTranslator.cs index 6f625425353..12865d5f691 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/CeilingMethodToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/CeilingMethodToAggregationExpressionTranslator.cs @@ -36,7 +36,7 @@ public static AggregationExpression Translate(TranslationContext context, Method var argumentAst = ConvertHelper.RemoveWideningConvert(argumentTranslation); var ast = AstExpression.Ceil(argumentAst); - var serializer = BsonSerializer.LookupSerializer(expression.Type); + var serializer = context.SerializationDomain.LookupSerializer(expression.Type); return new AggregationExpression(expression, ast, serializer); } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ConstantMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ConstantMethodToAggregationExpressionTranslator.cs index cc3aeea79e3..ae3ddb0a9b8 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ConstantMethodToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ConstantMethodToAggregationExpressionTranslator.cs @@ -40,7 +40,7 @@ public static AggregationExpression Translate(TranslationContext context, Method { var representationExpression = arguments[1]; var representation = representationExpression.GetConstantValue(expression); - var registeredSerializer = BsonSerializer.LookupSerializer(valueExpression.Type); + var registeredSerializer = context.SerializationDomain.LookupSerializer(valueExpression.Type); if (registeredSerializer is IRepresentationConfigurable representationConfigurableSerializer) { serializer = representationConfigurableSerializer.WithRepresentation(representation); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/FloorMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/FloorMethodToAggregationExpressionTranslator.cs index bb22d987ba4..6aac6a7f949 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/FloorMethodToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/FloorMethodToAggregationExpressionTranslator.cs @@ -36,7 +36,7 @@ public static AggregationExpression Translate(TranslationContext context, Method var argumentAst = ConvertHelper.RemoveWideningConvert(argumentTranslation); var ast = AstExpression.Floor(argumentAst); - var serializer = BsonSerializer.LookupSerializer(expression.Type); + var serializer = context.SerializationDomain.LookupSerializer(expression.Type); return new AggregationExpression(expression, ast, serializer); } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs index c9271192990..9aef29edfee 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/PickMethodToAggregationExpressionTranslator.cs @@ -114,7 +114,7 @@ public static AggregationExpression Translate(TranslationContext context, Method { var sortByExpression = arguments[1]; var sortByDefinition = GetSortByDefinition(sortByExpression, expression); - sortBy = TranslateSortByDefinition(expression, sortByExpression, sortByDefinition, itemSerializer, context.TranslationOptions); + sortBy = TranslateSortByDefinition(context, expression, sortByExpression, sortByDefinition, itemSerializer); } var selectorLambda = (LambdaExpression)GetSelectorArgument(method, arguments); @@ -281,27 +281,27 @@ getFieldExpression.FieldName is AstConstantExpression constantFieldName && } private static AstSortFields TranslateSortByDefinition( + TranslationContext context, Expression expression, Expression sortByExpression, object sortByDefinition, - IBsonSerializer documentSerializer, - ExpressionTranslationOptions translationOptions) + IBsonSerializer documentSerializer) { var methodInfoDefinition = typeof(PickMethodToAggregationExpressionTranslator).GetMethod(nameof(TranslateSortByDefinitionGeneric), BindingFlags.Static | BindingFlags.NonPublic); var documentType = documentSerializer.ValueType; var methodInfo = methodInfoDefinition.MakeGenericMethod(documentType); - return (AstSortFields)methodInfo.Invoke(null, new object[] { expression, sortByExpression, sortByDefinition, documentSerializer, translationOptions }); + return (AstSortFields)methodInfo.Invoke(null, new object[] { context, expression, sortByExpression, sortByDefinition, documentSerializer }); } private static AstSortFields TranslateSortByDefinitionGeneric( + TranslationContext context, Expression expression, Expression sortByExpression, SortDefinition sortByDefinition, - IBsonSerializer documentSerializer, - ExpressionTranslationOptions translationOptions) + IBsonSerializer documentSerializer) { - var serializerRegistry = BsonSerializer.SerializerRegistry; - var sortDocument = sortByDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: translationOptions)); + var serializerRegistry = context.SerializationDomain.SerializerRegistry; + var sortDocument = sortByDefinition.Render(new(documentSerializer, serializerRegistry, translationOptions: context.TranslationOptions)); var fields = new List(); foreach (var element in sortDocument) { diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/StandardDeviationMethodsToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/StandardDeviationMethodsToAggregationExpressionTranslator.cs index 74999cf8ad7..b23a9c7c514 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/StandardDeviationMethodsToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/StandardDeviationMethodsToAggregationExpressionTranslator.cs @@ -47,12 +47,12 @@ public static AggregationExpression Translate(TranslationContext context, Method input: sourceTranslation.Ast, @as: selectorParameterSymbol.Var, @in: selectorTranslation.Ast); - var selectorResultSerializer = BsonSerializer.LookupSerializer(selectorLambda.ReturnType); + var selectorResultSerializer = context.SerializationDomain.LookupSerializer(selectorLambda.ReturnType); sourceTranslation = new AggregationExpression(selectorLambda, selectorAst, selectorResultSerializer); } var ast = AstExpression.StdDev(stddevOperator, sourceTranslation.Ast); - var serializer = BsonSerializer.LookupSerializer(expression.Type); + var serializer = context.SerializationDomain.LookupSerializer(expression.Type); return new AggregationExpression(expression, ast, serializer); } } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs index 43606b5c3ac..62c5fb432e3 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/WindowMethodToAggregationExpressionTranslator.cs @@ -281,7 +281,7 @@ public static AggregationExpression Translate(TranslationContext context, Method { var @operator = GetNullaryWindowOperator(method); var ast = AstExpression.NullaryWindowExpression(@operator, window); - var serializer = BsonSerializer.LookupSerializer(method.ReturnType); // TODO: use correct serializer + var serializer = context.SerializationDomain.LookupSerializer(method.ReturnType); // TODO: use correct serializer return new AggregationExpression(expression, ast, serializer); } @@ -296,7 +296,7 @@ public static AggregationExpression Translate(TranslationContext context, Method ThrowIfSelectorTranslationIsNull(selectorTranslation); var @operator = GetUnaryWindowOperator(method); var ast = AstExpression.UnaryWindowExpression(@operator, selectorTranslation.Ast, window); - var serializer = BsonSerializer.LookupSerializer(method.ReturnType); // TODO: use correct serializer + var serializer = context.SerializationDomain.LookupSerializer(method.ReturnType); // TODO: use correct serializer return new AggregationExpression(expression, ast, serializer); } @@ -309,7 +309,7 @@ public static AggregationExpression Translate(TranslationContext context, Method var @operator = GetBinaryWindowOperator(method); var ast = AstExpression.BinaryWindowExpression(@operator, selector1Translation.Ast, selector2Translation.Ast, window); - var serializer = BsonSerializer.LookupSerializer(method.ReturnType); // TODO: use correct serializer + var serializer = context.SerializationDomain.LookupSerializer(method.ReturnType); // TODO: use correct serializer return new AggregationExpression(expression, ast, serializer); } @@ -324,7 +324,7 @@ public static AggregationExpression Translate(TranslationContext context, Method var @operator = GetDerivativeOrIntegralWindowOperator(method); var ast = AstExpression.DerivativeOrIntegralWindowExpression(@operator, selectorTranslation.Ast, unit, window); - var serializer = BsonSerializer.LookupSerializer(method.ReturnType); // TODO: use correct serializer + var serializer = context.SerializationDomain.LookupSerializer(method.ReturnType); // TODO: use correct serializer return new AggregationExpression(expression, ast, serializer); } @@ -335,7 +335,7 @@ public static AggregationExpression Translate(TranslationContext context, Method var weighting = weightingExpression.GetConstantValue(expression); var ast = AstExpression.ExponentialMovingAverageWindowExpression(selectorTranslation.Ast, weighting, window); - var serializer = BsonSerializer.LookupSerializer(method.ReturnType); // TODO: use correct serializer + var serializer = context.SerializationDomain.LookupSerializer(method.ReturnType); // TODO: use correct serializer return new AggregationExpression(expression, ast, serializer); } @@ -354,7 +354,7 @@ public static AggregationExpression Translate(TranslationContext context, Method } var ast = AstExpression.ShiftWindowExpression(selectorTranslation.Ast, by, defaultValue); - var serializer = BsonSerializer.LookupSerializer(method.ReturnType); // TODO: use correct serializer + var serializer = context.SerializationDomain.LookupSerializer(method.ReturnType); // TODO: use correct serializer return new AggregationExpression(expression, ast, serializer); } } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ZipMethodToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ZipMethodToAggregationExpressionTranslator.cs index d06f0d5ab0d..2e4d4c0ee7a 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ZipMethodToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/MethodTranslators/ZipMethodToAggregationExpressionTranslator.cs @@ -47,8 +47,8 @@ public static AggregationExpression Translate(TranslationContext context, Method var resultSelectorParameters = resultSelectorLambda.Parameters; var resultSelectorParameter1 = resultSelectorParameters[0]; var resultSelectorParameter2 = resultSelectorParameters[1]; - var resultSelectorSymbol1 = context.CreateSymbol(resultSelectorParameter1, BsonSerializer.LookupSerializer(resultSelectorParameter1.Type)); - var resultSelectorSymbol2 = context.CreateSymbol(resultSelectorParameter2, BsonSerializer.LookupSerializer(resultSelectorParameter2.Type)); + var resultSelectorSymbol1 = context.CreateSymbol(resultSelectorParameter1, context.SerializationDomain.LookupSerializer(resultSelectorParameter1.Type)); + var resultSelectorSymbol2 = context.CreateSymbol(resultSelectorParameter2, context.SerializationDomain.LookupSerializer(resultSelectorParameter2.Type)); var resultSelectorContext = context.WithSymbols(resultSelectorSymbol1, resultSelectorSymbol2); var resultSelectorTranslation = ExpressionToAggregationExpressionTranslator.Translate(resultSelectorContext, resultSelectorLambda.Body); var @as = AstExpression.Var("pair"); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/NewArrayInitExpressionToAggregationExpressionTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/NewArrayInitExpressionToAggregationExpressionTranslator.cs index c6d95c36a43..4933729443b 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/NewArrayInitExpressionToAggregationExpressionTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/NewArrayInitExpressionToAggregationExpressionTranslator.cs @@ -45,7 +45,7 @@ public static AggregationExpression Translate(TranslationContext context, NewArr var arrayType = expression.Type; var itemType = arrayType.GetElementType(); - itemSerializer ??= BsonSerializer.LookupSerializer(itemType); // if the array is empty itemSerializer will be null + itemSerializer ??= context.SerializationDomain.LookupSerializer(itemType); // if the array is empty itemSerializer will be null var arraySerializerType = typeof(ArraySerializer<>).MakeGenericType(itemType); var arraySerializer = (IBsonSerializer)Activator.CreateInstance(arraySerializerType, itemSerializer); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/ExpressionToExecutableQueryTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/ExpressionToExecutableQueryTranslator.cs index 29f929085d2..451eacb579e 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/ExpressionToExecutableQueryTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/ExpressionToExecutableQueryTranslator.cs @@ -31,7 +31,7 @@ public static ExecutableQuery> Translate TranslateScalar Translate(MongoQuer valueAst = AstExpression.GetField(root, "_v"); } var outputValueType = expression.GetResultType(); - var outputValueSerializer = BsonSerializer.LookupSerializer(outputValueType); + var outputValueSerializer = context.SerializationDomain.LookupSerializer(outputValueType); var outputWrappedValueSerializer = WrappedValueSerializer.Create("_v", outputValueSerializer); pipeline = pipeline.AddStages( diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/SumMethodToExecutableQueryTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/SumMethodToExecutableQueryTranslator.cs index 29f9b0efc5c..28f18bde7a7 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/SumMethodToExecutableQueryTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToExecutableQueryTranslators/SumMethodToExecutableQueryTranslator.cs @@ -136,7 +136,7 @@ public static ExecutableQuery Translate(MongoQuer } var outputValueType = expression.GetResultType(); - var outputValueSerializer = BsonSerializer.LookupSerializer(outputValueType); + var outputValueSerializer = context.SerializationDomain.LookupSerializer(outputValueType); var outputWrappedValueSerializer = WrappedValueSerializer.Create("_v", outputValueSerializer); pipeline = pipeline.AddStages( diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/AllOrAnyMethodToFilterTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/AllOrAnyMethodToFilterTranslator.cs index 17660c1eae1..74552fd165e 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/AllOrAnyMethodToFilterTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/AllOrAnyMethodToFilterTranslator.cs @@ -130,7 +130,7 @@ public static (TranslatedFilterField, AstFilter) Translate(TranslationContext co _ => throw new ExpressionNotSupportedException(sourceExpression, because: "OfType method is not supported with the configured discriminator convention") }; - var actualTypeSerializer = BsonSerializer.LookupSerializer(actualType); + var actualTypeSerializer = context.SerializationDomain.LookupSerializer(actualType); var enumerableActualTypeSerializer = IEnumerableSerializer.Create(actualTypeSerializer); var actualTypeSourceField = new TranslatedFilterField(fieldTranslation.Ast, enumerableActualTypeSerializer); var combinedFilter = AstFilter.Combine(sourceFilter, ofTypeFilter); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs index 61493819b50..dfdff712ed3 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/MethodTranslators/InjectMethodToFilterTranslator.cs @@ -46,7 +46,7 @@ public static AstFilter Translate(TranslationContext context, MethodCallExpressi var filterDefinitionType = filterDefinition.GetType(); // we KNOW it's a FilterDefinition because of the Inject method signature var documentType = filterDefinitionType.GetGenericArguments()[0]; - var serializerRegistry = BsonSerializer.SerializerRegistry; + var serializerRegistry = context.SerializationDomain.SerializerRegistry; var documentSerializer = serializerRegistry.GetSerializer(documentType); // TODO: is this the right serializer? var renderFilterMethod = __renderFilterMethodInfo.MakeGenericMethod(documentType); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ToFilterFieldTranslators/ConvertExpressionToFilterFieldTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ToFilterFieldTranslators/ConvertExpressionToFilterFieldTranslator.cs index a81c05fa84f..54a57b4ee73 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ToFilterFieldTranslators/ConvertExpressionToFilterFieldTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ToFilterFieldTranslators/ConvertExpressionToFilterFieldTranslator.cs @@ -66,7 +66,7 @@ public static TranslatedFilterField Translate(TranslationContext context, UnaryE if (IsConvertToDerivedType(fieldType, targetType)) { - return TranslateConvertToDerivedType(fieldTranslation, targetType); + return TranslateConvertToDerivedType(fieldTranslation, targetType, context.SerializationDomain); } } @@ -165,9 +165,9 @@ private static TranslatedFilterField TranslateConvertToBaseType(TranslatedFilter return new TranslatedFilterField(fieldTranslation.Ast, targetSerializer); } - private static TranslatedFilterField TranslateConvertToDerivedType(TranslatedFilterField fieldTranslation, Type targetType) + private static TranslatedFilterField TranslateConvertToDerivedType(TranslatedFilterField fieldTranslation, Type targetType, IBsonSerializationDomain serializationDomain) { - var targetSerializer = BsonSerializer.LookupSerializer(targetType); + var targetSerializer = serializationDomain.LookupSerializer(targetType); return new TranslatedFilterField(fieldTranslation.Ast, targetSerializer); } diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AppendStageMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AppendStageMethodToPipelineTranslator.cs index 69fe438ddce..53693b19350 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AppendStageMethodToPipelineTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AppendStageMethodToPipelineTranslator.cs @@ -39,7 +39,7 @@ public static TranslatedPipeline Translate(TranslationContext context, MethodCal var sourceSerializer = pipeline.OutputSerializer; var stageExpression = arguments[1]; - var renderedStage = TranslateStage(expression, stageExpression, sourceSerializer, BsonSerializer.SerializerRegistry, context.TranslationOptions); + var renderedStage = TranslateStage(expression, stageExpression, sourceSerializer, context.SerializationDomain.SerializerRegistry, context.TranslationOptions); var stage = AstStage.Universal(renderedStage.Document); var resultSerializerExpression = arguments[2]; diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AsMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AsMethodToPipelineTranslator.cs index 64c9916830a..2b818c7587c 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AsMethodToPipelineTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/AsMethodToPipelineTranslator.cs @@ -41,7 +41,7 @@ public static TranslatedPipeline Translate(TranslationContext context, MethodCal var resultSerializerExpression = arguments[1]; var resultSerializer = resultSerializerExpression.GetConstantValue(expression); var resultType = method.GetGenericArguments()[1]; - var outputSerializer = resultSerializer ?? BsonSerializer.LookupSerializer(resultType); + var outputSerializer = resultSerializer ?? context.SerializationDomain.LookupSerializer(resultType); pipeline = pipeline.AddStages(outputSerializer, newStages: Array.Empty()); return pipeline; diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/ConcatMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/ConcatMethodToPipelineTranslator.cs index a78b0e17f75..69d13ba82c8 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/ConcatMethodToPipelineTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/ConcatMethodToPipelineTranslator.cs @@ -44,7 +44,7 @@ secondProvider.CollectionNamespace is var secondCollectionNamespace && secondCollectionNamespace != null) { var secondCollectionName = secondCollectionNamespace.CollectionName; - var secondContext = TranslationContext.Create(secondQueryable.Expression, context.TranslationOptions); + var secondContext = TranslationContext.Create(secondQueryable.Expression, context.TranslationOptions, context.SerializationDomain); var secondPipeline = ExpressionToPipelineTranslator.Translate(secondContext, secondQueryable.Expression); if (secondPipeline.Ast.Stages.Count == 0) { diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/DocumentsMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/DocumentsMethodToPipelineTranslator.cs index 957f25c9829..db7fe9500c6 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/DocumentsMethodToPipelineTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/DocumentsMethodToPipelineTranslator.cs @@ -58,7 +58,7 @@ public static TranslatedPipeline Translate(TranslationContext context, MethodCal else { var documentType = method.GetGenericArguments()[0]; - documentSerializer = BsonSerializer.LookupSerializer(documentType); + documentSerializer = context.SerializationDomain.LookupSerializer(documentType); } var serializedDocuments = SerializationHelper.SerializeValues(documentSerializer, documents); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/LookupMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/LookupMethodToPipelineTranslator.cs index 183b00bf1c8..c1b318979ac 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/LookupMethodToPipelineTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/LookupMethodToPipelineTranslator.cs @@ -281,7 +281,7 @@ private static TranslatedPipeline TranslateDocumentsPipelineGeneric throw new ExpressionNotSupportedException(expression, because: "OfType is not supported with the configured discriminator convention") }; - var resultSerializer = BsonSerializer.LookupSerializer(actualType); + var resultSerializer = context.SerializationDomain.LookupSerializer(actualType); if (wrappedValueOutputSerializer != null) { resultSerializer = WrappedValueSerializer.Create(wrappedValueOutputSerializer.FieldName, resultSerializer); diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/UnionMethodToPipelineTranslator.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/UnionMethodToPipelineTranslator.cs index 1f84276818f..a215ab5b100 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/UnionMethodToPipelineTranslator.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToPipelineTranslators/UnionMethodToPipelineTranslator.cs @@ -46,7 +46,7 @@ secondProvider.CollectionNamespace is var secondCollectionNamespace && secondCollectionNamespace != null) { var secondCollectionName = secondCollectionNamespace.CollectionName; - var secondContext = TranslationContext.Create(secondQueryable.Expression, context.TranslationOptions); + var secondContext = TranslationContext.Create(secondQueryable.Expression, context.TranslationOptions, context.SerializationDomain); var secondPipeline = ExpressionToPipelineTranslator.Translate(secondContext, secondQueryable.Expression); if (secondPipeline.Ast.Stages.Count == 0) { diff --git a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs index 55629aac049..a62e88b8ce6 100644 --- a/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs +++ b/src/MongoDB.Driver/Linq/Linq3Implementation/Translators/TranslationContext.cs @@ -28,11 +28,12 @@ internal class TranslationContext public static TranslationContext Create( Expression expression, ExpressionTranslationOptions translationOptions, + IBsonSerializationDomain serializationDomain, TranslationContextData data = null) { var symbolTable = new SymbolTable(); var nameGenerator = new NameGenerator(); - return new TranslationContext(symbolTable, nameGenerator, translationOptions, data); + return new TranslationContext(symbolTable, nameGenerator, translationOptions, data, serializationDomain); //TODO It'll be annoying to pass the serialization domain in the call here } #endregion @@ -41,22 +42,26 @@ public static TranslationContext Create( private readonly NameGenerator _nameGenerator; private readonly SymbolTable _symbolTable; private readonly ExpressionTranslationOptions _translationOptions; + private readonly IBsonSerializationDomain _serializationDomain; private TranslationContext( SymbolTable symbolTable, NameGenerator nameGenerator, ExpressionTranslationOptions translationOptions, - TranslationContextData data = null) + TranslationContextData data, + IBsonSerializationDomain serializationDomain) { _symbolTable = Ensure.IsNotNull(symbolTable, nameof(symbolTable)); _nameGenerator = Ensure.IsNotNull(nameGenerator, nameof(nameGenerator)); _translationOptions = translationOptions ?? new ExpressionTranslationOptions(); _data = data; // can be null + _serializationDomain = serializationDomain; } // public properties public TranslationContextData Data => _data; public NameGenerator NameGenerator => _nameGenerator; + public IBsonSerializationDomain SerializationDomain => _serializationDomain; public SymbolTable SymbolTable => _symbolTable; public ExpressionTranslationOptions TranslationOptions => _translationOptions; @@ -121,7 +126,7 @@ public TranslationContext WithSymbols(params Symbol[] newSymbols) public TranslationContext WithSymbolTable(SymbolTable symbolTable) { - return new TranslationContext(symbolTable, _nameGenerator, _translationOptions, _data); + return new TranslationContext(symbolTable, _nameGenerator, _translationOptions, _data, _serializationDomain); } } } diff --git a/src/MongoDB.Driver/Linq/LinqProviderAdapter.cs b/src/MongoDB.Driver/Linq/LinqProviderAdapter.cs index 69c7cd21b8c..93a1845b218 100644 --- a/src/MongoDB.Driver/Linq/LinqProviderAdapter.cs +++ b/src/MongoDB.Driver/Linq/LinqProviderAdapter.cs @@ -55,12 +55,12 @@ internal static IQueryable AsQueryable( internal static BsonValue TranslateExpressionToAggregateExpression( Expression> expression, IBsonSerializer sourceSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, TranslationContextData contextData = null) { expression = (Expression>)PartialEvaluator.EvaluatePartially(expression); - var context = TranslationContext.Create(expression, translationOptions, contextData); + var context = TranslationContext.Create(expression, translationOptions, serializationDomain, contextData); var translation = ExpressionToAggregationExpressionTranslator.TranslateLambdaBody(context, expression, sourceSerializer, asRoot: true); var simplifiedAst = AstSimplifier.Simplify(translation.Ast); @@ -70,12 +70,12 @@ internal static BsonValue TranslateExpressionToAggregateExpression( LambdaExpression expression, IBsonSerializer documentSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions) { expression = (LambdaExpression)PartialEvaluator.EvaluatePartially(expression); var parameter = expression.Parameters.Single(); - var context = TranslationContext.Create(expression, translationOptions); + var context = TranslationContext.Create(expression, translationOptions, serializationDomain); var symbol = context.CreateSymbol(parameter, documentSerializer, isCurrent: true); context = context.WithSymbol(symbol); var body = RemovePossibleConvertToObject(expression.Body); @@ -99,20 +99,20 @@ static Expression RemovePossibleConvertToObject(Expression expression) internal static RenderedFieldDefinition TranslateExpressionToField( Expression> expression, IBsonSerializer documentSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions, bool allowScalarValueForArrayField) { expression = (Expression>)PartialEvaluator.EvaluatePartially(expression); var parameter = expression.Parameters.Single(); - var context = TranslationContext.Create(expression, translationOptions); + var context = TranslationContext.Create(expression, translationOptions, serializationDomain); var symbol = context.CreateSymbol(parameter, documentSerializer, isCurrent: true); context = context.WithSymbol(symbol); var fieldTranslation = ExpressionToFilterFieldTranslator.Translate(context, expression.Body); var underlyingSerializer = fieldTranslation.Serializer; var fieldSerializer = underlyingSerializer as IBsonSerializer; - var valueSerializer = (IBsonSerializer)FieldValueSerializerHelper.GetSerializerForValueType(underlyingSerializer, serializerRegistry, typeof(TField), allowScalarValueForArrayField); + var valueSerializer = (IBsonSerializer)FieldValueSerializerHelper.GetSerializerForValueType(underlyingSerializer, serializationDomain.SerializerRegistry, typeof(TField), allowScalarValueForArrayField); return new RenderedFieldDefinition(fieldTranslation.Ast.Path, fieldSerializer, valueSerializer, underlyingSerializer); } @@ -120,11 +120,11 @@ internal static RenderedFieldDefinition TranslateExpressionToField( Expression> expression, IBsonSerializer elementSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions) { expression = (Expression>)PartialEvaluator.EvaluatePartially(expression); - var context = TranslationContext.Create(expression, translationOptions); + var context = TranslationContext.Create(expression, translationOptions, serializationDomain); var parameter = expression.Parameters.Single(); var symbol = context.CreateSymbol(parameter, "@", elementSerializer); // @ represents the implied element context = context.WithSingleSymbol(symbol); // @ is the only symbol visible inside an $elemMatch @@ -137,11 +137,11 @@ internal static BsonDocument TranslateExpressionToElemMatchFilter( internal static BsonDocument TranslateExpressionToFilter( Expression> expression, IBsonSerializer documentSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions) { expression = (Expression>)PartialEvaluator.EvaluatePartially(expression); - var context = TranslationContext.Create(expression, translationOptions); + var context = TranslationContext.Create(expression, translationOptions, serializationDomain); var filter = ExpressionToFilterTranslator.TranslateLambda(context, expression, documentSerializer, asRoot: true); filter = AstSimplifier.SimplifyAndConvert(filter); @@ -151,23 +151,24 @@ internal static BsonDocument TranslateExpressionToFilter( internal static RenderedProjectionDefinition TranslateExpressionToFindProjection( Expression> expression, IBsonSerializer sourceSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions) - => TranslateExpressionToProjection(expression, sourceSerializer, ProjectionHelper.CreateFindProjection, translationOptions, new AstFindProjectionSimplifier()); + => TranslateExpressionToProjection(expression, sourceSerializer, ProjectionHelper.CreateFindProjection, translationOptions, new AstFindProjectionSimplifier(), serializationDomain); internal static RenderedProjectionDefinition TranslateExpressionToProjection( Expression> expression, IBsonSerializer inputSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions) - => TranslateExpressionToProjection(expression, inputSerializer, ProjectionHelper.CreateAggregationProjection, translationOptions, new AstSimplifier()); + => TranslateExpressionToProjection(expression, inputSerializer, ProjectionHelper.CreateAggregationProjection, translationOptions, new AstSimplifier(), serializationDomain); private static RenderedProjectionDefinition TranslateExpressionToProjection( Expression> expression, IBsonSerializer inputSerializer, Func, IBsonSerializer)> projectionCreator, ExpressionTranslationOptions translationOptions, - AstSimplifier simplifier) + AstSimplifier simplifier, + IBsonSerializationDomain serializationDomain) { if (expression.Parameters.Count == 1 && expression.Body == expression.Parameters[0]) { @@ -176,7 +177,7 @@ private static RenderedProjectionDefinition TranslateExpressionToProjec } expression = (Expression>)PartialEvaluator.EvaluatePartially(expression); - var context = TranslationContext.Create(expression, translationOptions); + var context = TranslationContext.Create(expression, translationOptions, serializationDomain); try { @@ -197,10 +198,10 @@ private static RenderedProjectionDefinition TranslateExpressionToProjec internal static BsonDocument TranslateExpressionToSetStage( Expression> expression, IBsonSerializer documentSerializer, - IBsonSerializerRegistry serializerRegistry, + IBsonSerializationDomain serializationDomain, ExpressionTranslationOptions translationOptions) { - var context = TranslationContext.Create(expression, translationOptions); // do not partially evaluate expression + var context = TranslationContext.Create(expression, translationOptions, serializationDomain); // do not partially evaluate expression var parameter = expression.Parameters.Single(); var symbol = context.CreateSymbolWithVarName(parameter, varName: "ROOT", documentSerializer, isCurrent: true); context = context.WithSymbol(symbol); diff --git a/src/MongoDB.Driver/MongoClientSettings.cs b/src/MongoDB.Driver/MongoClientSettings.cs index d7da362ca92..99de0b9d5ad 100644 --- a/src/MongoDB.Driver/MongoClientSettings.cs +++ b/src/MongoDB.Driver/MongoClientSettings.cs @@ -18,6 +18,7 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; +using MongoDB.Bson.Serialization; using MongoDB.Driver.Core.Compression; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Misc; @@ -66,6 +67,7 @@ public class MongoClientSettings : IEquatable, IInheritable private bool _retryReads; private bool _retryWrites; private ConnectionStringScheme _scheme; + private IBsonSerializationDomain _serializationDomain; private ServerApi _serverApi; private List _servers; private ServerMonitoringMode _serverMonitoringMode; @@ -117,6 +119,7 @@ public MongoClientSettings() _retryReads = true; _retryWrites = true; _scheme = ConnectionStringScheme.MongoDB; + _serializationDomain = BsonSerializer.DefaultSerializationDomain; _serverApi = null; _servers = new List { new MongoServerAddress("localhost") }; _serverMonitoringMode = ServerMonitoringMode.Auto; @@ -471,6 +474,21 @@ public ReadPreference ReadPreference } } + /// + /// //TODO + /// + /// + /// + public IBsonSerializationDomain SerializationDomain + { + get => _serializationDomain; + set + { + if (_isFrozen) { throw new InvalidOperationException("MongoClientSettings is frozen."); } + _serializationDomain = value ?? throw new ArgumentNullException(nameof(value)); + } + } + /// /// Gets or sets the name of the replica set. /// @@ -927,6 +945,7 @@ public MongoClientSettings Clone() clone._retryReads = _retryReads; clone._retryWrites = _retryWrites; clone._scheme = _scheme; + clone._serializationDomain = _serializationDomain; clone._serverApi = _serverApi; clone._servers = new List(_servers); clone._serverMonitoringMode = _serverMonitoringMode; diff --git a/src/MongoDB.Driver/MongoCollectionImpl.cs b/src/MongoDB.Driver/MongoCollectionImpl.cs index 51f03dc0a04..ae27cfe5fa7 100644 --- a/src/MongoDB.Driver/MongoCollectionImpl.cs +++ b/src/MongoDB.Driver/MongoCollectionImpl.cs @@ -1320,7 +1320,8 @@ private MessageEncoderSettings GetMessageEncoderSettings() var messageEncoderSettings = new MessageEncoderSettings { { MessageEncoderSettingsName.ReadEncoding, _settings.ReadEncoding ?? Utf8Encodings.Strict }, - { MessageEncoderSettingsName.WriteEncoding, _settings.WriteEncoding ?? Utf8Encodings.Strict } + { MessageEncoderSettingsName.WriteEncoding, _settings.WriteEncoding ?? Utf8Encodings.Strict }, + { MessageEncoderSettingsName.SerializationDomain, _settings.SerializationDomain } }; if (_database.Client is MongoClient mongoClient) diff --git a/src/MongoDB.Driver/MongoCollectionSettings.cs b/src/MongoDB.Driver/MongoCollectionSettings.cs index a8489008921..e5dbdf6dc43 100644 --- a/src/MongoDB.Driver/MongoCollectionSettings.cs +++ b/src/MongoDB.Driver/MongoCollectionSettings.cs @@ -34,6 +34,7 @@ public class MongoCollectionSettings private Setting _readPreference; private Setting _writeConcern; private Setting _writeEncoding; + private Setting _serializationDomain; // the following fields are set when Freeze is called private bool _isFrozen; @@ -116,9 +117,23 @@ public ReadPreference ReadPreference /// /// Gets the serializer registry. /// - public IBsonSerializerRegistry SerializerRegistry + public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry; //TODO We should try passing down the domain instead of the registry... + + /// + /// //TODO + /// + public IBsonSerializationDomain SerializationDomain { - get { return BsonSerializer.SerializerRegistry; } + get => _serializationDomain.Value; + set + { + if (_isFrozen) { throw new InvalidOperationException("MongoCollectionSettings is frozen."); } + if (value == null) + { + throw new ArgumentNullException("value"); + } + _serializationDomain.Value = value; + } } /// @@ -165,6 +180,7 @@ public virtual MongoCollectionSettings Clone() clone._readPreference = _readPreference.Clone(); clone._writeConcern = _writeConcern.Clone(); clone._writeEncoding = _writeEncoding.Clone(); + clone._serializationDomain = _serializationDomain; //TODO .clone...? return clone; } @@ -298,6 +314,10 @@ internal void ApplyDefaultValues(MongoDatabaseSettings databaseSettings) { ReadPreference = databaseSettings.ReadPreference; } + if (!_serializationDomain.HasBeenSet) + { + SerializationDomain = databaseSettings.SerializationDomain; + } if (!_writeConcern.HasBeenSet) { WriteConcern = databaseSettings.WriteConcern; diff --git a/src/MongoDB.Driver/MongoDatabaseSettings.cs b/src/MongoDB.Driver/MongoDatabaseSettings.cs index b82ea52828d..2a098f6d05b 100644 --- a/src/MongoDB.Driver/MongoDatabaseSettings.cs +++ b/src/MongoDB.Driver/MongoDatabaseSettings.cs @@ -33,6 +33,7 @@ public class MongoDatabaseSettings private Setting _readPreference; private Setting _writeConcern; private Setting _writeEncoding; + private Setting _serializationDomain; // the following fields are set when Freeze is called private bool _isFrozen; @@ -101,9 +102,23 @@ public ReadPreference ReadPreference /// /// Gets the serializer registry. /// - public IBsonSerializerRegistry SerializerRegistry + public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry; + + /// + /// //TODO + /// + public IBsonSerializationDomain SerializationDomain { - get { return BsonSerializer.SerializerRegistry; } + get => _serializationDomain.Value; + set + { + if (_isFrozen) { throw new InvalidOperationException("MongoCollectionSettings is frozen."); } + if (value == null) + { + throw new ArgumentNullException("value"); + } + _serializationDomain.Value = value; + } } /// @@ -149,6 +164,7 @@ public MongoDatabaseSettings Clone() clone._readPreference = _readPreference.Clone(); clone._writeConcern = _writeConcern.Clone(); clone._writeEncoding = _writeEncoding.Clone(); + clone._serializationDomain = _serializationDomain; return clone; } @@ -275,6 +291,10 @@ internal void ApplyDefaultValues(IInheritableMongoClientSettings clientSettings) { ReadPreference = clientSettings.ReadPreference; } + if (!_serializationDomain.HasBeenSet) + { + SerializationDomain = clientSettings.SerializationDomain; + } if (!_writeConcern.HasBeenSet) { WriteConcern = clientSettings.WriteConcern; diff --git a/src/MongoDB.Driver/OfTypeSerializer.cs b/src/MongoDB.Driver/OfTypeSerializer.cs index 1ff1b95e4c2..ae63608cb97 100644 --- a/src/MongoDB.Driver/OfTypeSerializer.cs +++ b/src/MongoDB.Driver/OfTypeSerializer.cs @@ -45,7 +45,12 @@ obj is OfTypeSerializer other && object.Equals(_derivedDocumentSerializer, other._derivedDocumentSerializer); } - public bool GetDocumentId(object document, out object id, out Type idNominalType, out IIdGenerator idGenerator) + public bool + GetDocumentId(object document, out object id, out Type idNominalType, out IIdGenerator idGenerator) + => GetDocumentId(document, BsonSerializer.DefaultSerializationDomain, out id, out idNominalType, out idGenerator); + + public bool GetDocumentId(object document, IBsonSerializationDomain domain, out object id, out Type idNominalType, + out IIdGenerator idGenerator) { if (_derivedDocumentSerializer is IBsonIdProvider idProvider) { diff --git a/src/MongoDB.Driver/PipelineStageDefinitionBuilder.cs b/src/MongoDB.Driver/PipelineStageDefinitionBuilder.cs index 90c3c1f84e7..815a6d58efd 100644 --- a/src/MongoDB.Driver/PipelineStageDefinitionBuilder.cs +++ b/src/MongoDB.Driver/PipelineStageDefinitionBuilder.cs @@ -2051,8 +2051,8 @@ public Expression> Expression } public override RenderedProjectionDefinition Render(RenderArgs args) => args.RenderForFind ? - LinqProviderAdapter.TranslateExpressionToFindProjection(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions) : - LinqProviderAdapter.TranslateExpressionToProjection(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions); + LinqProviderAdapter.TranslateExpressionToFindProjection(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions) : + LinqProviderAdapter.TranslateExpressionToProjection(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions); } internal class SortPipelineStageDefinition : PipelineStageDefinition diff --git a/src/MongoDB.Driver/ProjectionDefinition.cs b/src/MongoDB.Driver/ProjectionDefinition.cs index 6ae7985cf5b..99c58af8107 100644 --- a/src/MongoDB.Driver/ProjectionDefinition.cs +++ b/src/MongoDB.Driver/ProjectionDefinition.cs @@ -277,11 +277,11 @@ public override RenderedProjectionDefinition Render(RenderArgs private readonly bool _renderForFind = false; private readonly IBsonSerializerRegistry _serializerRegistry = default; private readonly ExpressionTranslationOptions _translationOptions = default; + private readonly IBsonSerializationDomain _serializationDomain = default; /// /// Initializes a new instance of the record. @@ -49,6 +50,7 @@ public record struct RenderArgs /// Value that specifies whether rendering a find operation. /// Value that specifies whether rendering an $elemMatch. /// The translation options. + /// //TODO public RenderArgs( IBsonSerializer documentSerializer, IBsonSerializerRegistry serializerRegistry, @@ -56,7 +58,8 @@ public RenderArgs( bool renderDollarForm = default, bool renderForFind = false, bool renderForElemMatch = false, - ExpressionTranslationOptions translationOptions = null) + ExpressionTranslationOptions translationOptions = null, + IBsonSerializationDomain serializationDomain = null) { DocumentSerializer = documentSerializer; PathRenderArgs = pathRenderArgs; @@ -65,6 +68,7 @@ public RenderArgs( _renderForFind = renderForFind; _renderForElemMatch = renderForElemMatch; _translationOptions = translationOptions; // can be null + _serializationDomain = serializationDomain; } /// @@ -99,12 +103,21 @@ public readonly IBsonSerializer DocumentSerializer /// /// Gets the serializer registry. /// - public readonly IBsonSerializerRegistry SerializerRegistry + public readonly IBsonSerializerRegistry SerializerRegistry //TODO: we should probably remove this property { get => _serializerRegistry; init => _serializerRegistry = Ensure.IsNotNull(value, nameof(value)); } + /// + /// //TODO + /// + public readonly IBsonSerializationDomain SerializationDomain + { + get => _serializationDomain; + init => _serializationDomain = Ensure.IsNotNull(value, nameof(value)); + } + /// /// Gets the translation options used when translation Expressions to MQL. /// diff --git a/src/MongoDB.Driver/SetFieldDefinitions.cs b/src/MongoDB.Driver/SetFieldDefinitions.cs index 76dcc1c1914..f660419bec3 100644 --- a/src/MongoDB.Driver/SetFieldDefinitions.cs +++ b/src/MongoDB.Driver/SetFieldDefinitions.cs @@ -93,7 +93,7 @@ public ExpressionSetFieldDefinitions(Expression> expres /// public override BsonDocument Render(RenderArgs args) { - var stage = LinqProviderAdapter.TranslateExpressionToSetStage(_expression, args.DocumentSerializer, args.SerializerRegistry, args.TranslationOptions); + var stage = LinqProviderAdapter.TranslateExpressionToSetStage(_expression, args.DocumentSerializer, args.SerializationDomain, args.TranslationOptions); return stage["$set"].AsBsonDocument; } } diff --git a/tests/MongoDB.Bson.Tests/Jira/CSharp310Tests.cs b/tests/MongoDB.Bson.Tests/Jira/CSharp310Tests.cs index 976d9d3d5d4..79dcd48b02c 100644 --- a/tests/MongoDB.Bson.Tests/Jira/CSharp310Tests.cs +++ b/tests/MongoDB.Bson.Tests/Jira/CSharp310Tests.cs @@ -44,6 +44,11 @@ public void Apply(BsonMemberMap memberMap) memberMap.SetDefaultValue(Guid.Empty); } } + + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } } private static void InitializeSerialization() diff --git a/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentWrapperTests.cs b/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentWrapperTests.cs index a1f94fb3b41..fb115e1df62 100644 --- a/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentWrapperTests.cs +++ b/tests/MongoDB.Bson.Tests/ObjectModel/BsonDocumentWrapperTests.cs @@ -310,7 +310,7 @@ public void TestCreateWithNominalTypeAndObject() Assert.Same(c, wrapper.Wrapped); Assert.Equal(false, wrapper.IsMaterialized); - wrapper = BsonDocumentWrapper.Create(typeof(C), null); + wrapper = BsonDocumentWrapper.Create(typeof(C)); Assert.Same(BsonSerializer.LookupSerializer(typeof(C)), wrapper.Serializer); Assert.Same(null, wrapper.Wrapped); Assert.Equal(false, wrapper.IsMaterialized); diff --git a/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs index f86afe3836a..e477e80c952 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Conventions/ConventionRunnerTests.cs @@ -169,6 +169,11 @@ public void Apply(BsonMemberMap memberMap) RunCount++; RunOrder = _orderIndexProvider(); } + + public void Apply(BsonMemberMap memberMap, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } } private class TrackingAfterConvention : IPostProcessingConvention, ITrackRun @@ -194,6 +199,11 @@ public void PostProcess(BsonClassMap classMap) RunCount++; RunOrder = _orderIndexProvider(); } + + public void PostProcess(BsonClassMap classMap, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } } } } diff --git a/tests/MongoDB.Bson.Tests/Serialization/Conventions/StandardDiscriminatorConventionTests.cs b/tests/MongoDB.Bson.Tests/Serialization/Conventions/StandardDiscriminatorConventionTests.cs index f1d633bd724..b370126356b 100644 --- a/tests/MongoDB.Bson.Tests/Serialization/Conventions/StandardDiscriminatorConventionTests.cs +++ b/tests/MongoDB.Bson.Tests/Serialization/Conventions/StandardDiscriminatorConventionTests.cs @@ -15,6 +15,7 @@ using System; using FluentAssertions; +using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Conventions; using Xunit; @@ -116,6 +117,10 @@ public ConcreteStandardDiscriminatorConvention(string elementName) } public override BsonValue GetDiscriminator(Type nominalType, Type actualType) => throw new NotImplementedException(); + public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } } public class DerivedFromConcreteStandardDiscriminatorConvention : ConcreteStandardDiscriminatorConvention diff --git a/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs b/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs index 2beef58b39e..f529aeace37 100644 --- a/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs +++ b/tests/MongoDB.Driver.Tests/AggregateFluentTests.cs @@ -1327,6 +1327,7 @@ private Mock> CreateMockCollection(IMongoDatabase database = var collectionNamespace = new CollectionNamespace(databaseNamespace, collectionName); var settings = new MongoCollectionSettings(); + settings.SerializationDomain = BsonSerializer.CreateSerializationDomain(); var mockCollection = new Mock>(); mockCollection.SetupGet(c => c.CollectionNamespace).Returns(collectionNamespace); mockCollection.SetupGet(c => c.Database).Returns(database); diff --git a/tests/MongoDB.Driver.Tests/FindFluentTests.cs b/tests/MongoDB.Driver.Tests/FindFluentTests.cs index fb70cd6f43c..ffd87468d0e 100644 --- a/tests/MongoDB.Driver.Tests/FindFluentTests.cs +++ b/tests/MongoDB.Driver.Tests/FindFluentTests.cs @@ -359,6 +359,7 @@ private IFindFluent CreateSubject(IClientSessionHandle session = mockDatabase.SetupGet(d => d.Client).Returns(mockClient.Object); var collectionSettings = new MongoCollectionSettings(); + collectionSettings.SerializationDomain = BsonSerializer.CreateSerializationDomain(); _mockCollection = new Mock>(); _mockCollection.SetupGet(c => c.Database).Returns(mockDatabase.Object); _mockCollection.SetupGet(c => c.DocumentSerializer).Returns(BsonSerializer.SerializerRegistry.GetSerializer()); diff --git a/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs index 5094dbfa2b7..13351c9f913 100644 --- a/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IAggregateFluentExtensionsTests.cs @@ -671,6 +671,7 @@ private IMongoCollection CreateCollection(string collectionName = null) { var database = CreateDatabase(); var settings = new MongoCollectionSettings(); + settings.SerializationDomain = BsonSerializer.CreateSerializationDomain(); var mockCollection = new Mock>(); mockCollection.SetupGet(c => c.CollectionNamespace).Returns(new CollectionNamespace(new DatabaseNamespace("test"), collectionName ?? typeof(T).Name)); mockCollection.SetupGet(c => c.Database).Returns(database); diff --git a/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs b/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs index a65cf915b5c..d2dd5750ec1 100644 --- a/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs +++ b/tests/MongoDB.Driver.Tests/IMongoCollectionExtensionsTests.cs @@ -20,6 +20,7 @@ using System.Threading; using FluentAssertions; using MongoDB.Bson; +using MongoDB.Bson.Serialization; using MongoDB.Driver.Tests.Linq.Linq3Implementation; using MongoDB.TestHelpers.XunitExtensions; using Moq; @@ -1376,6 +1377,7 @@ private Mock> CreateMockCollection() var mockCollection = new Mock> { DefaultValue = DefaultValue.Mock }; mockCollection.SetupGet(c => c.Database).Returns(mockDatabase.Object); var collectionSettings = new MongoCollectionSettings(); + collectionSettings.SerializationDomain = BsonSerializer.CreateSerializationDomain(); mockCollection.SetupGet(s => s.DocumentSerializer).Returns(collectionSettings.SerializerRegistry.GetSerializer()); mockCollection.SetupGet(s => s.Settings).Returns(collectionSettings); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp1585Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp1585Tests.cs index 36fecaaf8b9..ac5716ce0ba 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp1585Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp1585Tests.cs @@ -40,7 +40,7 @@ public void Nested_Any_should_translate_correctly() var parameter = expression.Parameters[0]; var serializerRegistry = BsonSerializer.SerializerRegistry; var documentSerializer = serializerRegistry.GetSerializer(); - var context = TranslationContext.Create(expression, translationOptions: null); + var context = TranslationContext.Create(expression, translationOptions: null, BsonSerializer.DefaultSerializationDomain); var symbol = context.CreateSymbol(parameter, documentSerializer, isCurrent: true); context = context.WithSymbol(symbol); var filter = ExpressionToFilterTranslator.Translate(context, expression.Body, exprOk: false); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5286Tests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5286Tests.cs index 4eaa8227360..06aa1c37530 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5286Tests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp5286Tests.cs @@ -147,7 +147,16 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType) }; } + public Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } + public BsonValue GetDiscriminator(Type nominalType, Type actualType) => actualType.Name; + public BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain) + { + throw new NotImplementedException(); + } public BsonValue[] GetDiscriminatorsForTypeAndSubTypes(Type type) { diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ExpressionTranslators/ModuloComparisonExpressionToFilterTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ExpressionTranslators/ModuloComparisonExpressionToFilterTranslatorTests.cs index 700bbcbf7ee..91c26f475bf 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ExpressionTranslators/ModuloComparisonExpressionToFilterTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Translators/ExpressionToFilterTranslators/ExpressionTranslators/ModuloComparisonExpressionToFilterTranslatorTests.cs @@ -183,7 +183,7 @@ private void Assert(AstFilter result, string path, BsonValue divisor, BsonValue private TranslationContext CreateContext(ParameterExpression parameter) { var serializer = BsonSerializer.LookupSerializer(parameter.Type); - var context = TranslationContext.Create(parameter, translationOptions: null); + var context = TranslationContext.Create(parameter, translationOptions: null, BsonSerializer.DefaultSerializationDomain); var symbol = context.CreateSymbol(parameter, serializer, isCurrent: true); return context.WithSymbol(symbol); } diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/AggregateGroupTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/AggregateGroupTranslatorTests.cs index e312485b14a..7b4472fad1e 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/AggregateGroupTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/AggregateGroupTranslatorTests.cs @@ -546,7 +546,7 @@ private ProjectedResult Group(Expression(Expression> expression, int var parameter = expression.Parameters.Single(); var serializer = BsonSerializer.LookupSerializer(); - var context = TranslationContext.Create(expression, translationOptions: null); + var context = TranslationContext.Create(expression, translationOptions: null, BsonSerializer.DefaultSerializationDomain); var symbol = context.CreateSymbol(parameter, serializer, isCurrent: true); context = context.WithSymbol(symbol); var filterAst = ExpressionToFilterTranslator.Translate(context, expression.Body); diff --git a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/PredicateTranslatorTests.cs b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/PredicateTranslatorTests.cs index 4d878ca70b9..88e65b6b580 100644 --- a/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/PredicateTranslatorTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/Linq3ImplementationWithLinq2Tests/Translators/PredicateTranslatorTests.cs @@ -1154,7 +1154,7 @@ public List Assert(IMongoCollection collection, var serializer = BsonSerializer.SerializerRegistry.GetSerializer(); var parameter = filter.Parameters.Single(); - var context = TranslationContext.Create(filter, translationOptions: null); + var context = TranslationContext.Create(filter, translationOptions: null, collection.Settings.SerializationDomain); var symbol = context.CreateSymbol(parameter, serializer, isCurrent: true); context = context.WithSymbol(symbol); var filterAst = ExpressionToFilterTranslator.Translate(context, filter.Body); diff --git a/tests/MongoDB.Driver.Tests/Linq/LinqProviderAdapterTests.cs b/tests/MongoDB.Driver.Tests/Linq/LinqProviderAdapterTests.cs index f6f0d15f647..789caacae8a 100644 --- a/tests/MongoDB.Driver.Tests/Linq/LinqProviderAdapterTests.cs +++ b/tests/MongoDB.Driver.Tests/Linq/LinqProviderAdapterTests.cs @@ -20,7 +20,6 @@ using MongoDB.Bson.Serialization.Serializers; using MongoDB.Driver.Linq; using MongoDB.Driver.Linq.Linq3Implementation; -using MongoDB.Driver.Tests; using MongoDB.Driver.Tests.Linq.Linq3Implementation; using Moq; using Xunit; @@ -48,10 +47,10 @@ public void AsQueryable_should_return_expected_result() public void TranslateExpressionToAggregateExpression_should_return_expected_result() { Expression> expression = c => c.X; - var serializerRegistry = BsonSerializer.SerializerRegistry; - var sourceSerializer = serializerRegistry.GetSerializer(); + var serializationDomain = BsonSerializer.DefaultSerializationDomain; + var sourceSerializer = serializationDomain.SerializerRegistry.GetSerializer(); - var result = LinqProviderAdapter.TranslateExpressionToAggregateExpression(expression, sourceSerializer, serializerRegistry, translationOptions: null); + var result = LinqProviderAdapter.TranslateExpressionToAggregateExpression(expression, sourceSerializer, serializationDomain, translationOptions: null); result.Should().Be("'$X'"); } @@ -60,10 +59,10 @@ public void TranslateExpressionToAggregateExpression_should_return_expected_resu public void TranslateExpressionToField_with_untyped_lambda_should_return_expected_result() { LambdaExpression expression = (Expression>)(c => c.X); - var serializerRegistry = BsonSerializer.SerializerRegistry; - var documentSerializer = serializerRegistry.GetSerializer(); + var serializationDomain = BsonSerializer.DefaultSerializationDomain; + var documentSerializer = serializationDomain.SerializerRegistry.GetSerializer(); - var result = LinqProviderAdapter.TranslateExpressionToField(expression, documentSerializer, serializerRegistry, translationOptions: null); + var result = LinqProviderAdapter.TranslateExpressionToField(expression, documentSerializer, serializationDomain, translationOptions: null); result.FieldName.Should().Be("X"); result.FieldSerializer.Should().BeOfType(typeof(Int32Serializer)); @@ -73,10 +72,10 @@ public void TranslateExpressionToField_with_untyped_lambda_should_return_expecte public void TranslateExpressionToField_with_typed_lambda_should_return_expected_result() { Expression> expression = c => c.X; - var serializerRegistry = BsonSerializer.SerializerRegistry; - var documentSerializer = serializerRegistry.GetSerializer(); + var serializationDomain = BsonSerializer.DefaultSerializationDomain; + var documentSerializer = serializationDomain.SerializerRegistry.GetSerializer(); - var result = LinqProviderAdapter.TranslateExpressionToField(expression, documentSerializer, serializerRegistry, translationOptions: null, allowScalarValueForArrayField: false); + var result = LinqProviderAdapter.TranslateExpressionToField(expression, documentSerializer, serializationDomain, translationOptions: null, allowScalarValueForArrayField: false); result.FieldName.Should().Be("X"); result.FieldSerializer.Should().BeOfType(typeof(Int32Serializer)); @@ -86,10 +85,10 @@ public void TranslateExpressionToField_with_typed_lambda_should_return_expected_ public void TranslateExpressionToFilter_should_return_expected_result() { Expression> expression = c => c.X == 0; - var serializerRegistry = BsonSerializer.SerializerRegistry; - var documentSerializer = serializerRegistry.GetSerializer(); + var serializationDomain = BsonSerializer.DefaultSerializationDomain; + var documentSerializer = serializationDomain.SerializerRegistry.GetSerializer(); - var result = LinqProviderAdapter.TranslateExpressionToFilter(expression, documentSerializer, serializerRegistry, translationOptions: null); + var result = LinqProviderAdapter.TranslateExpressionToFilter(expression, documentSerializer, serializationDomain, translationOptions: null); result.Should().Be("{ X : 0 }"); } @@ -98,10 +97,10 @@ public void TranslateExpressionToFilter_should_return_expected_result() public void TranslateExpressionToFindProjection_should_return_expected_result() { Expression> expression = c => c.X; - var serializerRegistry = BsonSerializer.SerializerRegistry; - var documentSerializer = serializerRegistry.GetSerializer(); + var serializationDomain = BsonSerializer.DefaultSerializationDomain; + var documentSerializer = serializationDomain.SerializerRegistry.GetSerializer(); - var result = LinqProviderAdapter.TranslateExpressionToFindProjection(expression, documentSerializer, serializerRegistry, translationOptions: null); + var result = LinqProviderAdapter.TranslateExpressionToFindProjection(expression, documentSerializer, serializationDomain, translationOptions: null); result.Document.Should().Be("{ X : 1, _id : 0 }"); result.ProjectionSerializer.ValueType.Should().Be(typeof(int)); @@ -114,10 +113,10 @@ public void TranslateExpressionToProjection_should_return_expected_result() void WithAnonymousOutputType(Expression> expression) { - var serializerRegistry = BsonSerializer.SerializerRegistry; - var inputSerializer = serializerRegistry.GetSerializer(); + var serializationDomain = BsonSerializer.DefaultSerializationDomain; + var inputSerializer = serializationDomain.SerializerRegistry.GetSerializer(); - var result = LinqProviderAdapter.TranslateExpressionToProjection(expression, inputSerializer, serializerRegistry, translationOptions: null); + var result = LinqProviderAdapter.TranslateExpressionToProjection(expression, inputSerializer, serializationDomain, translationOptions: null); result.Document.Should().Be("{ _id : '$_id', x : '$X' }"); result.ProjectionSerializer.ValueType.Should().Be(typeof(TOutput)); diff --git a/tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs b/tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs new file mode 100644 index 00000000000..dc604c2ef42 --- /dev/null +++ b/tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs @@ -0,0 +1,167 @@ +/* Copyright 2010-present MongoDB Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +using System.Linq; +using MongoDB.Bson; +using MongoDB.Bson.Serialization; +using MongoDB.Bson.Serialization.Attributes; +using MongoDB.Bson.Serialization.Serializers; +using Xunit; + +namespace MongoDB.Driver.Tests +{ + public class MultipleRegistriesTests + { + [Fact] + public void TestSerialization() + { + { + var client = DriverTestConfiguration.CreateMongoClient(); + var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); + db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var collection = db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var bsonCollection = + db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + + var person = new Person { Id = ObjectId.Parse("6797b56bf5495bf53aa3078f"), Name = "Mario", Age = 24 }; + collection.InsertOne(person); + + var retrieved = bsonCollection.FindSync("{}").ToList().Single(); + var toString = retrieved.ToString(); + + var expectedVal = + """{ "_id" : { "$oid" : "6797b56bf5495bf53aa3078f" }, "Name" : "Mario", "Age" : 24 }"""; + Assert.Equal(expectedVal, toString); + } + + //The first section demonstrates that the class maps are also separated + { + var customDomain = BsonSerializer.CreateSerializationDomain(); + customDomain.RegisterSerializer(new CustomStringSerializer()); + + var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain); + var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); + db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var collection = db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var bsonCollection = + db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + + var person = new Person { Id = ObjectId.Parse("6797b56bf5495bf53aa3078f"), Name = "Mario", Age = 24 }; + collection.InsertOne(person); + + var retrievedAsBson = bsonCollection.FindSync("{}").ToList().Single(); + var toString = retrievedAsBson.ToString(); + + var expectedVal = + """{ "_id" : { "$oid" : "6797b56bf5495bf53aa3078f" }, "Name" : "Mariotest", "Age" : 24 }"""; + Assert.Equal(expectedVal, toString); + + var retrievedTyped = collection.FindSync("{}").ToList().Single(); + Assert.Equal("Mario", retrievedTyped.Name); + } + } + + [Fact] + public void TestDeserialization() + { + { + var client = DriverTestConfiguration.CreateMongoClient(); + var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); + db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var collection = db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + + var person = new Person1 { Id = ObjectId.Parse("6797b56bf5495bf53aa3078f"), Name = "Mariotest", Age = 24 }; + collection.InsertOne(person); + } + + { + var customDomain = BsonSerializer.CreateSerializationDomain(); + customDomain.RegisterSerializer(new CustomStringSerializer()); + + var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain); + var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); + var collection = db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + + var retrievedTyped = collection.FindSync("{}").ToList().Single(); + Assert.Equal("Mario", retrievedTyped.Name); + } + } + + [Fact] + public void TestLinq() + { + var customDomain = BsonSerializer.CreateSerializationDomain(); + customDomain.RegisterSerializer(new CustomStringSerializer()); + + var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain); + var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName); + db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var collection = db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + var untypedCollection = db.GetCollection(DriverTestConfiguration.CollectionNamespace.CollectionName); + + var person = new Person { Id = ObjectId.Parse("6797b56bf5495bf53aa3078f"), Name = "Mario", Age = 24 }; + collection.InsertOne(person); + + var retrievedAsBson = untypedCollection.FindSync("{}").ToList().Single(); + var toString = retrievedAsBson.ToString(); + + var expectedVal = + """{ "_id" : { "$oid" : "6797b56bf5495bf53aa3078f" }, "Name" : "Mariotest", "Age" : 24 }"""; + Assert.Equal(expectedVal, toString); + + var retrievedTyped = collection.AsQueryable().Where(x => x.Name == "Mario").ToList(); //The string serializer is correctly serializing "Mario" to "Mariotest" + Assert.NotEmpty(retrievedTyped); + } + + public class Person + { + [BsonId] public ObjectId Id { get; set; } + public string Name { get; set; } + public int Age { get; set; } + } + + public class Person1 + { + [BsonId] public ObjectId Id { get; set; } + public string Name { get; set; } + public int Age { get; set; } + } + + public class CustomStringSerializer : SealedClassSerializerBase //This serializer just adds "test" to any serialised string + { + /// + public override int GetHashCode() => 0; + + protected override string DeserializeValue(BsonDeserializationContext context, BsonDeserializationArgs args) + { + var bsonReader = context.Reader; + + var bsonType = bsonReader.GetCurrentBsonType(); + return bsonType switch + { + BsonType.String => bsonReader.ReadString().Replace("test", ""), + _ => throw CreateCannotDeserializeFromBsonTypeException(bsonType) + }; + } + + protected override void SerializeValue(BsonSerializationContext context, BsonSerializationArgs args, + string value) + { + var bsonWriter = context.Writer; + bsonWriter.WriteString(value + "test"); + } + } + } +} \ No newline at end of file