Skip to content

Commit 8c35edc

Browse files
committed
Remove unnecessary out parameter
1 parent 8bf27ab commit 8c35edc

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

+10-15
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,8 @@ public override void VisitAdditionalFromClause(AdditionalFromClause fromClause,
340340
public override void VisitNhJoinClause(NhJoinClause joinClause, QueryModel queryModel, int index)
341341
{
342342
var querySourceName = VisitorParameters.QuerySourceNamer.GetName(joinClause);
343-
if (TryGetRelatedFetchRequest(joinClause, queryModel, out var fetchRequest))
343+
var fetchRequest = GetRelatedFetchRequest(queryModel, joinClause);
344+
if (fetchRequest != null)
344345
{
345346
RelatedJoinFetchRequests.Add(joinClause, fetchRequest);
346347
}
@@ -391,34 +392,28 @@ public override void VisitResultOperator(ResultOperatorBase resultOperator, Quer
391392
ResultOperatorMap.Process(resultOperator, this, _hqlTree);
392393
}
393394

394-
private bool TryGetRelatedFetchRequest(NhJoinClause joinClause, QueryModel queryModel, out FetchOneRequest fetchRequest)
395+
private FetchOneRequest GetRelatedFetchRequest(QueryModel queryModel, NhJoinClause joinClause)
395396
{
396397
if (joinClause.Restrictions.Count > 0 ||
397398
!(joinClause.FromExpression is MemberExpression memberExpression) ||
398399
!(memberExpression.Expression is QuerySourceReferenceExpression querySource) ||
399400
!IsFetchSupported(queryModel))
400401
{
401-
fetchRequest = null;
402-
return false;
402+
return null;
403403
}
404404

405405
if (querySource.ReferencedQuerySource is MainFromClause)
406406
{
407-
fetchRequest = queryModel.ResultOperators.OfType<FetchOneRequest>()
408-
.FirstOrDefault(o => o.RelationMember == memberExpression.Member);
407+
return queryModel.ResultOperators.OfType<FetchOneRequest>().FirstOrDefault(o => o.RelationMember == memberExpression.Member);
409408
}
410-
else if (querySource.ReferencedQuerySource is NhJoinClause parentJoinClause &&
411-
RelatedJoinFetchRequests.TryGetValue(parentJoinClause, out var parentFetchRequest))
412-
{
413-
fetchRequest = parentFetchRequest.InnerFetchRequests.OfType<FetchOneRequest>()
414-
.FirstOrDefault(o => o.RelationMember == memberExpression.Member);
415-
}
416-
else
409+
410+
if (querySource.ReferencedQuerySource is NhJoinClause parentJoinClause &&
411+
RelatedJoinFetchRequests.TryGetValue(parentJoinClause, out var parentFetchRequest))
417412
{
418-
fetchRequest = null;
413+
return parentFetchRequest.InnerFetchRequests.OfType<FetchOneRequest>().FirstOrDefault(o => o.RelationMember == memberExpression.Member);
419414
}
420415

421-
return fetchRequest != null;
416+
return null;
422417
}
423418

424419
private static bool IsFetchSupported(QueryModel queryModel)

0 commit comments

Comments
 (0)