Final inheritance support version!

fluentsprings · Jan 18, 2017 · 78550a8 · 78550a8
1 parent 3f41815
commit 78550a8
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 62 deletions.
diff --git a/ExpressMapper NET40/Properties/AssemblyInfo.cs b/ExpressMapper NET40/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.3.0")]
-[assembly: AssemblyFileVersion("1.8.3.0")]
-[assembly: AssemblyInformationalVersion("1.8.3")]
+[assembly: AssemblyVersion("1.9.0.0")]
+[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyInformationalVersion("1.9.0")]
diff --git a/ExpressMapper NETCORE/MappingServiceProvider.cs b/ExpressMapper NETCORE/MappingServiceProvider.cs
@@ -132,6 +132,13 @@ private IMemberConfiguration<T, TN> RegisterInternal<T, TN>(bool memberCaseInsen
                 var sourceClassMapper = new SourceTypeMapper<T, TN>(SourceService, this);
                 var destinationClassMapper = new DestinationTypeMapper<T, TN>(DestinationService, this);
 
+                SourceService.TypeMappers[cacheKey] = sourceClassMapper;
+                DestinationService.TypeMappers[cacheKey] = destinationClassMapper;
+                var memberConfiguration = new MemberConfiguration<T, TN>(
+                    new ITypeMapper<T, TN>[] {sourceClassMapper, destinationClassMapper}, this);
+                sourceClassMapper.MemberConfiguration = memberConfiguration;
+                destinationClassMapper.MemberConfiguration = memberConfiguration;
+
                 if (!CustomMappingsBySource.ContainsKey(src.GetHashCode()))
                 {
                     CustomMappingsBySource[src.GetHashCode()] = new List<long>();
@@ -141,12 +148,6 @@ private IMemberConfiguration<T, TN> RegisterInternal<T, TN>(bool memberCaseInsen
                     CustomMappingsBySource[src.GetHashCode()].Add(cacheKey);
                 }
 
-                SourceService.TypeMappers[cacheKey] = sourceClassMapper;
-                DestinationService.TypeMappers[cacheKey] = destinationClassMapper;
-                var memberConfiguration = new MemberConfiguration<T, TN>(
-                    new ITypeMapper<T, TN>[] {sourceClassMapper, destinationClassMapper}, this);
-                sourceClassMapper.MemberConfiguration = memberConfiguration;
-                destinationClassMapper.MemberConfiguration = memberConfiguration;
                 return memberConfiguration;
             }
         }
@@ -385,25 +386,39 @@ private object MapNonGenericInternal(Type srcType, Type dstType, object src, obj
             {
                 return null;
             }
+
+            var cacheKey = CalculateCacheKey(srcType, dstType);
+            if (CustomMappers.ContainsKey(cacheKey))
+            {
+                var customTypeMapper = CustomMappers[cacheKey];
+                var typeMapper = customTypeMapper();
+                if (!_customTypeMapperCache.ContainsKey(cacheKey))
+                {
+                    CompileNonGenericCustomTypeMapper(srcType, dstType, typeMapper, cacheKey);
+                }
+                return _customTypeMapperCache[cacheKey](src, dest);
+            }
+
             ITypeMapper mapper = null;
             var actualSrcType = src.GetType();
-            if (srcType != actualSrcType && actualSrcType.IsAssignableFrom(srcType))
+            if (srcType != actualSrcType && actualSrcType.GetInfo().IsAssignableFrom(srcType))
                 throw new InvalidCastException($"Your source object instance type '{actualSrcType.FullName}' is not assignable from source type you specified '{srcType}'.");
 
             var srcHash = actualSrcType.GetHashCode();
 
             if (dest != null)
             {
                 var actualDstType = dest.GetType();
-                if (dstType != actualDstType && actualDstType.IsAssignableFrom(dstType))
+                if (dstType != actualDstType && actualDstType.GetInfo().IsAssignableFrom(dstType))
                     throw new InvalidCastException($"Your destination object instance type '{actualSrcType.FullName}' is not assignable from destination type you specified '{srcType}'.");
 
                 if (CustomMappingsBySource.ContainsKey(srcHash))
                 {
                     var mappings = CustomMappingsBySource[srcHash];
 
                     mapper =
-                        mappings.Select(m => DestinationService.TypeMappers[m])
+                        mappings.Where(m => DestinationService.TypeMappers.ContainsKey(m))
+                            .Select(m => DestinationService.TypeMappers[m])
                             .FirstOrDefault(tm => tm.DestinationType == actualDstType);
                 }
             }
@@ -413,8 +428,9 @@ private object MapNonGenericInternal(Type srcType, Type dstType, object src, obj
                 {
                     var mappings = CustomMappingsBySource[srcHash];
                     var typeMappers =
-                        mappings.Select(m => SourceService.TypeMappers[m])
-                            .Where(m => dstType.IsAssignableFrom(m.DestinationType))
+                        mappings.Where(m => SourceService.TypeMappers.ContainsKey(m))
+                            .Select(m => SourceService.TypeMappers[m])
+                            .Where(m => dstType.GetInfo().IsAssignableFrom(m.DestinationType))
                             .ToList();
                     if (typeMappers.Count > 1)
                     {
@@ -432,18 +448,6 @@ private object MapNonGenericInternal(Type srcType, Type dstType, object src, obj
                 }
             }
 
-            var cacheKey = CalculateCacheKey(srcType, dstType);
-            if (CustomMappers.ContainsKey(cacheKey))
-            {
-                var customTypeMapper = CustomMappers[cacheKey];
-                var typeMapper = customTypeMapper();
-                if (!_customTypeMapperCache.ContainsKey(cacheKey))
-                {
-                    CompileNonGenericCustomTypeMapper(srcType, dstType, typeMapper, cacheKey);
-                }
-                return _customTypeMapperCache[cacheKey](src, dest);
-            }
-
             var mappingService = dest == null ? SourceService : DestinationService;
             if (mapper != null)
             {

diff --git a/ExpressMapper NETCORE/Properties/AssemblyInfo.cs b/ExpressMapper NETCORE/Properties/AssemblyInfo.cs
@@ -20,6 +20,6 @@
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("969e6614-0489-4174-a735-cc66f51d8746")]
 
-[assembly: AssemblyVersion("1.8.3.0")]
-[assembly: AssemblyFileVersion("1.8.3.0")]
-[assembly: AssemblyInformationalVersion("1.8.3")]
+[assembly: AssemblyVersion("1.9.0.0")]
+[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyInformationalVersion("1.9.0")]
diff --git a/ExpressMapper NETCORE/TypeMapperBase.cs b/ExpressMapper NETCORE/TypeMapperBase.cs
@@ -121,7 +121,7 @@ public void Compile(CompilationTypes compilationType, bool forceByDemand = false
                 catch (Exception ex)
                 {
                     throw new ExpressmapperException(
-                        $"Error error occured trying to compile mapping for: source {typeof(T).FullName}, destination {typeof(TN).FullName}. See the inner exception for details.",
+                        $"Error error occured trying to compile mapping for: source {typeof (T).FullName}, destination {typeof (TN).FullName}. See the inner exception for details.",
                         ex);
                 }
             }
@@ -291,9 +291,9 @@ protected void ProcessAutoProperties()
 
             var stringComparison = GetStringCase();
 
-//            var comparer = CultureInfo.CurrentCulture.CompareInfo.GetStringComparer(CompareOptions.OrdinalIgnoreCase);
-            var comparer = StringComparer.Create(CultureInfo.CurrentCulture,
-                stringComparison == StringComparison.OrdinalIgnoreCase);
+            var comparer = CultureInfo.CurrentCulture.CompareInfo.GetStringComparer(CompareOptions.OrdinalIgnoreCase);
+            //var comparer = StringComparer.Create(CultureInfo.CurrentCulture,
+//                stringComparison == StringComparison.OrdinalIgnoreCase);
 
             foreach (var prop in sourceMembers)
             {
@@ -527,7 +527,7 @@ public ReplaceMemberTypeVisitor(Type replacementType, Expression instanceExp)
 
         protected override Expression VisitMember(MemberExpression node)
         {
-            return node.Member.DeclaringType.IsAssignableFrom(_replacementType)
+            return node.Member.DeclaringType.GetInfo().IsAssignableFrom(_replacementType)
                 ? Expression.PropertyOrField(_instanceExp, node.Member.Name)
                 : base.VisitMember(node);
         }

diff --git a/ExpressMapper NETCORE/project.json b/ExpressMapper NETCORE/project.json
@@ -1,7 +1,8 @@
 {
     "version": "1.0.0-*",
     "buildOptions": {
-        "outputName": "ExpressMapper"
+        "outputName": "ExpressMapper",
+        "xmlDoc": true
     },
 
     "dependencies": {

diff --git a/ExpressMapper Net46/ExpressMapper Net46.csproj b/ExpressMapper Net46/ExpressMapper Net46.csproj
@@ -28,6 +28,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\ExpressMapper.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>

diff --git a/ExpressMapper PCL NET45/ExpressMapper PCL NET45.csproj b/ExpressMapper PCL NET45/ExpressMapper PCL NET45.csproj
@@ -32,6 +32,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>bin\Release\ExpressMapper.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>

diff --git a/ExpressMapper PCL NET45/Properties/AssemblyInfo.cs b/ExpressMapper PCL NET45/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.8.3.0")]
-[assembly: AssemblyFileVersion("1.8.3.0")]
-[assembly: AssemblyInformationalVersion("1.8.3.0")]
+[assembly: AssemblyVersion("1.9.0.0")]
+[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyInformationalVersion("1.9.0.0")]
diff --git a/Expressmapper.Shared/MappingServiceProvider.cs b/Expressmapper.Shared/MappingServiceProvider.cs
@@ -132,6 +132,13 @@ private IMemberConfiguration<T, TN> RegisterInternal<T, TN>(bool memberCaseInsen
                 var sourceClassMapper = new SourceTypeMapper<T, TN>(SourceService, this);
                 var destinationClassMapper = new DestinationTypeMapper<T, TN>(DestinationService, this);
 
+                SourceService.TypeMappers[cacheKey] = sourceClassMapper;
+                DestinationService.TypeMappers[cacheKey] = destinationClassMapper;
+                var memberConfiguration = new MemberConfiguration<T, TN>(
+                    new ITypeMapper<T, TN>[] { sourceClassMapper, destinationClassMapper }, this);
+                sourceClassMapper.MemberConfiguration = memberConfiguration;
+                destinationClassMapper.MemberConfiguration = memberConfiguration;
+
                 if (!CustomMappingsBySource.ContainsKey(src.GetHashCode()))
                 {
                     CustomMappingsBySource[src.GetHashCode()] = new List<long>();
@@ -141,12 +148,6 @@ private IMemberConfiguration<T, TN> RegisterInternal<T, TN>(bool memberCaseInsen
                     CustomMappingsBySource[src.GetHashCode()].Add(cacheKey);
                 }
 
-                SourceService.TypeMappers[cacheKey] = sourceClassMapper;
-                DestinationService.TypeMappers[cacheKey] = destinationClassMapper;
-                var memberConfiguration = new MemberConfiguration<T, TN>(
-                    new ITypeMapper<T, TN>[] {sourceClassMapper, destinationClassMapper}, this);
-                sourceClassMapper.MemberConfiguration = memberConfiguration;
-                destinationClassMapper.MemberConfiguration = memberConfiguration;
                 return memberConfiguration;
             }
         }
@@ -385,25 +386,39 @@ private object MapNonGenericInternal(Type srcType, Type dstType, object src, obj
             {
                 return null;
             }
+
+            var cacheKey = CalculateCacheKey(srcType, dstType);
+            if (CustomMappers.ContainsKey(cacheKey))
+            {
+                var customTypeMapper = CustomMappers[cacheKey];
+                var typeMapper = customTypeMapper();
+                if (!_customTypeMapperCache.ContainsKey(cacheKey))
+                {
+                    CompileNonGenericCustomTypeMapper(srcType, dstType, typeMapper, cacheKey);
+                }
+                return _customTypeMapperCache[cacheKey](src, dest);
+            }
+
             ITypeMapper mapper = null;
             var actualSrcType = src.GetType();
-            if (srcType != actualSrcType && actualSrcType.IsAssignableFrom(srcType))
+            if (srcType != actualSrcType && actualSrcType.GetInfo().IsAssignableFrom(srcType))
                 throw new InvalidCastException($"Your source object instance type '{actualSrcType.FullName}' is not assignable from source type you specified '{srcType}'.");
 
             var srcHash = actualSrcType.GetHashCode();
 
             if (dest != null)
             {
                 var actualDstType = dest.GetType();
-                if (dstType != actualDstType && actualDstType.IsAssignableFrom(dstType))
+                if (dstType != actualDstType && actualDstType.GetInfo().IsAssignableFrom(dstType))
                     throw new InvalidCastException($"Your destination object instance type '{actualSrcType.FullName}' is not assignable from destination type you specified '{srcType}'.");
 
                 if (CustomMappingsBySource.ContainsKey(srcHash))
                 {
                     var mappings = CustomMappingsBySource[srcHash];
 
                     mapper =
-                        mappings.Select(m => DestinationService.TypeMappers[m])
+                        mappings.Where(m => DestinationService.TypeMappers.ContainsKey(m))
+                            .Select(m => DestinationService.TypeMappers[m])
                             .FirstOrDefault(tm => tm.DestinationType == actualDstType);
                 }
             }
@@ -413,8 +428,9 @@ private object MapNonGenericInternal(Type srcType, Type dstType, object src, obj
                 {
                     var mappings = CustomMappingsBySource[srcHash];
                     var typeMappers =
-                        mappings.Select(m => SourceService.TypeMappers[m])
-                            .Where(m => dstType.IsAssignableFrom(m.DestinationType))
+                        mappings.Where(m => SourceService.TypeMappers.ContainsKey(m))
+                            .Select(m => SourceService.TypeMappers[m])
+                            .Where(m => dstType.GetInfo().IsAssignableFrom(m.DestinationType))
                             .ToList();
                     if (typeMappers.Count > 1)
                     {
@@ -432,18 +448,6 @@ private object MapNonGenericInternal(Type srcType, Type dstType, object src, obj
                 }
             }
 
-            var cacheKey = CalculateCacheKey(srcType, dstType);
-            if (CustomMappers.ContainsKey(cacheKey))
-            {
-                var customTypeMapper = CustomMappers[cacheKey];
-                var typeMapper = customTypeMapper();
-                if (!_customTypeMapperCache.ContainsKey(cacheKey))
-                {
-                    CompileNonGenericCustomTypeMapper(srcType, dstType, typeMapper, cacheKey);
-                }
-                return _customTypeMapperCache[cacheKey](src, dest);
-            }
-
             var mappingService = dest == null ? SourceService : DestinationService;
             if (mapper != null)
             {

diff --git a/Expressmapper.Shared/TypeMapperBase.cs b/Expressmapper.Shared/TypeMapperBase.cs
@@ -529,7 +529,7 @@ public ReplaceMemberTypeVisitor(Type replacementType, Expression instanceExp)
 
         protected override Expression VisitMember(MemberExpression node)
         {
-            return node.Member.DeclaringType.IsAssignableFrom(_replacementType)
+            return node.Member.DeclaringType.GetInfo().IsAssignableFrom(_replacementType)
                 ? Expression.PropertyOrField(_instanceExp, node.Member.Name)
                 : base.VisitMember(node);
         }