Skip to content

Commit d6d9ddc

Browse files
papafepapafe
committed
Various corrections
1 parent 5742541 commit d6d9ddc

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎src/MongoDB.Bson/Serialization/BsonClassMap.cs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -278,82 +278,82 @@ public static Type GetMemberInfoType(MemberInfo memberInfo)
278278
/// </summary>
279279
/// <returns>All registered class maps.</returns>
280280
public static IEnumerable<BsonClassMap> GetRegisteredClassMaps() =>
281-
BsonSerializer.DefaultDomain.ClassMapDomain.GetRegisteredClassMaps();
281+
BsonSerializer.DefaultDomain.BsonClassMap.GetRegisteredClassMaps(); //TODO Used only in tests
282282

283283
/// <summary>
284284
/// Checks whether a class map is registered for a type.
285285
/// </summary>
286286
/// <param name="type">The type to check.</param>
287287
/// <returns>True if there is a class map registered for the type.</returns>
288288
public static bool IsClassMapRegistered(Type type) =>
289-
BsonSerializer.DefaultDomain.ClassMapDomain.IsClassMapRegistered(type);
289+
BsonSerializer.DefaultDomain.BsonClassMap.IsClassMapRegistered(type); //TODO Used only in tests
290290

291291
/// <summary>
292292
/// Looks up a class map (will AutoMap the class if no class map is registered).
293293
/// </summary>
294294
/// <param name="classType">The class type.</param>
295295
/// <returns>The class map.</returns>
296296
public static BsonClassMap LookupClassMap(Type classType) =>
297-
BsonSerializer.DefaultDomain.ClassMapDomain.LookupClassMap(classType);
297+
BsonSerializer.DefaultDomain.BsonClassMap.LookupClassMap(classType);
298298

299299
/// <summary>
300300
/// Creates and registers a class map.
301301
/// </summary>
302302
/// <typeparam name="TClass">The class.</typeparam>
303303
/// <returns>The class map.</returns>
304-
public static BsonClassMap<TClass> RegisterClassMap<TClass>()=>
305-
BsonSerializer.DefaultDomain.ClassMapDomain.RegisterClassMap<TClass>();
304+
public static BsonClassMap<TClass> RegisterClassMap<TClass>()=> //TODO Used only in tests
305+
BsonSerializer.DefaultDomain.BsonClassMap.RegisterClassMap<TClass>();
306306

307307
/// <summary>
308308
/// Creates and registers a class map.
309309
/// </summary>
310310
/// <typeparam name="TClass">The class.</typeparam>
311311
/// <param name="classMapInitializer">The class map initializer.</param>
312312
/// <returns>The class map.</returns>
313-
public static BsonClassMap<TClass> RegisterClassMap<TClass>(Action<BsonClassMap<TClass>> classMapInitializer)
314-
=> BsonSerializer.DefaultDomain.ClassMapDomain.RegisterClassMap(classMapInitializer);
313+
public static BsonClassMap<TClass> RegisterClassMap<TClass>(Action<BsonClassMap<TClass>> classMapInitializer) //TODO Used only in tests
314+
=> BsonSerializer.DefaultDomain.BsonClassMap.RegisterClassMap(classMapInitializer);
315315

316316
/// <summary>
317317
/// Registers a class map.
318318
/// </summary>
319319
/// <param name="classMap">The class map.</param>
320-
public static void RegisterClassMap(BsonClassMap classMap)
321-
=> BsonSerializer.DefaultDomain.ClassMapDomain.RegisterClassMap(classMap);
320+
public static void RegisterClassMap(BsonClassMap classMap) //TODO Used only in tests
321+
=> BsonSerializer.DefaultDomain.BsonClassMap.RegisterClassMap(classMap);
322322

323323
/// <summary>
324324
/// Registers a class map if it is not already registered.
325325
/// </summary>
326326
/// <typeparam name="TClass">The class.</typeparam>
327327
/// <returns>True if this call registered the class map, false if the class map was already registered.</returns>
328-
public static bool TryRegisterClassMap<TClass>()
329-
=> BsonSerializer.DefaultDomain.ClassMapDomain.TryRegisterClassMap<TClass>();
328+
public static bool TryRegisterClassMap<TClass>() //TODO Used only in tests
329+
=> BsonSerializer.DefaultDomain.BsonClassMap.TryRegisterClassMap<TClass>();
330330

331331
/// <summary>
332332
/// Registers a class map if it is not already registered.
333333
/// </summary>
334334
/// <typeparam name="TClass">The class.</typeparam>
335335
/// <param name="classMap">The class map.</param>
336336
/// <returns>True if this call registered the class map, false if the class map was already registered.</returns>
337-
public static bool TryRegisterClassMap<TClass>(BsonClassMap<TClass> classMap)
338-
=> BsonSerializer.DefaultDomain.ClassMapDomain.TryRegisterClassMap(classMap);
337+
public static bool TryRegisterClassMap<TClass>(BsonClassMap<TClass> classMap) //TODO Used only in tests
338+
=> BsonSerializer.DefaultDomain.BsonClassMap.TryRegisterClassMap(classMap);
339339

340340
/// <summary>
341341
/// Registers a class map if it is not already registered.
342342
/// </summary>
343343
/// <typeparam name="TClass">The class.</typeparam>
344344
/// <param name="classMapInitializer">The class map initializer (only called if the class map is not already registered).</param>
345345
/// <returns>True if this call registered the class map, false if the class map was already registered.</returns>
346-
public static bool TryRegisterClassMap<TClass>(Action<BsonClassMap<TClass>> classMapInitializer)
347-
=> BsonSerializer.DefaultDomain.ClassMapDomain.TryRegisterClassMap(classMapInitializer);
346+
public static bool TryRegisterClassMap<TClass>(Action<BsonClassMap<TClass>> classMapInitializer) //TODO Used only in tests
347+
=> BsonSerializer.DefaultDomain.BsonClassMap.TryRegisterClassMap(classMapInitializer);
348348

349349
/// <summary>
350350
/// Registers a class map if it is not already registered.
351351
/// </summary>
352352
/// <typeparam name="TClass">The class.</typeparam>
353353
/// <param name="classMapFactory">The class map factory (only called if the class map is not already registered).</param>
354354
/// <returns>True if this call registered the class map, false if the class map was already registered.</returns>
355-
public static bool TryRegisterClassMap<TClass>(Func<BsonClassMap<TClass>> classMapFactory)
356-
=> BsonSerializer.DefaultDomain.ClassMapDomain.TryRegisterClassMap(classMapFactory);
355+
public static bool TryRegisterClassMap<TClass>(Func<BsonClassMap<TClass>> classMapFactory) //TODO Used only in tests
356+
=> BsonSerializer.DefaultDomain.BsonClassMap.TryRegisterClassMap(classMapFactory);
357357

358358
// public methods
359359
/// <summary>
@@ -454,7 +454,7 @@ private BsonClassMap Freeze(FreezeContext context)
454454
{
455455
if (_baseClassMap == null)
456456
{
457-
_baseClassMap = LookupClassMap(baseType);
457+
_baseClassMap = context.SerializationDomain.BsonClassMap.LookupClassMap(baseType);
458458
}
459459
_baseClassMap.Freeze(context); //TODO This is not necessary, because LookupClassMap will only return a frozen class map
460460
_discriminatorIsRequired |= _baseClassMap._discriminatorIsRequired;
@@ -557,7 +557,7 @@ private BsonClassMap Freeze(FreezeContext context)
557557
while (context.KnownTypesQueue.Count != 0)
558558
{
559559
var knownType = context.KnownTypesQueue.Dequeue();
560-
LookupClassMap(knownType); // will AutoMap and/or Freeze knownType if necessary
560+
context.SerializationDomain.BsonClassMap.LookupClassMap(knownType); // will AutoMap and/or Freeze knownType if necessary
561561
}
562562
}
563563
}

‎src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry
4141
!typeof(Array).GetTypeInfo().IsAssignableFrom(type) &&
4242
!typeof(Enum).GetTypeInfo().IsAssignableFrom(type))
4343
{
44-
var classMap = BsonClassMap.LookupClassMap(type);
44+
var classMap = BsonClassMap.LookupClassMap(type); //TODO We need to find a way to pass the domain here
4545
var classMapSerializerDefinition = typeof(BsonClassMapSerializer<>);
4646
var classMapSerializerType = classMapSerializerDefinition.MakeGenericType(type);
4747
return (IBsonSerializer)Activator.CreateInstance(classMapSerializerType, classMap);

‎src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ public void Serialize(
732732
serializer.Serialize(context, args, value);
733733
}
734734

735-
public IBsonClassMapDomain ClassMapDomain => _classMapDomain;
735+
public IBsonClassMapDomain BsonClassMap => _classMapDomain;
736736

737737
/// <summary>
738738
/// Tries to register a serializer for a type.

‎src/MongoDB.Bson/Serialization/Conventions/HierarchicalDiscriminatorConvention.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public override BsonValue GetDiscriminator(Type nominalType, Type actualType) =>
4848
public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain)
4949
{
5050
// TODO: this isn't quite right, not all classes are serialized using a class map serializer
51-
var classMap = BsonClassMap.LookupClassMap(actualType);
51+
var classMap = domain.BsonClassMap.LookupClassMap(actualType);
5252
if (actualType != nominalType || classMap.DiscriminatorIsRequired || classMap.HasRootClass)
5353
{
5454
if (classMap.HasRootClass && !classMap.IsRootClass)

‎src/MongoDB.Bson/Serialization/Conventions/ScalarDiscriminatorConvention.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public override BsonValue GetDiscriminator(Type nominalType, Type actualType) =>
4646
public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain)
4747
{
4848
// TODO: this isn't quite right, not all classes are serialized using a class map serializer
49-
var classMap = BsonClassMap.LookupClassMap(actualType);
49+
var classMap = domain.BsonClassMap.LookupClassMap(actualType);
5050
if (actualType != nominalType || classMap.DiscriminatorIsRequired)
5151
{
5252
return classMap.Discriminator;

‎src/MongoDB.Bson/Serialization/IBsonSerializationDomain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ void Serialize(
288288
/// <summary>
289289
/// //TODO
290290
/// </summary>
291-
IBsonClassMapDomain ClassMapDomain { get; }
291+
IBsonClassMapDomain BsonClassMap { get; }
292292
}
293293

294294
internal interface IBsonSerializationDomainInternal : IBsonSerializationDomain

0 commit comments

Comments
 (0)