Skip to content

Commit 1b80020

Browse files
authored
Replace IList<T> with List<T> where possible (#683)
+semver:patch
1 parent 6eb7f90 commit 1b80020

26 files changed

+36
-34
lines changed

src/FluentNHibernate/Automapping/AutoJoinedSubClassPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class AutoJoinedSubClassPart<T> : JoinedSubClassPart<T>, IAutoClasslike
1111
#pragma warning restore 612,618
1212
{
1313
readonly MappingProviderStore providers;
14-
readonly IList<Member> mappedMembers = new List<Member>();
14+
readonly List<Member> mappedMembers = [];
1515

1616
public AutoJoinedSubClassPart(string keyColumn)
1717
: this(keyColumn, new MappingProviderStore())

src/FluentNHibernate/Automapping/AutoSubClassPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public class AutoSubClassPart<T> : SubClassPart<T>, IAutoClasslike
1111
#pragma warning restore 612,618
1212
{
1313
readonly MappingProviderStore providers;
14-
readonly IList<Member> mappedMembers = new List<Member>();
14+
readonly List<Member> mappedMembers = [];
1515

1616
public AutoSubClassPart(DiscriminatorPart parent, string discriminatorValue)
1717
: this(parent, discriminatorValue, new MappingProviderStore())

src/FluentNHibernate/Cfg/AutoMappingsContainer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace FluentNHibernate.Cfg;
1212
/// </summary>
1313
public class AutoMappingsContainer : IEnumerable<AutoPersistenceModel>
1414
{
15-
readonly IList<AutoPersistenceModel> mappings = new List<AutoPersistenceModel>();
15+
readonly List<AutoPersistenceModel> mappings = [];
1616
string exportPath;
1717
TextWriter exportTextWriter;
1818

src/FluentNHibernate/Cfg/FluentConfiguration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ public class FluentConfiguration
2323
const string DefaultProxyFactoryFactoryClassName = "NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle";
2424
const string CurrentSessionContextClassKey = NHibEnvironment.CurrentSessionContextClass;
2525

26-
readonly IList<Action<Configuration>> configAlterations = new List<Action<Configuration>>();
26+
readonly List<Action<Configuration>> configAlterations = [];
2727
readonly IDiagnosticMessageDispatcher dispatcher = new DefaultDiagnosticMessageDispatcher();
28-
readonly List<Action<MappingConfiguration>> mappingsBuilders = new List<Action<MappingConfiguration>>();
28+
readonly List<Action<MappingConfiguration>> mappingsBuilders = [];
2929

3030
bool dbSet;
3131
bool mappingsSet;

src/FluentNHibernate/Cfg/FluentMappingsContainer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ namespace FluentNHibernate.Cfg;
1212
/// </summary>
1313
public class FluentMappingsContainer
1414
{
15-
readonly IList<Assembly> assemblies = new List<Assembly>();
16-
readonly List<Type> types = new List<Type>();
15+
readonly List<Assembly> assemblies = [];
16+
readonly List<Type> types = [];
1717
readonly IConventionFinder conventionFinder = new DefaultConventionFinder();
1818
string exportPath;
1919
TextWriter exportTextWriter;

src/FluentNHibernate/Cfg/HbmMappingsContainer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ namespace FluentNHibernate.Cfg;
1010
/// </summary>
1111
public class HbmMappingsContainer
1212
{
13-
readonly IList<Type> classes = new List<Type>();
14-
readonly IList<Assembly> assemblies = new List<Assembly>();
13+
readonly List<Type> classes = [];
14+
readonly List<Assembly> assemblies = [];
1515

1616
internal HbmMappingsContainer()
1717
{}

src/FluentNHibernate/Mapping/AnyPart.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ public class AnyPart<T> : IAnyMappingProvider
1818
readonly AttributeStore attributes = new AttributeStore();
1919
readonly Type entity;
2020
readonly Member member;
21-
readonly IList<string> typeColumns = new List<string>();
22-
readonly IList<string> identifierColumns = new List<string>();
23-
readonly IList<MetaValueMapping> metaValues = new List<MetaValueMapping>();
21+
readonly List<string> typeColumns = [];
22+
readonly List<string> identifierColumns = [];
23+
readonly List<MetaValueMapping> metaValues = [];
2424
bool nextBool = true;
2525
bool idTypeSet;
2626

src/FluentNHibernate/Mapping/ClassMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class ClassMap<T> : ClasslikeMapBase<T>, IMappingProvider
3131
protected readonly AttributeStore attributes;
3232
readonly MappingProviderStore providers;
3333

34-
readonly IList<ImportPart> imports = new List<ImportPart>();
34+
readonly List<ImportPart> imports = [];
3535
bool nextBool = true;
3636

3737
public ClassMap()

src/FluentNHibernate/Mapping/ColumnMappingCollection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace FluentNHibernate.Mapping;
77

88
public class ColumnMappingCollection<TParent>(TParent parent) : IEnumerable<ColumnMapping>
99
{
10-
readonly IList<ColumnMapping> columns = new List<ColumnMapping>();
10+
readonly List<ColumnMapping> columns = [];
1111

1212
public TParent Add(string name)
1313
{

src/FluentNHibernate/Mapping/CompositeIdentityPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class CompositeIdentityPart<T> : ICompositeIdMappingProvider
1515
{
1616
readonly Action<Member> onMemberMapped;
1717
readonly AttributeStore attributes = new AttributeStore();
18-
readonly IList<ICompositeIdKeyMapping> keys = new List<ICompositeIdKeyMapping>();
18+
readonly List<ICompositeIdKeyMapping> keys = [];
1919
bool nextBool = true;
2020

2121
public CompositeIdentityPart(Action<Member> onMemberMapped)

src/FluentNHibernate/Mapping/IdentityPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace FluentNHibernate.Mapping;
1111
public class IdentityPart : IIdentityMappingProvider
1212
{
1313
readonly AttributeStore columnAttributes = new AttributeStore();
14-
readonly IList<string> columns = new List<string>();
14+
readonly List<string> columns = [];
1515
Member member;
1616
readonly Type entityType;
1717
readonly AttributeStore attributes = new AttributeStore();

src/FluentNHibernate/Mapping/IndexManyToManyPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace FluentNHibernate.Mapping;
88

99
public class IndexManyToManyPart(Type entity)
1010
{
11-
readonly IList<string> columns = new List<string>();
11+
readonly List<string> columns = [];
1212
readonly AttributeStore attributes = new AttributeStore();
1313

1414
public IndexManyToManyPart Column(string indexColumnName)

src/FluentNHibernate/Mapping/JoinPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace FluentNHibernate.Mapping;
1313
public class JoinPart<T> : ClasslikeMapBase<T>, IJoinMappingProvider
1414
{
1515
readonly MappingProviderStore providers;
16-
readonly IList<string> columns = new List<string>();
16+
readonly List<string> columns = [];
1717
readonly AttributeStore attributes = new AttributeStore();
1818
bool nextBool = true;
1919

src/FluentNHibernate/Mapping/ManyToManyPart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace FluentNHibernate.Mapping;
1111

1212
public class ManyToManyPart<TChild> : ToManyBase<ManyToManyPart<TChild>, TChild>
1313
{
14-
readonly IList<IFilterMappingProvider> childFilters = new List<IFilterMappingProvider>();
14+
readonly List<IFilterMappingProvider> childFilters = [];
1515
IndexManyToManyPart manyToManyIndex;
1616
IndexPart index;
1717
readonly Type childType;

src/FluentNHibernate/Mapping/ManyToOnePart.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace FluentNHibernate.Mapping;
1010

1111
public class ManyToOnePart<TOther> : IManyToOneMappingProvider
1212
{
13-
readonly IList<string> columns = new List<string>();
13+
readonly List<string> columns = [];
1414
bool nextBool = true;
1515
readonly AttributeStore attributes = new AttributeStore();
1616
readonly AttributeStore columnAttributes = new AttributeStore();

src/FluentNHibernate/Mapping/SubclassMap.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class SubclassMap<T> : ClasslikeMapBase<T>, IIndeterminateSubclassMapping
3131
// what the parent subclass type is...
3232
readonly IDictionary<Type, IIndeterminateSubclassMappingProvider> indetermineateSubclasses = new Dictionary<Type, IIndeterminateSubclassMappingProvider>();
3333
bool nextBool = true;
34-
readonly IList<JoinMapping> joins = new List<JoinMapping>();
34+
readonly List<JoinMapping> joins = [];
3535

3636
public SubclassMap()
3737
: this(new MappingProviderStore())

src/FluentNHibernate/Mapping/ToManyBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public abstract class ToManyBase<T, TChild> : ICollectionMappingProvider
2323
Func<AttributeStore, CollectionMapping> collectionBuilder;
2424
IndexMapping indexMapping;
2525
protected Member member;
26+
readonly List<IFilterMappingProvider> filters = [];
2627

2728
protected ToManyBase(Type entity, Member member, Type type)
2829
{
@@ -660,7 +661,7 @@ public T ApplyFilter(string name)
660661
return ApplyFilter<TFilter>(null);
661662
}
662663

663-
protected IList<IFilterMappingProvider> Filters { get; } = new List<IFilterMappingProvider>();
664+
protected IList<IFilterMappingProvider> Filters => filters;
664665

665666
void SetDefaultCollectionType()
666667
{

src/FluentNHibernate/MappingModel/AnyMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class AnyMapping(AttributeStore attributes) : MappingBase, IEquatable<Any
1313
readonly AttributeStore attributes = attributes;
1414
readonly LayeredColumns typeColumns = new LayeredColumns();
1515
readonly LayeredColumns identifierColumns = new LayeredColumns();
16-
readonly IList<MetaValueMapping> metaValues = new List<MetaValueMapping>();
16+
readonly List<MetaValueMapping> metaValues = [];
1717

1818
public AnyMapping()
1919
: this(new AttributeStore())

src/FluentNHibernate/MappingModel/ClassBased/ClassMappingBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public abstract class ClassMappingBase(AttributeStore attributes) : MappingBase,
99
{
1010
readonly AttributeStore attributes = attributes;
1111
readonly MappedMembers mappedMembers = new();
12-
readonly IList<SubclassMapping> subclasses = new List<SubclassMapping>();
12+
readonly List<SubclassMapping> subclasses = [];
1313

1414
public abstract string Name { get; }
1515
public abstract Type Type { get; }

src/FluentNHibernate/MappingModel/Collections/CollectionMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace FluentNHibernate.MappingModel.Collections;
1010
public class CollectionMapping : MappingBase, IRelationship, IEquatable<CollectionMapping>
1111
{
1212
readonly AttributeStore attributes;
13-
readonly IList<FilterMapping> filters = new List<FilterMapping>();
13+
readonly List<FilterMapping> filters = [];
1414

1515
public Type ContainingEntityType { get; set; }
1616
public Member Member { get; set; }

src/FluentNHibernate/MappingModel/Collections/ManyToManyMapping.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ public class ManyToManyMapping(AttributeStore attributes)
1212
{
1313
readonly AttributeStore attributes = attributes;
1414
readonly LayeredColumns columns = new LayeredColumns();
15+
readonly List<FilterMapping> childFilters = [];
1516

16-
public IList<FilterMapping> ChildFilters { get; } = new List<FilterMapping>();
17+
public IList<FilterMapping> ChildFilters => childFilters;
1718

1819
public ManyToManyMapping()
1920
: this(new AttributeStore())

src/FluentNHibernate/MappingModel/HibernateMapping.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ namespace FluentNHibernate.MappingModel;
1010
[Serializable]
1111
public class HibernateMapping(AttributeStore attributes) : MappingBase, IEquatable<HibernateMapping>
1212
{
13-
readonly IList<ClassMapping> classes = new List<ClassMapping>();
14-
readonly IList<FilterDefinitionMapping> filters = new List<FilterDefinitionMapping>();
15-
readonly IList<ImportMapping> imports = new List<ImportMapping>();
13+
readonly List<ClassMapping> classes = [];
14+
readonly List<FilterDefinitionMapping> filters = [];
15+
readonly List<ImportMapping> imports = [];
1616
readonly AttributeStore attributes = attributes;
1717

1818
public HibernateMapping(): this(new AttributeStore())

src/FluentNHibernate/MappingModel/Identity/CompositeIdMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace FluentNHibernate.MappingModel.Identity;
1010
public class CompositeIdMapping(AttributeStore attributes) : MappingBase, IIdentityMapping, IEquatable<CompositeIdMapping>
1111
{
1212
readonly AttributeStore attributes = attributes;
13-
readonly IList<ICompositeIdKeyMapping> keys = new List<ICompositeIdKeyMapping>();
13+
readonly List<ICompositeIdKeyMapping> keys = [];
1414

1515
public CompositeIdMapping()
1616
: this(new AttributeStore())

src/FluentNHibernate/MappingModel/Identity/KeyManyToOneMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace FluentNHibernate.MappingModel.Identity;
1010
public class KeyManyToOneMapping : MappingBase, ICompositeIdKeyMapping, IEquatable<KeyManyToOneMapping>
1111
{
1212
readonly AttributeStore attributes = new AttributeStore();
13-
readonly IList<ColumnMapping> columns = new List<ColumnMapping>();
13+
readonly List<ColumnMapping> columns = [];
1414

1515
public override void AcceptVisitor(IMappingModelVisitor visitor)
1616
{

src/FluentNHibernate/MappingModel/Identity/KeyPropertyMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace FluentNHibernate.MappingModel.Identity;
1010
public class KeyPropertyMapping : MappingBase, ICompositeIdKeyMapping, IEquatable<KeyPropertyMapping>
1111
{
1212
readonly AttributeStore attributes = new AttributeStore();
13-
readonly IList<ColumnMapping> columns = new List<ColumnMapping>();
13+
readonly List<ColumnMapping> columns = [];
1414

1515
public override void AcceptVisitor(IMappingModelVisitor visitor)
1616
{

src/FluentNHibernate/MappingModel/NaturalIdMapping.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ namespace FluentNHibernate.MappingModel;
88
public class NaturalIdMapping(AttributeStore attributes) : MappingBase
99
{
1010
readonly AttributeStore attributes = attributes;
11-
readonly IList<PropertyMapping> properties = new List<PropertyMapping>();
12-
readonly IList<ManyToOneMapping> manyToOnes = new List<ManyToOneMapping>();
11+
readonly List<PropertyMapping> properties = [];
12+
readonly List<ManyToOneMapping> manyToOnes = [];
1313

1414
public NaturalIdMapping()
1515
: this(new AttributeStore()) { }

0 commit comments

Comments
 (0)