fix: refactor configuration

TimothyMakkison · May 1, 2023 · e302577 · e302577
1 parent 689208d
commit e302577
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/src/Riok.Mapperly/Descriptors/Configuration.cs b/src/Riok.Mapperly/Descriptors/Configuration.cs
@@ -43,5 +43,10 @@ private void InitDefaultConfigurations()
             typeof(MapEnumAttribute),
             new MapEnumAttribute(Mapper.EnumMappingStrategy) { IgnoreCase = Mapper.EnumMappingIgnoreCase }
         );
+
+        _defaultConfigurations.Add(
+            typeof(MapperIgnoreObsoleteMembersAttribute),
+            new MapperIgnoreObsoleteMembersAttribute(Mapper.IgnoreObsoleteMembersStrategy)
+        );
     }
 }
diff --git a/...k.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs b/...k.Mapperly/Descriptors/MappingBodyBuilders/BuilderContext/MembersMappingBuilderContext.cs
@@ -81,12 +81,9 @@ private HashSet<string> GetIgnoredTargetMembers()
 
     private IEnumerable<string> GetIgnoredObsoleteTargetMembers()
     {
-        var obosoleteAttribute = BuilderContext.ListConfiguration<MapperIgnoreObsoleteMembersAttribute>().FirstOrDefault();
+        var obsoleteAttribute = BuilderContext.GetConfigurationOrDefault<MapperIgnoreObsoleteMembersAttribute>();
 
-        if (
-            obosoleteAttribute is { IgnoreObsoleteStrategy: IgnoreObsoleteStrategy.Target or IgnoreObsoleteStrategy.Both }
-            || BuilderContext.MapperConfiguration.IgnoreObsoleteStrategy is IgnoreObsoleteStrategy.Target or IgnoreObsoleteStrategy.Both
-        )
+        if (obsoleteAttribute.IgnoreObsoleteStrategy.HasFlag(IgnoreObsoleteMembersStrategy.Target))
         {
             return Mapping.SourceType
                 .GetAccessibleMappableMembers()
@@ -106,12 +103,9 @@ private HashSet<string> GetIgnoredSourceMembers()
 
     private IEnumerable<string> GetIgnoredObsoleteSourceMembers()
     {
-        var obosoleteAttribute = BuilderContext.ListConfiguration<MapperIgnoreObsoleteMembersAttribute>().FirstOrDefault();
+        var obsoleteAttribute = BuilderContext.GetConfigurationOrDefault<MapperIgnoreObsoleteMembersAttribute>();
 
-        if (
-            obosoleteAttribute is { IgnoreObsoleteStrategy: IgnoreObsoleteStrategy.Source or IgnoreObsoleteStrategy.Both }
-            || BuilderContext.MapperConfiguration.IgnoreObsoleteStrategy is IgnoreObsoleteStrategy.Source or IgnoreObsoleteStrategy.Both
-        )
+        if (obsoleteAttribute.IgnoreObsoleteStrategy.HasFlag(IgnoreObsoleteMembersStrategy.Source))
         {
             return Mapping.SourceType
                 .GetAccessibleMappableMembers()