Skip to content

Commit 63ac31b

Browse files
committed
Do no use obsolete members
1 parent d2785cd commit 63ac31b

File tree

1 file changed

+17
-23
lines changed

1 file changed

+17
-23
lines changed

src/NHibernate/Loader/JoinWalker.cs

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -463,19 +463,6 @@ private void WalkEntityAssociationTree(IAssociationType associationType, IOuterJ
463463
/// </summary>
464464
/// Since 5.4
465465
protected virtual void WalkEntityTree(IOuterJoinLoadable persister, string alias, string path)
466-
{
467-
// TODO: inline function
468-
#pragma warning disable 618
469-
WalkEntityTree(persister, alias, path, depth);
470-
#pragma warning restore 618
471-
}
472-
473-
/// <summary>
474-
/// For an entity class, add to a list of associations to be fetched
475-
/// by outerjoin
476-
/// </summary>
477-
[Obsolete("Use or override the overload without the currentDepth parameter")]
478-
protected virtual void WalkEntityTree(IOuterJoinLoadable persister, string alias, string path, int currentDepth)
479466
{
480467
int n = persister.CountSubclassProperties();
481468

@@ -499,24 +486,21 @@ protected virtual void WalkEntityTree(IOuterJoinLoadable persister, string alias
499486
}
500487

501488
/// <summary>
502-
/// For a component, add to a list of associations to be fetched by outerjoin
489+
/// For an entity class, add to a list of associations to be fetched
490+
/// by outerjoin
503491
/// </summary>
504-
/// Since 5.4
505-
protected void WalkComponentTree(IAbstractComponentType componentType, int begin, string alias, string path,
506-
ILhsAssociationTypeSqlInfo associationTypeSQLInfo)
492+
[Obsolete("Use or override the overload without the currentDepth parameter")]
493+
protected virtual void WalkEntityTree(IOuterJoinLoadable persister, string alias, string path, int currentDepth)
507494
{
508-
// TODO: inline function
509-
#pragma warning disable 618
510-
WalkComponentTree(componentType, begin, alias, path, depth, associationTypeSQLInfo);
511-
#pragma warning restore 618
495+
WalkEntityTree(persister, alias, path);
512496
}
513497

514498
/// <summary>
515499
/// For a component, add to a list of associations to be fetched by outerjoin
516500
/// </summary>
517-
[Obsolete("Use or override the overload without the currentDepth parameter")]
501+
/// Since 5.4
518502
protected void WalkComponentTree(IAbstractComponentType componentType, int begin, string alias, string path,
519-
int currentDepth, ILhsAssociationTypeSqlInfo associationTypeSQLInfo)
503+
ILhsAssociationTypeSqlInfo associationTypeSQLInfo)
520504
{
521505
IType[] types = componentType.Subtypes;
522506
string[] propertyNames = componentType.PropertyNames;
@@ -567,6 +551,16 @@ protected void WalkComponentTree(IAbstractComponentType componentType, int begin
567551
}
568552
}
569553

554+
/// <summary>
555+
/// For a component, add to a list of associations to be fetched by outerjoin
556+
/// </summary>
557+
[Obsolete("Use or override the overload without the currentDepth parameter")]
558+
protected void WalkComponentTree(IAbstractComponentType componentType, int begin, string alias, string path,
559+
int currentDepth, ILhsAssociationTypeSqlInfo associationTypeSQLInfo)
560+
{
561+
WalkComponentTree(componentType, begin, alias, path, associationTypeSQLInfo);
562+
}
563+
570564
/// <summary>
571565
/// For a composite element, add to a list of associations to be fetched by outerjoin
572566
/// </summary>

0 commit comments

Comments
 (0)