Skip to content

Commit 418d35a

Browse files
hazzikfredericDelaporte
hazzik
authored and
fredericDelaporte
committed
Optimize empty arrays usages (nhibernate#1490)
1 parent aada800 commit 418d35a

File tree

150 files changed

+349
-306
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+349
-306
lines changed

‎src/NHibernate.DomainModel/Async/CustomPersister.cs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using NHibernate.Tuple.Entity;
2222
using NHibernate.Type;
2323
using NHibernate.Util;
24+
using Array = System.Array;
2425

2526
namespace NHibernate.DomainModel
2627
{

‎src/NHibernate.DomainModel/Baz.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ public void SetDefaults()
396396
StringArray = StringSet.ToArray();
397397
StringList = new List<string>(StringArray);
398398
IntArray = new int[] {1, 3, 3, 7};
399-
FooArray = new Foo[0];
399+
FooArray = Array.Empty<Foo>();
400400

401401
Customs = new List<string[]>();
402402
Customs.Add(new String[] {"foo", "bar"});

‎src/NHibernate.DomainModel/CustomPersister.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using NHibernate.Tuple.Entity;
1212
using NHibernate.Type;
1313
using NHibernate.Util;
14+
using Array = System.Array;
1415

1516
namespace NHibernate.DomainModel
1617
{
@@ -130,12 +131,12 @@ public bool[] PropertyInsertability
130131

131132
public ValueInclusion[] PropertyInsertGenerationInclusions
132133
{
133-
get { return new ValueInclusion[0]; }
134+
get { return Array.Empty<ValueInclusion>(); }
134135
}
135136

136137
public ValueInclusion[] PropertyUpdateGenerationInclusions
137138
{
138-
get { return new ValueInclusion[0]; }
139+
get { return Array.Empty<ValueInclusion>(); }
139140
}
140141

141142
public bool[] PropertyCheckability

‎src/NHibernate.Test/Async/Component/Basic/ComponentTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected override string MappingsAssembly
3232

3333
protected override System.Collections.IList Mappings
3434
{
35-
get { return new string[] { }; }
35+
get { return Array.Empty<string>(); }
3636
}
3737

3838
protected override void Configure(Configuration configuration)

‎src/NHibernate.Test/Async/DialectTest/DialectFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public async Task CurrentTimestampSelectionAsync()
6868

6969
using (var connection = await (sessions.ConnectionProvider.GetConnectionAsync(CancellationToken.None)))
7070
{
71-
var statement = driver.GenerateCommand(CommandType.Text, new SqlString(dialect.CurrentTimestampSelectString), new SqlType[0]);
71+
var statement = driver.GenerateCommand(CommandType.Text, new SqlString(dialect.CurrentTimestampSelectString), Array.Empty<SqlType>());
7272
statement.Connection = connection;
7373
using (var reader = await (statement.ExecuteReaderAsync()))
7474
{

‎src/NHibernate.Test/Async/Events/PostEvents/PostUpdateFixture.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Collections;
1213
using System.Collections.Generic;
1314
using NHibernate.Event;
@@ -56,7 +57,7 @@ public async Task ImplicitFlushAsync()
5657
}
5758

5859
await (DbCleanupAsync());
59-
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = new IPostUpdateEventListener[0];
60+
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = Array.Empty<IPostUpdateEventListener>();
6061
}
6162

6263
[Test]
@@ -85,7 +86,7 @@ public async Task ExplicitUpdateAsync()
8586
}
8687

8788
await (DbCleanupAsync());
88-
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = new IPostUpdateEventListener[0];
89+
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = Array.Empty<IPostUpdateEventListener>();
8990
}
9091

9192
[Test]
@@ -123,7 +124,7 @@ public async Task WithDetachedObjectAsync()
123124
}
124125

125126
await (DbCleanupAsync());
126-
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = new IPostUpdateEventListener[0];
127+
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = Array.Empty<IPostUpdateEventListener>();
127128
}
128129

129130
[Test]
@@ -163,7 +164,7 @@ public async Task UpdateDetachedObjectAsync()
163164
}
164165

165166
await (DbCleanupAsync());
166-
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = new IPostUpdateEventListener[0];
167+
((DebugSessionFactory) Sfi).EventListeners.PostUpdateEventListeners = Array.Empty<IPostUpdateEventListener>();
167168
}
168169

169170
[Test]
@@ -202,7 +203,7 @@ public async Task UpdateDetachedObjectWithLockAsync()
202203
}
203204

204205
await (DbCleanupAsync());
205-
((DebugSessionFactory)Sfi).EventListeners.PostUpdateEventListeners = new IPostUpdateEventListener[0];
206+
((DebugSessionFactory)Sfi).EventListeners.PostUpdateEventListeners = Array.Empty<IPostUpdateEventListener>();
206207
}
207208
private async Task DbCleanupAsync(CancellationToken cancellationToken = default(CancellationToken))
208209
{

‎src/NHibernate.Test/Async/ExceptionsTest/NullQueryTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class NullQueryTestAsync : TestCase
2828

2929
protected override IList Mappings
3030
{
31-
get { return new string[0]; }
31+
get { return Array.Empty<string>(); }
3232
}
3333

3434
#endregion

‎src/NHibernate.Test/Async/Legacy/FumTest.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public async Task CriteriaCollectionAsync()
8686
Assert.IsTrue(b.MapComponent.Stringmap.Count == 2);
8787

8888
int none = (await (s.CreateCriteria(typeof(Fum))
89-
.Add(Expression.In("FumString", new string[0]))
89+
.Add(Expression.In("FumString", Array.Empty<string>()))
9090
.ListAsync())).Count;
9191
Assert.AreEqual(0, none);
9292

‎src/NHibernate.Test/Async/LinqBulkManipulation/Fixture.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace NHibernate.Test.LinqBulkManipulation
2525
[TestFixture]
2626
public class FixtureAsync : TestCase
2727
{
28-
protected override IList Mappings => new string[0];
28+
protected override IList Mappings => Array.Empty<string>();
2929

3030
protected override void Configure(Cfg.Configuration configuration)
3131
{
@@ -970,7 +970,7 @@ public async Task SimpleDeleteOnAnimalAsync()
970970
using (var t = s.BeginTransaction())
971971
{
972972
// Get rid of FK which may fail the test
973-
_doll.Friends = new Human[0];
973+
_doll.Friends = Array.Empty<Human>();
974974
await (s.UpdateAsync(_doll));
975975
await (t.CommitAsync());
976976
}
@@ -1029,7 +1029,7 @@ public async Task DeleteOnJoinedSubclassAsync()
10291029
using (var t = s.BeginTransaction())
10301030
{
10311031
// Get rid of FK which may fail the test
1032-
_doll.Friends = new Human[0];
1032+
_doll.Friends = Array.Empty<Human>();
10331033
await (s.UpdateAsync(_doll));
10341034
await (t.CommitAsync());
10351035
}

‎src/NHibernate.Test/Async/MappingByCode/IntegrationTests/NH2825/FixtureByCode.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Collections;
1213
using NHibernate.Cfg.MappingSchema;
1314
using NHibernate.Mapping.ByCode;
@@ -21,7 +22,7 @@ public class FixtureByCodeAsync : FixtureAsync
2122
{
2223
protected override IList Mappings
2324
{
24-
get { return new string[0]; }
25+
get { return Array.Empty<string>(); }
2526
}
2627

2728
protected override string MappingsAssembly
@@ -63,4 +64,4 @@ private HbmMapping GetMappings()
6364
return mapper.CompileMappingForAllExplicitlyAddedEntities();
6465
}
6566
}
66-
}
67+
}

‎src/NHibernate.Test/Async/NHSpecificTest/EmptyMappingsFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class EmptyMappingsFixtureAsync : TestCase
2929
{
3030
protected override IList Mappings
3131
{
32-
get { return new string[0]; }
32+
get { return Array.Empty<string>(); }
3333
}
3434

3535
[Test]

‎src/NHibernate.Test/Async/NHSpecificTest/NH1421/Fixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public void WhenParameterListIsEmptyUsingQueryThenDoesNotTrowsNullReferenceExcep
2727
using (var s = OpenSession())
2828
{
2929
var query = s.CreateQuery("from AnEntity a where a.id in (:myList)");
30-
Assert.That(() => query.SetParameterList("myList", new long[0]).ListAsync(), Throws.Exception.Not.InstanceOf<NullReferenceException>());
30+
Assert.That(() => query.SetParameterList("myList", Array.Empty<long>()).ListAsync(), Throws.Exception.Not.InstanceOf<NullReferenceException>());
3131
}
3232
}
3333
}

‎src/NHibernate.Test/Async/NHSpecificTest/NH2166/Fixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class FixtureAsync: TestCase
2121
{
2222
protected override IList Mappings
2323
{
24-
get { return new string[0]; }
24+
get { return Array.Empty<string>(); }
2525
}
2626

2727
[Test]

‎src/NHibernate.Test/Async/NHSpecificTest/NH4077/PostInsertFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected override HbmMapping GetMappings()
7474
protected override void Configure(Configuration configuration)
7575
{
7676
base.Configure(configuration);
77-
var existingListeners = (configuration.EventListeners.PostInsertEventListeners ?? new IPostInsertEventListener[0]).ToList();
77+
var existingListeners = (configuration.EventListeners.PostInsertEventListeners ?? Array.Empty<IPostInsertEventListener>()).ToList();
7878
// this evil listener uses the session to perform a few queries and causes an auto-flush to happen
7979
existingListeners.Add(new CausesAutoflushListener());
8080
configuration.EventListeners.PostInsertEventListeners = existingListeners.ToArray();

‎src/NHibernate.Test/Async/NHSpecificTest/NH4077/PostUpdateFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ protected override HbmMapping GetMappings()
6868
protected override void Configure(Configuration configuration)
6969
{
7070
base.Configure(configuration);
71-
var existingListeners = (configuration.EventListeners.PostUpdateEventListeners ?? new IPostUpdateEventListener[0]).ToList();
71+
var existingListeners = (configuration.EventListeners.PostUpdateEventListeners ?? Array.Empty<IPostUpdateEventListener>()).ToList();
7272
// this evil listener uses the session to perform a few queries and causes an auto-flush to happen
7373
existingListeners.Add(new CausesAutoflushListener());
7474
configuration.EventListeners.PostUpdateEventListeners = existingListeners.ToArray();

‎src/NHibernate.Test/Async/NHSpecificTest/NH901/Fixture.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Collections;
1213
using NHibernate.Cfg;
1314
using NHibernate.Mapping.ByCode;
@@ -118,7 +119,7 @@ public class FixtureByCodeAsync : FixtureBaseAsync
118119
{
119120
protected override IList Mappings
120121
{
121-
get { return new string[0]; }
122+
get { return Array.Empty<string>(); }
122123
}
123124

124125
protected override string MappingsAssembly

‎src/NHibernate.Test/Async/SecondLevelCacheTest/InvalidationTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using System.Reflection;
1515
using NHibernate.Cache;
1616
using NHibernate.Cfg;
17-
using NHibernate.Engine;
1817
using NHibernate.Impl;
1918
using NHibernate.Test.SecondLevelCacheTests;
2019
using NSubstitute;

‎src/NHibernate.Test/Async/TestTestCase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class TestTestCaseAsync : TestCase
2323
{
2424
protected override IList Mappings
2525
{
26-
get { return new string[0]; }
26+
get { return Array.Empty<string>(); }
2727
}
2828

2929
private bool _failOnTearDown;

‎src/NHibernate.Test/Async/TransactionTest/TransactionNotificationFixture.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
//------------------------------------------------------------------------------
99

1010

11+
using System;
1112
using System.Collections;
1213
using System.Data.Common;
1314
using NUnit.Framework;
@@ -21,7 +22,7 @@ public class TransactionNotificationFixtureAsync : TestCase
2122
{
2223
protected override IList Mappings
2324
{
24-
get { return new string[] {}; }
25+
get { return Array.Empty<string>(); }
2526
}
2627

2728
[Test]
@@ -99,4 +100,4 @@ public async Task ShouldNotifyAfterTransactionWithOwnConnectionAsync(bool usePre
99100
Assert.That(interceptor.afterTransactionCompletionCalled, Is.EqualTo(1));
100101
}
101102
}
102-
}
103+
}

‎src/NHibernate.Test/Async/TypesTest/BinaryBlobTypeFixture.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task ReadWriteZeroLenAsync()
6969
using (ISession s = OpenSession())
7070
{
7171
BinaryBlobClass b = new BinaryBlobClass();
72-
b.BinaryBlob = new byte[0];
72+
b.BinaryBlob = Array.Empty<byte>();
7373
savedId = await (s.SaveAsync(b));
7474
await (s.FlushAsync());
7575
}

‎src/NHibernate.Test/Async/TypesTest/BinaryTypeFixture.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public async Task InsertZeroLengthAsync()
7878
BinaryClass bcBinary = new BinaryClass();
7979
bcBinary.Id = 1;
8080

81-
bcBinary.DefaultSize = new byte[0];
82-
bcBinary.WithSize = new byte[0];
81+
bcBinary.DefaultSize = Array.Empty<byte>();
82+
bcBinary.WithSize = Array.Empty<byte>();
8383

8484
ISession s = OpenSession();
8585
ITransaction t = s.BeginTransaction();

‎src/NHibernate.Test/BulkManipulation/BaseFixture.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections;
23
using NHibernate.Hql.Ast.ANTLR;
34
using System.Collections.Generic;
@@ -13,7 +14,7 @@ public class BaseFixture: TestCase
1314

1415
protected override IList Mappings
1516
{
16-
get { return new string[0]; }
17+
get { return Array.Empty<string>(); }
1718
}
1819

1920
#endregion
@@ -38,4 +39,4 @@ public string GetSql(string query)
3839
return qt.SQLString;
3940
}
4041
}
41-
}
42+
}

‎src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Bidirectional/DeleteOneToOneOrphansTest.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Collections;
1+
using System;
2+
using System.Collections;
23
using NHibernate.Cfg;
34
using NHibernate.Mapping.ByCode;
45
using NUnit.Framework;
@@ -92,7 +93,7 @@ public class DeleteOneToOneOrphansTestByCode : DeleteOneToOneOrphansTest
9293
{
9394
protected override IList Mappings
9495
{
95-
get { return new string[0]; }
96+
get { return Array.Empty<string>(); }
9697
}
9798

9899
protected override void AddMappings(Configuration configuration)

‎src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Composite/DeleteOneToOneOrphansTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections;
23
using NHibernate.Cfg.MappingSchema;
34
using NHibernate.Mapping.ByCode;
@@ -93,7 +94,7 @@ public class DeleteOneToOneOrphansTestByCode : DeleteOneToOneOrphansTest
9394
{
9495
protected override IList Mappings
9596
{
96-
get { return new string[0]; }
97+
get { return Array.Empty<string>(); }
9798
}
9899

99100

‎src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Reversed/Bidirectional/DeleteOneToOneOrphansTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections;
23
using NHibernate.Cfg;
34
using NHibernate.Mapping.ByCode;
@@ -92,7 +93,7 @@ public class DeleteOneToOneOrphansTestByCode : DeleteOneToOneOrphansTest
9293
{
9394
protected override IList Mappings
9495
{
95-
get { return new string[0]; }
96+
get { return Array.Empty<string>(); }
9697
}
9798

9899
protected override void AddMappings(Configuration configuration)

‎src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Fk/Reversed/Unidirectional/DeleteOneToOneOrphansTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections;
23
using NHibernate.Cfg;
34
using NHibernate.Mapping.ByCode;
@@ -142,7 +143,7 @@ public class DeleteOneToOneOrphansTestByCode : DeleteOneToOneOrphansTest
142143
{
143144
protected override IList Mappings
144145
{
145-
get { return new string[0]; }
146+
get { return Array.Empty<string>(); }
146147
}
147148

148149
protected override void AddMappings(Configuration configuration)

‎src/NHibernate.Test/Cascade/OneToOneCascadeDelete/Pk/Bidirectional/DeleteOneToOneOrphansTest.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using System.Collections;
23
using NHibernate.Cfg;
34
using NHibernate.Mapping.ByCode;
@@ -95,7 +96,7 @@ public class DeleteOneToOneOrphansTestByCode : DeleteOneToOneOrphansTest
9596
{
9697
protected override IList Mappings
9798
{
98-
get { return new string[0]; }
99+
get { return Array.Empty<string>(); }
99100
}
100101

101102
protected override void AddMappings(Configuration configuration)

0 commit comments

Comments
 (0)