Making it possible to automap nested classes

Author: di97mni

src/FluentNHibernate.Specs/Automapping/AutomappingSpecs.NestedClasses.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FluentNHibernate.Automapping;
+using FluentNHibernate.MappingModel.ClassBased;
+using FluentNHibernate.Specs.Automapping.Fixtures;
+using Machine.Specifications;
+
+namespace FluentNHibernate.Specs.Automapping
+{
+    public class when_the_automapper_is_told_to_map_an_entity_with_a_nested_entity
+    {
+        Establish context = () =>
+            mapper = AutoMap.Source(
+                new StubTypeSource(typeof(Order), typeof(Order.OrderLine)));
+
+        Because of = () =>
+            mappings = mapper.BuildMappings()
+                .SelectMany(x => x.Classes);
+
+        It should_map_the_entity = () =>
+            mappings.ShouldContain(x => x.Type == typeof(Order));
+
+        It should_not_automap_the_nested_entity_per_default = () =>
+            mappings.ShouldNotContain(x => x.Type == typeof(Order.OrderLine));
+
+        static AutoPersistenceModel mapper;
+        static IEnumerable<ClassMapping> mappings;
+    }
+
+    public class when_changing_the_behaviour_of_automapping_configuration_to_also_map_nested_entities
+    {
+        Establish context = () =>
+            mapper = AutoMap.Source(
+                new StubTypeSource(typeof(Order), typeof(Order.OrderLine)), new TestConfiguration());
+
+        Because of = () =>
+            mappings = mapper.BuildMappings()
+                .SelectMany(x => x.Classes);
+
+        It should_map_the_entity = () =>
+            mappings.ShouldContain(x => x.Type == typeof(Order));
+
+        It should_not_automap_the_nested_entity_per_default = () =>
+            mappings.ShouldContain(x => x.Type == typeof(Order.OrderLine));
+
+        static AutoPersistenceModel mapper;
+        static IEnumerable<ClassMapping> mappings;
+
+        class TestConfiguration : DefaultAutomappingConfiguration
+        {
+            public override bool ShouldMap(Type type)
+            {
+                return base.ShouldMap(type) || type.IsNested;
+            }
+        }
+    }
+    public class Order
+    {
+        public int Id { get; set; }
+        public class OrderLine
+        {
+            public int Id { get; set; }
+        }
+    }
+
+}

src/FluentNHibernate.Specs/FluentNHibernate.Specs.csproj

@@ -143,6 +143,9 @@
     <Compile Include="PersistenceModel\SubclassSpecs.cs" />
     <Compile Include="SerializableSpecs.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Automapping\AutomappingSpecs.NestedClasses.cs" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/FluentNHibernate/Automapping/AutoPersistenceModel.cs

@@ -140,7 +140,7 @@ private void CompileMappings()
 
             foreach (var type in mappingTypes)
             {
-                if (!type.Type.IsClass || !IsNotInnerClass(type)) continue;
+                if (!type.Type.IsClass) continue;
                 if (type.IsMapped) continue;
 
                 AddMapping(type.Type);
@@ -170,11 +170,6 @@ public override void Configure(NHibernate.Cfg.Configuration configuration)
             base.Configure(configuration);
         }
 
-        static bool IsNotInnerClass(AutoMapType type)
-        {
-            return type.Type.ReflectedType == null;
-        }
-
         private void AddMapping(Type type)
         {
             Type typeToMap = GetTypeToMap(type);

src/FluentNHibernate/Automapping/DefaultAutomappingConfiguration.cs

@@ -18,7 +18,8 @@ public virtual bool ShouldMap(Member member)
         public virtual bool ShouldMap(Type type)
         {
             return !type.ClosesInterface(typeof(IAutoMappingOverride<>)) &&
-                !type.HasInterface(typeof(IMappingProvider));
+                !type.HasInterface(typeof(IMappingProvider)) &&
+                !type.IsNested;
         }
 
         public virtual bool IsId(Member member)