Skip to content

Commit d5200ca

Browse files
committed
* Removal of explicit defaults which match NHs
* Cleanup
1 parent 5702ec4 commit d5200ca

29 files changed

+5
-464
lines changed

src/FluentNHibernate/FluentNHibernate.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,10 @@
588588
<Compile Include="MappingModel\ClassBased\ComponentMappingBase.cs" />
589589
<Compile Include="MappingModel\ClassBased\IComponentMapping.cs" />
590590
<Compile Include="MappingModel\ClassBased\SubclassMapping.cs" />
591-
<Compile Include="MappingModel\Collections\ArrayMapping.cs" />
592591
<Compile Include="MappingModel\Collections\CompositeElementMapping.cs" />
593592
<Compile Include="MappingModel\Collections\ElementMapping.cs" />
594593
<Compile Include="MappingModel\Collections\IIndexMapping.cs" />
595594
<Compile Include="MappingModel\Collections\IndexManyToManyMapping.cs" />
596-
<Compile Include="MappingModel\Collections\MapMapping.cs" />
597595
<Compile Include="MappingModel\Identity\KeyManyToOneMapping.cs" />
598596
<Compile Include="MappingModel\Identity\KeyPropertyMapping.cs" />
599597
<Compile Include="MappingModel\MetaValueMapping.cs" />
@@ -727,10 +725,7 @@
727725
<Compile Include="MappingModel\AttributeStore.cs" />
728726
<Compile Include="MappingModel\Collections\CollectionMapping.cs" />
729727
<Compile Include="MappingModel\Collections\IndexMapping.cs" />
730-
<Compile Include="MappingModel\Collections\ListMapping.cs" />
731728
<Compile Include="MappingModel\Collections\ManyToManyMapping.cs" />
732-
<Compile Include="MappingModel\Collections\SetMapping.cs" />
733-
<Compile Include="MappingModel\Collections\BagMapping.cs" />
734729
<Compile Include="MappingModel\Collections\ICollectionRelationshipMapping.cs" />
735730
<Compile Include="MappingModel\ColumnMapping.cs" />
736731
<Compile Include="MappingModel\Conventions\ConventionException.cs" />

src/FluentNHibernate/MappingModel/AnyMapping.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@ public AnyMapping()
2020
public AnyMapping(AttributeStore underlyingStore)
2121
{
2222
attributes = new AttributeStore<AnyMapping>(underlyingStore);
23-
24-
attributes.SetDefault(x => x.Insert, true);
25-
attributes.SetDefault(x => x.Update, true);
26-
attributes.SetDefault(x => x.OptimisticLock, true);
27-
attributes.SetDefault(x => x.Lazy, false);
2823
}
2924

3025
public override void AcceptVisitor(IMappingModelVisitor visitor)

src/FluentNHibernate/MappingModel/CacheMapping.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Linq.Expressions;
3-
using System.Reflection;
43
using FluentNHibernate.Visitors;
54

65
namespace FluentNHibernate.MappingModel

src/FluentNHibernate/MappingModel/ClassBased/ClassMapping.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public ClassMapping()
1717
public ClassMapping(AttributeStore store)
1818
{
1919
attributes = new AttributeStore<ClassMapping>(store);
20-
attributes.SetDefault(x => x.Mutable, true);
2120
}
2221

2322
public IIdentityMapping Id

src/FluentNHibernate/MappingModel/ClassBased/ComponentMapping.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Linq.Expressions;
3-
using System.Reflection;
43
using FluentNHibernate.Visitors;
54

65
namespace FluentNHibernate.MappingModel.ClassBased

src/FluentNHibernate/MappingModel/ClassBased/ComponentMappingBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using System;
22
using System.Linq.Expressions;
3-
using System.Reflection;
43
using FluentNHibernate.Visitors;
54

65
namespace FluentNHibernate.MappingModel.ClassBased

src/FluentNHibernate/MappingModel/ClassBased/IComponentMapping.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public interface IComponentMapping : IMappingBase
1919
bool OptimisticLock { get; set; }
2020
bool Unique { get; }
2121
IEnumerable<ManyToOneMapping> References { get; }
22-
IEnumerable<Collections.CollectionMapping> Collections { get; }
22+
IEnumerable<CollectionMapping> Collections { get; }
2323
IEnumerable<PropertyMapping> Properties { get; }
2424
IEnumerable<IComponentMapping> Components { get; }
2525
IEnumerable<OneToOneMapping> OneToOnes { get; }
@@ -30,7 +30,7 @@ public interface IComponentMapping : IMappingBase
3030
void AddProperty(PropertyMapping mapping);
3131
void AddComponent(IComponentMapping mapping);
3232
void AddOneToOne(OneToOneMapping mapping);
33-
void AddCollection(Collections.CollectionMapping mapping);
33+
void AddCollection(CollectionMapping mapping);
3434
void AddReference(ManyToOneMapping mapping);
3535
void AddAny(AnyMapping mapping);
3636
bool HasValue(string property);

src/FluentNHibernate/MappingModel/Collections/ArrayMapping.cs

Lines changed: 0 additions & 85 deletions
This file was deleted.

src/FluentNHibernate/MappingModel/Collections/BagMapping.cs

Lines changed: 0 additions & 73 deletions
This file was deleted.

src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public class CollectionMapping : MappingBase, IRelationship
1818
{
1919
Collection = Collection.Bag;
2020
attributes = new AttributeStore<CollectionMapping>(underlyingStore);
21-
attributes.SetDefault(x => x.Mutable, true);
2221
}
2322

2423
public IEnumerable<FilterMapping> Filters

src/FluentNHibernate/MappingModel/Collections/ElementMapping.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq.Expressions;
4-
using System.Reflection;
5-
using FluentNHibernate.Utils;
64
using FluentNHibernate.Visitors;
75

86
namespace FluentNHibernate.MappingModel.Collections

src/FluentNHibernate/MappingModel/Collections/ICollectionRelationshipMapping.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System;
2-
using System.Linq.Expressions;
32

43
namespace FluentNHibernate.MappingModel.Collections
54
{

src/FluentNHibernate/MappingModel/Collections/IndexManyToManyMapping.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
22
using System.Linq.Expressions;
3-
using System.Reflection;
4-
using FluentNHibernate.Utils;
53
using FluentNHibernate.Visitors;
64

75
namespace FluentNHibernate.MappingModel.Collections

src/FluentNHibernate/MappingModel/Collections/IndexMapping.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using System;
22
using System.Linq.Expressions;
3-
using System.Reflection;
4-
using FluentNHibernate.Utils;
53
using FluentNHibernate.Visitors;
64

75
namespace FluentNHibernate.MappingModel.Collections

src/FluentNHibernate/MappingModel/Collections/ListMapping.cs

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.Collections.Generic;
33
using System.Linq.Expressions;
4-
using FluentNHibernate.Utils;
54
using FluentNHibernate.Visitors;
65

76
namespace FluentNHibernate.MappingModel.Collections
@@ -15,10 +14,7 @@ public class ManyToManyMapping : MappingBase, ICollectionRelationshipMapping, IH
1514

1615
public IList<FilterMapping> ChildFilters
1716
{
18-
get
19-
{
20-
return childFilters;
21-
}
17+
get { return childFilters; }
2218
}
2319

2420
public ManyToManyMapping()

0 commit comments

Comments
 (0)