Skip to content

Commit 817d85b

Browse files
committed
clean up
1 parent fffd3c5 commit 817d85b

File tree

3 files changed

+6
-11
lines changed

3 files changed

+6
-11
lines changed

src/NHibernate/Impl/CriteriaImpl.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public partial class CriteriaImpl : ICriteria, ISupportEntityJoinCriteria
4242

4343
private readonly Dictionary<string, ICriteria> subcriteriaByPath = new Dictionary<string, ICriteria>();
4444
private readonly Dictionary<string, ICriteria> subcriteriaByAlias = new Dictionary<string, ICriteria>();
45-
4645
private readonly string entityOrClassName;
4746

4847
// Projection Fields
@@ -72,7 +71,7 @@ public CriteriaImpl(string entityOrClassName, string alias, ISessionImplementor
7271
rootAlias = alias;
7372
subcriteriaByAlias[alias] = this;
7473
}
75-
74+
7675
public ISessionImplementor Session
7776
{
7877
get { return session; }
@@ -676,7 +675,7 @@ internal Subcriteria(CriteriaImpl root, ICriteria parent, string path, JoinType
676675
: this(root, parent, path, null, joinType) { }
677676

678677
/// <summary>
679-
/// Entity name for "Entity Join" - join for enitity with not mapped association
678+
/// Entity name for "Entity Join" - join for entity with not mapped association
680679
/// </summary>
681680
public string JoinEntityName { get; }
682681

src/NHibernate/Loader/Criteria/CriteriaJoinWalker.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ protected override void AddAssociations()
8383
{
8484
var tableAlias = translator.GetSQLAlias(entityJoinInfo.Criteria);
8585
var criteriaPath = entityJoinInfo.Criteria.Alias; //path for entity join is equal to alias
86-
var persister
87-
= entityJoinInfo.Persister as IOuterJoinLoadable;
86+
var persister = entityJoinInfo.Persister as IOuterJoinLoadable;
8887
AddExplicitEntityJoinAssociation(persister, tableAlias, translator.GetJoinType(criteriaPath), GetWithClause(criteriaPath));
8988
IncludeInResultIfNeeded(persister, entityJoinInfo.Criteria, tableAlias);
9089
//collect mapped associations for entity join

src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ private Persister.Entity.IJoinable GetPathJoinable(string path)
452452
{
453453
last = entityJoinInfo.Persister;
454454
lastEntity = (IPropertyMapping) last;
455-
++i;
455+
i++;
456456
}
457457

458458
string componentPath = string.Empty;
@@ -500,7 +500,7 @@ private ICriteriaInfoProvider GetPathInfo(string path, ICriteriaInfoProvider roo
500500
if (entityJoins.TryGetValue(tokens[0], out var entityJoinInfo))
501501
{
502502
provider = new EntityCriteriaInfoProvider(entityJoinInfo.Persister);
503-
++i;
503+
i++;
504504
}
505505

506506
string componentPath = string.Empty;
@@ -528,10 +528,7 @@ private ICriteriaInfoProvider GetPathInfo(string path, ICriteriaInfoProvider roo
528528
else
529529
{
530530
provider = new EntityCriteriaInfoProvider(
531-
GetQueryablePersister(
532-
atype.GetAssociatedEntityName(
533-
sessionFactory)
534-
));
531+
GetQueryablePersister(atype.GetAssociatedEntityName(sessionFactory)));
535532
}
536533

537534
componentPath = string.Empty;

0 commit comments

Comments
 (0)