Skip to content

Commit 5702ec4

Browse files
jagregoryjagregory
committed
Obsoleted a load of the specific collection type convention stuff
1 parent c6b0ff4 commit 5702ec4

40 files changed

+114
-68
lines changed

‎src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/ArrayConventionTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,12 @@ public void ShouldSetWhereProperty()
167167

168168
#region Helpers
169169

170+
#pragma warning disable 612,618
170171
private void Convention(Action<IArrayInstance> convention)
171172
{
172173
model.Conventions.Add(new ArrayConventionBuilder().Always(convention));
173174
}
175+
#pragma warning restore 612,618
174176

175177
private void VerifyModel(Action<CollectionMapping> modelVerification)
176178
{

‎src/FluentNHibernate.Testing/ConventionsTests/Inspection/CollectionInspectorMapsToCollectionMapping.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace FluentNHibernate.Testing.ConventionsTests.Inspection
1111
public class CollectionInspectorMapsToCollectionMapping
1212
{
1313
private CollectionMapping mapping;
14-
private IMapInspector inspector;
14+
private ICollectionInspector inspector;
1515

1616
[SetUp]
1717
public void CreateDsl()
@@ -88,7 +88,7 @@ public void SortByIsNotSet()
8888

8989
#region Helpers
9090

91-
private Member Prop(Expression<Func<IMapInspector, object>> propertyExpression)
91+
static Member Prop(Expression<Func<ICollectionInspector, object>> propertyExpression)
9292
{
9393
return ReflectionHelper.GetMember(propertyExpression);
9494
}

‎src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/ArrayConventionTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,12 @@ public void WhereShouldntBeOverwritten()
195195

196196
#region Helpers
197197

198+
#pragma warning disable 612,618
198199
private void Convention(Action<IArrayInstance> convention)
199200
{
200201
model.Conventions.Add(new ArrayConventionBuilder().Always(convention));
201202
}
203+
#pragma warning restore 612,618
202204

203205
private void Mapping(Action<OneToManyPart<ExampleClass>> mappingDefinition)
204206
{

‎src/FluentNHibernate.Testing/ConventionsTests/RunnableConventionsTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,7 @@ public void ShouldApplyIHibernateMappingConvention()
444444

445445
#region conventions
446446

447+
#pragma warning disable 612,618
447448
private class ArrayConvention : IArrayConvention
448449
{
449450
public void Apply(IArrayInstance instance)
@@ -633,6 +634,8 @@ public void Apply(IHibernateMappingInstance instance)
633634
}
634635
}
635636

637+
#pragma warning restore 612,618
638+
636639
private class OtherObjectUserType : IUserType
637640
{
638641
public new bool Equals(object x, object y)

‎src/FluentNHibernate/Conventions/Helpers/Builders/ArrayConventionBuilder.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
using System;
22
using FluentNHibernate.Conventions.AcceptanceCriteria;
3-
using FluentNHibernate.Conventions.Instances;
43
using FluentNHibernate.Conventions.Helpers.Prebuilt;
4+
using FluentNHibernate.Conventions.Instances;
55
using FluentNHibernate.Conventions.Inspections;
66

77
namespace FluentNHibernate.Conventions.Helpers.Builders
88
{
9+
[Obsolete("Use CollectionConventionBuilder")]
910
public class ArrayConventionBuilder : IConventionBuilder<IArrayConvention, IArrayInspector, IArrayInstance>
1011
{
1112
public IArrayConvention Always(Action<IArrayInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Builders/BagConventionBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace FluentNHibernate.Conventions.Helpers.Builders
88
{
9+
[Obsolete("Use CollectionConventionBuilder")]
910
internal class BagConventionBuilder : IConventionBuilder<IBagConvention, IBagInspector, IBagInstance>
1011
{
1112
public IBagConvention Always(Action<IBagInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Builders/ListConventionBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace FluentNHibernate.Conventions.Helpers.Builders
88
{
9+
[Obsolete("Use CollectionConventionBuilder")]
910
internal class ListConventionBuilder : IConventionBuilder<IListConvention, IListInspector, IListInstance>
1011
{
1112
public IListConvention Always(Action<IListInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Builders/MapConventionBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace FluentNHibernate.Conventions.Helpers.Builders
88
{
9+
[Obsolete("Use CollectionConventionBuilder")]
910
internal class MapConventionBuilder : IConventionBuilder<IMapConvention, IMapInspector, IMapInstance>
1011
{
1112
public IMapConvention Always(Action<IMapInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Builders/SetConventionBuilder.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace FluentNHibernate.Conventions.Helpers.Builders
88
{
9+
[Obsolete("Use CollectionConventionBuilder")]
910
internal class SetConventionBuilder : IConventionBuilder<ISetConvention, ISetInspector, ISetInstance>
1011
{
1112
public ISetConvention Always(Action<ISetInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Prebuilt/BuiltArrayConvention.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace FluentNHibernate.Conventions.Helpers.Prebuilt
77
{
8+
[Obsolete("Use BuiltCollectionConvention")]
89
internal class BuiltArrayConvention : BuiltConventionBase<IArrayInspector, IArrayInstance>, IArrayConvention, IArrayConventionAcceptance
910
{
1011
public BuiltArrayConvention(Action<IAcceptanceCriteria<IArrayInspector>> accept, Action<IArrayInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Prebuilt/BuiltBagConvention.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace FluentNHibernate.Conventions.Helpers.Prebuilt
77
{
8+
[Obsolete("Use BuiltCollectionConvention")]
89
internal class BuiltBagConvention : BuiltConventionBase<IBagInspector, IBagInstance>, IBagConvention, IBagConventionAcceptance
910
{
1011
public BuiltBagConvention(Action<IAcceptanceCriteria<IBagInspector>> accept, Action<IBagInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Prebuilt/BuiltListConvention.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace FluentNHibernate.Conventions.Helpers.Prebuilt
77
{
8+
[Obsolete("Use BuiltCollectionConvention")]
89
internal class BuiltListConvention : BuiltConventionBase<IListInspector, IListInstance>, IListConvention, IListConventionAcceptance
910
{
1011
public BuiltListConvention(Action<IAcceptanceCriteria<IListInspector>> accept, Action<IListInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Prebuilt/BuiltMapConvention.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace FluentNHibernate.Conventions.Helpers.Prebuilt
77
{
8+
[Obsolete("Use BuiltCollectionConvention")]
89
internal class BuiltMapConvention : BuiltConventionBase<IMapInspector, IMapInstance>, IMapConvention, IMapConventionAcceptance
910
{
1011
public BuiltMapConvention(Action<IAcceptanceCriteria<IMapInspector>> accept, Action<IMapInstance> convention)

‎src/FluentNHibernate/Conventions/Helpers/Prebuilt/BuiltSetConvention.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
namespace FluentNHibernate.Conventions.Helpers.Prebuilt
77
{
8+
[Obsolete("Use BuiltCollectionConvention")]
89
internal class BuiltSetConvention : BuiltConventionBase<ISetInspector, ISetInstance>, ISetConvention, ISetConventionAcceptance
910
{
1011
public BuiltSetConvention(Action<IAcceptanceCriteria<ISetInspector>> accept, Action<ISetInstance> convention)

‎src/FluentNHibernate/Conventions/IArrayConvention.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23
using FluentNHibernate.Conventions.Instances;
34

45
namespace FluentNHibernate.Conventions
56
{
7+
[Obsolete("Use ICollectionConvention with an acceptance criteria")]
68
public interface IArrayConvention : IConvention<IArrayInspector, IArrayInstance>
79
{
810
}

‎src/FluentNHibernate/Conventions/IArrayConventionAcceptance.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using System;
12
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions
45
{
6+
[Obsolete("Use ICollectionConventionAcceptance")]
57
public interface IArrayConventionAcceptance : IConventionAcceptance<IArrayInspector>
68
{}
79
}

‎src/FluentNHibernate/Conventions/IBagConvention.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23
using FluentNHibernate.Conventions.Instances;
34

45
namespace FluentNHibernate.Conventions
56
{
7+
[Obsolete("Use ICollectionConvention with an acceptance criteria")]
68
public interface IBagConvention : IConvention<IBagInspector, IBagInstance>
79
{
810
}

‎src/FluentNHibernate/Conventions/IBagConventionAcceptance.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using System;
12
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions
45
{
6+
[Obsolete("Use ICollectionConventionAcceptance")]
57
public interface IBagConventionAcceptance : IConventionAcceptance<IBagInspector>
68
{}
79
}

‎src/FluentNHibernate/Conventions/IListConvention.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23
using FluentNHibernate.Conventions.Instances;
34

45
namespace FluentNHibernate.Conventions
56
{
7+
[Obsolete("Use ICollectionConvention with an acceptance criteria")]
68
public interface IListConvention : IConvention<IListInspector, IListInstance>
79
{
810
}

‎src/FluentNHibernate/Conventions/IListConventionAcceptance.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using System;
12
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions
45
{
6+
[Obsolete("Use ICollectionConventionAcceptance")]
57
public interface IListConventionAcceptance : IConventionAcceptance<IListInspector>
68
{}
79
}

‎src/FluentNHibernate/Conventions/IMapConvention.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23
using FluentNHibernate.Conventions.Instances;
34

45
namespace FluentNHibernate.Conventions
56
{
7+
[Obsolete("Use ICollectionConvention with an acceptance criteria")]
68
public interface IMapConvention : IConvention<IMapInspector, IMapInstance>
79
{
810
}

‎src/FluentNHibernate/Conventions/IMapConventionAcceptance.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using System;
12
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions
45
{
6+
[Obsolete("Use ICollectionConventionAcceptance")]
57
public interface IMapConventionAcceptance : IConventionAcceptance<IMapInspector>
68
{}
79
}

‎src/FluentNHibernate/Conventions/ISetConvention.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23
using FluentNHibernate.Conventions.Instances;
34

45
namespace FluentNHibernate.Conventions
56
{
7+
[Obsolete("Use ICollectionConvention with an acceptance criteria")]
68
public interface ISetConvention : IConvention<ISetInspector, ISetInstance>
79
{
810
}

‎src/FluentNHibernate/Conventions/ISetConventionAcceptance.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
using System;
12
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions
45
{
6+
[Obsolete("Use ICollectionConventionAcceptance")]
57
public interface ISetConventionAcceptance : IConventionAcceptance<ISetInspector>
68
{}
79
}

‎src/FluentNHibernate/Conventions/Inspections/CollectionInspector.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
namespace FluentNHibernate.Conventions.Inspections
88
{
9-
public class CollectionInspector : IArrayInspector, IBagInspector, IListInspector, IMapInspector, ISetInspector
9+
#pragma warning disable 612,618
10+
public class CollectionInspector : ICollectionInspector,
11+
IArrayInspector, IBagInspector, IListInspector, IMapInspector, ISetInspector
12+
#pragma warning restore 612,618
1013
{
1114
InspectorModelMapper<ICollectionInspector, CollectionMapping> propertyMappings = new InspectorModelMapper<ICollectionInspector, CollectionMapping>();
1215
CollectionMapping mapping;

‎src/FluentNHibernate/Conventions/Inspections/IArrayInspector.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
namespace FluentNHibernate.Conventions.Inspections
1+
using System;
2+
3+
namespace FluentNHibernate.Conventions.Inspections
24
{
5+
[Obsolete("Use ICollectionInspector")]
36
public interface IArrayInspector : ICollectionInspector
4-
{
5-
IIndexInspectorBase Index { get; }
6-
}
7+
{}
78
}

‎src/FluentNHibernate/Conventions/Inspections/IBagInspector.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
namespace FluentNHibernate.Conventions.Inspections
1+
using System;
2+
3+
namespace FluentNHibernate.Conventions.Inspections
24
{
5+
[Obsolete("Use ICollectionInspector")]
36
public interface IBagInspector : ICollectionInspector
4-
{
5-
new string OrderBy { get; }
6-
}
7+
{}
78
}

‎src/FluentNHibernate/Conventions/Inspections/ICollectionInspector.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ namespace FluentNHibernate.Conventions.Inspections
99
public interface ICollectionInspector : IInspector
1010
{
1111
IKeyInspector Key { get; }
12+
IIndexInspectorBase Index { get; }
13+
string Sort { get; }
1214
string TableName { get; }
1315
bool IsMethodAccess { get; }
1416
MemberInfo Member { get; }

‎src/FluentNHibernate/Conventions/Inspections/IListInspector.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
namespace FluentNHibernate.Conventions.Inspections
1+
using System;
2+
3+
namespace FluentNHibernate.Conventions.Inspections
24
{
5+
[Obsolete("Use ICollectionInspector")]
36
public interface IListInspector : ICollectionInspector
4-
{
5-
IIndexInspectorBase Index { get; }
6-
}
7+
{}
78
}

‎src/FluentNHibernate/Conventions/Inspections/IMapInspector.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
namespace FluentNHibernate.Conventions.Inspections
1+
using System;
2+
3+
namespace FluentNHibernate.Conventions.Inspections
24
{
5+
[Obsolete("Use ICollectionInspector")]
36
public interface IMapInspector : ICollectionInspector
4-
{
5-
IIndexInspectorBase Index { get; }
6-
string Sort { get; }
7-
}
7+
{}
88
}

‎src/FluentNHibernate/Conventions/Inspections/ISetInspector.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
namespace FluentNHibernate.Conventions.Inspections
1+
using System;
2+
3+
namespace FluentNHibernate.Conventions.Inspections
24
{
5+
[Obsolete("Use ICollectionInspector")]
36
public interface ISetInspector : ICollectionInspector
4-
{
5-
new string OrderBy { get; }
6-
string Sort { get; }
7-
}
7+
{}
88
}

‎src/FluentNHibernate/Conventions/Instances/CollectionInstance.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
namespace FluentNHibernate.Conventions.Instances
99
{
10-
public class CollectionInstance : CollectionInspector, IArrayInstance, IBagInstance, IListInstance, IMapInstance, ISetInstance
10+
#pragma warning disable 612,618
11+
public class CollectionInstance : CollectionInspector, ICollectionInstance,
12+
IArrayInstance, IBagInstance, IListInstance, IMapInstance, ISetInstance
13+
#pragma warning restore 612,618
1114
{
1215
readonly CollectionMapping mapping;
1316
protected bool nextBool = true;

‎src/FluentNHibernate/Conventions/Instances/IArrayInstance.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions.Instances
45
{
6+
[Obsolete("Use IConventionInstance")]
57
public interface IArrayInstance : IArrayInspector, ICollectionInstance
6-
{
7-
new IIndexInstanceBase Index { get; }
8-
}
8+
{}
99
}

‎src/FluentNHibernate/Conventions/Instances/IBagInstance.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
using FluentNHibernate.Conventions.Inspections;
1+
using System;
2+
using FluentNHibernate.Conventions.Inspections;
23

34
namespace FluentNHibernate.Conventions.Instances
45
{
5-
public interface IBagInstance : IBagInspector
6-
{
7-
void SetOrderBy(string orderBy);
8-
new IAccessInstance Access { get; }
9-
}
6+
[Obsolete("Use ICollectionInstance")]
7+
public interface IBagInstance : IBagInspector, ICollectionInstance
8+
{}
109
}

0 commit comments

Comments
 (0)