Don't throw and catch on validation #4526
Next
Next commit
don't throw and catch on validation
- Loading branch information
commit a384948f40d40f1a53061f6ce1bb480917e96a96
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,120 +1,116 @@ | ||
| using AutoMapper.Internal.Mappers; | ||
| namespace AutoMapper.Configuration; | ||
| [EditorBrowsable(EditorBrowsableState.Never)] | ||
| public class ConfigurationValidator(IGlobalConfiguration config) | ||
| { | ||
| IGlobalConfigurationExpression Expression => ((MapperConfiguration)config).ConfigurationExpression; | ||
| public void AssertConfigurationExpressionIsValid(TypeMap[] typeMaps) | ||
| { | ||
| var duplicateTypeMapConfigs = Expression.Profiles.Append((Profile)Expression) | ||
| .SelectMany(p => p.TypeMapConfigs, (profile, typeMap) => (profile, typeMap)) | ||
| .GroupBy(x => x.typeMap.Types) | ||
| .Where(g => g.Count() > 1) | ||
| .Select(g => (TypePair: g.Key, ProfileNames: g.Select(tmc => tmc.profile.ProfileName).ToArray())) | ||
| .Select(g => new DuplicateTypeMapConfigurationException.TypeMapConfigErrors(g.TypePair, g.ProfileNames)) | ||
| .ToArray(); | ||
| if(duplicateTypeMapConfigs.Length != 0) | ||
| { | ||
| throw new DuplicateTypeMapConfigurationException(duplicateTypeMapConfigs); | ||
| } | ||
| AssertConfigurationIsValid(typeMaps); | ||
| } | ||
| public void AssertConfigurationIsValid(TypeMap[] typeMaps) | ||
| { | ||
| List<Exception> configExceptions = []; | ||
| var badTypeMaps = | ||
| (from typeMap in typeMaps | ||
| where typeMap.ShouldCheckForValid | ||
| let unmappedPropertyNames = typeMap.GetUnmappedPropertyNames() | ||
| let canConstruct = typeMap.PassesCtorValidation | ||
| where unmappedPropertyNames.Length > 0 || !canConstruct | ||
| select new AutoMapperConfigurationException.TypeMapConfigErrors(typeMap, unmappedPropertyNames, canConstruct)).ToArray(); | ||
| if(badTypeMaps.Length > 0) | ||
| { | ||
| configExceptions.Add(new AutoMapperConfigurationException(badTypeMaps)); | ||
| } | ||
| HashSet<TypeMap> typeMapsChecked = []; | ||
| foreach(var typeMap in typeMaps) | ||
| { | ||
| DryRunTypeMap(typeMap.Types, typeMap, null); | ||
| } | ||
| if(configExceptions.Count > 1) | ||
| { | ||
| throw new AggregateException(configExceptions); | ||
| } | ||
| if(configExceptions.Count > 0) | ||
| { | ||
| throw configExceptions[0]; | ||
| } | ||
| void DryRunTypeMap(TypePair types, TypeMap typeMap, MemberMap memberMap) | ||
| { | ||
| if(typeMap == null) | ||
| { | ||
| if(types.ContainsGenericParameters) | ||
| { | ||
| return; | ||
| } | ||
| typeMap = config.ResolveTypeMap(types.SourceType, types.DestinationType); | ||
| } | ||
| if(typeMap != null) | ||
| { | ||
| if(typeMapsChecked.Add(typeMap) && Validate(new(types, memberMap, configExceptions, typeMap)) && typeMap.ShouldCheckForValid) | ||
| { | ||
| CheckPropertyMaps(typeMap); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| var mapperToUse = config.FindMapper(types); | ||
| if(mapperToUse == null) | ||
| { | ||
| configExceptions.Add(new AutoMapperConfigurationException(memberMap.TypeMap.Types) { MemberMap = memberMap }); | ||
| return; | ||
| } | ||
| if(Validate(new(types, memberMap, configExceptions, ObjectMapper: mapperToUse)) && mapperToUse.GetAssociatedTypes(types) is TypePair newTypes && | ||
| newTypes != types) | ||
| { | ||
| DryRunTypeMap(newTypes, null, memberMap); | ||
| } | ||
| } | ||
| } | ||
| void CheckPropertyMaps(TypeMap typeMap) | ||
| { | ||
| foreach(var memberMap in typeMap.MemberMaps) | ||
| { | ||
| if(memberMap.Ignored || (memberMap is PropertyMap && typeMap.ConstructorParameterMatches(memberMap.DestinationName))) | ||
| { | ||
| continue; | ||
| } | ||
| var sourceType = memberMap.SourceType; | ||
| // when we don't know what the source type is, bail | ||
| if(sourceType.IsGenericParameter || sourceType == typeof(object)) | ||
| { | ||
| continue; | ||
| } | ||
| DryRunTypeMap(new(sourceType, memberMap.DestinationType), null, memberMap); | ||
| } | ||
| } | ||
| bool Validate(ValidationContext context) | ||
| { | ||
| foreach(var validator in Expression.Validators) | ||
| { | ||
| try | ||
| { | ||
| validator(context); | ||
| } | ||
| catch(Exception e) | ||
| { | ||
| configExceptions.Add(e); | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
| } | ||
| } | ||
| public readonly record struct ValidationContext(TypePair Types, MemberMap MemberMap, List<Exception> Exceptions, TypeMap TypeMap = null, IObjectMapper ObjectMapper = null); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.