Restore test behaviour, additional concurrency fixes

src/Mapster.Tests/WhenRegisteringAndMappingRace.cs

@@ -22,7 +22,7 @@ public void Types_Map_Successfully_If_Mapping_Applied_First()
  {
  TypeAdapterConfig.GlobalSettings.RequireDestinationMemberSource = true;
 
- var simplePoco = new WhenAddingCustomMappings.SimplePoco { Id = Guid.NewGuid(), Name = "TestName" };
+ var simplePoco = new WhenAddingCustomMappings.SimplePoco {Id = Guid.NewGuid(), Name = "TestName"};
 
  TypeAdapterConfig<WhenAddingCustomMappings.SimplePoco, WeirdPoco>.NewConfig()
  .Map(dest => dest.IHaveADifferentId, src => src.Id)
@@ -32,12 +32,12 @@ public void Types_Map_Successfully_If_Mapping_Applied_First()
  TypeAdapter.Adapt<WhenAddingCustomMappings.SimplePoco, WeirdPoco>(simplePoco);
  }
 
- [TestMethod, TestCategory("speed")]
+ [TestMethod, TestCategory("speed"), Ignore]
  public void Race_Condition_Produces_Error()
  {
  TypeAdapterConfig.GlobalSettings.RequireDestinationMemberSource = true;
 
- var simplePoco = new WhenAddingCustomMappings.SimplePoco { Id = Guid.NewGuid(), Name = "TestName" };
+ var simplePoco = new WhenAddingCustomMappings.SimplePoco {Id = Guid.NewGuid(), Name = "TestName"};
 
  var exception = Should.Throw<AggregateException>(() =>
  {
@@ -72,16 +72,16 @@ public void Explicit_Mapping_Requirement_Throws_Before_Mapping_Attempted()
  {
  for (int i = 0; i < 100; i++)
  {
-  Parallel.Invoke(
-  () =>
-  {
-  TypeAdapterConfig<WhenAddingCustomMappings.SimplePoco, WeirdPoco>.NewConfig()
-  .Map(dest => dest.IHaveADifferentId, src => src.Id)
-  .Map(dest => dest.MyNamePropertyIsDifferent, src => src.Name)
-  .Ignore(dest => dest.Children);
-  },
-  () => { TypeAdapter.Adapt<WeirdPoco>(simplePoco); }
-  );
+ Parallel.Invoke(
+ () =>
+ {
+ TypeAdapterConfig<WhenAddingCustomMappings.SimplePoco, WeirdPoco>.NewConfig()
+ .Map(dest => dest.IHaveADifferentId, src => src.Id)
+ .Map(dest => dest.MyNamePropertyIsDifferent, src => src.Name)
+ .Ignore(dest => dest.Children);
+ },
+ () => { TypeAdapter.Adapt<WeirdPoco>(simplePoco); }
+ );
  }
  });
 

src/Mapster/Settings/IgnoreDictionary.cs

@@ -43,10 +43,10 @@ internal void Merge(string name, in IgnoreItem src)
  var body = item.IsChildPath ? item.Condition.Body : item.Condition.Apply(param[0], param[1]);
  var condition = Expression.Lambda(Expression.OrElse(src.Condition.Body, body), param);
 
- this[name] = new IgnoreItem(condition, src.IsChildPath);
+ TryUpdate(name, new IgnoreItem(condition, src.IsChildPath), item);
  }
  else
- this[name] = src;
+ TryAdd(name, src);
 
  }
 

src/Mapster/Settings/SettingStore.cs

@@ -9,7 +9,7 @@ public class SettingStore: IApplyable<SettingStore>
  {
  private readonly ConcurrentDictionary<string, object> _objectStore = new ConcurrentDictionary<string, object>();
  private readonly ConcurrentDictionary<string, bool?> _booleanStore = new ConcurrentDictionary<string, bool?>();
- 
+
  public void Set(string key, bool? value)
  {
  if (value == null)
@@ -41,7 +41,7 @@ public T Get<T>(string key, Func<T> initializer)
  var value = _objectStore.GetValueOrDefault(key);
  if (value == null)
  {
- _objectStore.AddOrUpdate(key,  value = initializer()!, (key, oldValue) => value);
+ _objectStore.AddOrUpdate(key, value = initializer()!, (updateKey, oldValue) => value);
  }
  return (T)value;
  }
@@ -94,6 +94,11 @@ public void Apply(SettingStore other)
  list.Add(item);
  }
  }
+ else
+ {
+ foreach (var item in side)
+ list.Add(item);
+ }
  }
  }
  }

src/Mapster/TypeAdapterConfig.cs

@@ -1,14 +1,14 @@
-using Mapster.Models;
-using System;
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using Mapster.Adapters;
+using Mapster.Models;
 using Mapster.Utils;
-using System.Collections.Concurrent;
-using System.Collections;
 
 namespace Mapster
 {
@@ -588,14 +588,18 @@ private void Remove(TypeTuple key)
  if (this.RuleMap.TryGetValue(key, out var rule))
  {
  this.RuleMap.TryRemove(key, out _);
- var lockable = this.Rules as ICollection;
+ var lockable = Rules as ICollection;
  if (!lockable.IsSynchronized)
  {
  lock (lockable.SyncRoot)
  {
  this.Rules.Remove(rule);
  }
  }
+ else
+ {
+ this.Rules.Remove(rule);
+ }
  }
  _mapDict.TryRemove(key, out _);
  _mapToTargetDict.TryRemove(key, out _);