Skip to content

Commit 6ec649f

Browse files
Simplify LINQ query by dropping explicit .Where() calls (#571)
+semver:patch
1 parent 9b59d36 commit 6ec649f

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/ComponentConventionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
7979
var modelInstance = (ComponentMapping)generatedModels
8080
.First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(PropertyTarget)) != null)
8181
.Classes.First()
82-
.Components.Where(x => x is ComponentMapping).First();
82+
.Components.First(x => x is ComponentMapping);
8383

8484
modelVerification(modelInstance);
8585
}

src/FluentNHibernate.Testing/ConventionsTests/ApplyingToModel/DynamicComponentConventionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
8585
var modelInstance = (ComponentMapping)generatedModels
8686
.First(x => x.Classes.FirstOrDefault(c => c.Type == typeof(PropertyTarget)) != null)
8787
.Classes.First()
88-
.Components.Where(x => x is ComponentMapping).First();
88+
.Components.First(x => x is ComponentMapping);
8989

9090
modelVerification(modelInstance);
9191
}

src/FluentNHibernate.Testing/ConventionsTests/OverridingFluentInterface/ComponentConventionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private void VerifyModel(Action<ComponentMapping> modelVerification)
9999
var modelInstance = (ComponentMapping)generatedModels
100100
.First(x => x.Classes.FirstOrDefault(c => c.Type == mappingType) != null)
101101
.Classes.First()
102-
.Components.Where(x => x is ComponentMapping).First();
102+
.Components.First(x => x is ComponentMapping);
103103

104104
modelVerification(modelInstance);
105105
}

src/FluentNHibernate.Testing/FluentInterfaceTests/ManyToManyTableNameTests.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public void ShouldHaveSameTableNameForBothSidesOfMapping()
3030

3131
var mappings = model.BuildMappings();
3232

33-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
34-
var rightMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Right)).First();
33+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
34+
var rightMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Right));
3535

3636
leftMapping.Collections.First().TableName.ShouldEqual("LeftsToRights");
3737
rightMapping.Collections.First().TableName.ShouldEqual("LeftsToRights");
@@ -57,8 +57,8 @@ public void ShouldHaveSameTableNameForBothSidesOfMappingWhenLeftSpecified()
5757

5858
var mappings = model.BuildMappings();
5959

60-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
61-
var rightMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Right)).First();
60+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
61+
var rightMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Right));
6262

6363
leftMapping.Collections.First().TableName.ShouldEqual("MyJoinTable");
6464
rightMapping.Collections.First().TableName.ShouldEqual("MyJoinTable");
@@ -84,8 +84,8 @@ public void ShouldHaveSameTableNameForBothSidesOfMappingWhenRightSpecified()
8484

8585
var mappings = model.BuildMappings();
8686

87-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
88-
var rightMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Right)).First();
87+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
88+
var rightMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Right));
8989

9090
leftMapping.Collections.First().TableName.ShouldEqual("MyJoinTable");
9191
rightMapping.Collections.First().TableName.ShouldEqual("MyJoinTable");
@@ -109,7 +109,7 @@ public void ShouldHaveSameTableNameForUniDirectionalMapping()
109109

110110
var mappings = model.BuildMappings();
111111

112-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
112+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
113113

114114
leftMapping.Collections.First().TableName.ShouldEqual("RightToLeft");
115115
}
@@ -135,8 +135,8 @@ public void ShouldHaveSameTableNameForBothSidesOfMappingWhenHasMultipleBiDirecti
135135

136136
var mappings = model.BuildMappings();
137137

138-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
139-
var rightMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Right)).First();
138+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
139+
var rightMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Right));
140140

141141
leftMapping.Collections.First().TableName.ShouldEqual("LeftsToRights");
142142
rightMapping.Collections.First().TableName.ShouldEqual("LeftsToRights");
@@ -165,8 +165,8 @@ public void ShouldAllowConventionsToAlterBiDirectionalTableNames()
165165

166166
var mappings = model.BuildMappings();
167167

168-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
169-
var rightMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Right)).First();
168+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
169+
var rightMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Right));
170170

171171
leftMapping.Collections.First().TableName.ShouldEqual("Lefts_Rights");
172172
rightMapping.Collections.First().TableName.ShouldEqual("Lefts_Rights");
@@ -191,7 +191,7 @@ public void ShouldAllowConventionsToAlterUniDirectionalTableNames()
191191

192192
var mappings = model.BuildMappings();
193193

194-
var leftMapping = mappings.SelectMany(x => x.Classes).Where(x => x.Type == typeof(Left)).First();
194+
var leftMapping = mappings.SelectMany(x => x.Classes).First(x => x.Type == typeof(Left));
195195

196196
leftMapping.Collections.First().TableName.ShouldEqual("RightUni");
197197
}

0 commit comments

Comments
 (0)