Skip to content

Commit 42fbb06

Browse files
FlukeFanFlukeFan
committedNov 30, 2009
Refactored generic type naming for IQueryOver and removed a couple of compiler warnings.
SVN: trunk@4876
·
end-of-branch-ReadOnlyEntities3.0.0.Alpha1
1 parent 79821cd commit 42fbb06

11 files changed

+495
-485
lines changed
 

‎src/NHibernate.Test/Criteria/Lambda/LambdaFixtureBase.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected DetachedCriteria ToDetachedCriteria<T>(QueryOver<T> actual)
6464
{
6565
ICriteria criteria = actual.UnderlyingCriteria;
6666
CriteriaImpl criteriaImpl = (CriteriaImpl)
67-
typeof(QueryOver<T>).GetField("_impl", BindingFlags.NonPublic | BindingFlags.Instance)
67+
typeof(QueryOver<T>).GetField("impl", BindingFlags.NonPublic | BindingFlags.Instance)
6868
.GetValue(actual);
6969

7070
return (DetachedCriteria)

‎src/NHibernate/Criterion/Lambda/QueryOverFetchBuilder.cs

+10-10
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@
99
namespace NHibernate.Criterion
1010
{
1111

12-
public class QueryOverFetchBuilder<S,T> : QueryOverFetchBuilderBase<QueryOver<S,T>, S, T>
12+
public class QueryOverFetchBuilder<TRoot,TSubType> : QueryOverFetchBuilderBase<QueryOver<TRoot,TSubType>, TRoot, TSubType>
1313
{
1414

15-
public QueryOverFetchBuilder(QueryOver<S,T> root, Expression<Func<S, object>> path)
15+
public QueryOverFetchBuilder(QueryOver<TRoot,TSubType> root, Expression<Func<TRoot, object>> path)
1616
: base(root, path) { }
1717

1818
}
1919

20-
public class IQueryOverFetchBuilder<S,T> : QueryOverFetchBuilderBase<IQueryOver<S,T>, S, T>
20+
public class IQueryOverFetchBuilder<TRoot,TSubType> : QueryOverFetchBuilderBase<IQueryOver<TRoot,TSubType>, TRoot, TSubType>
2121
{
2222

23-
public IQueryOverFetchBuilder(IQueryOver<S,T> root, Expression<Func<S, object>> path)
23+
public IQueryOverFetchBuilder(IQueryOver<TRoot,TSubType> root, Expression<Func<TRoot, object>> path)
2424
: base(root, path) { }
2525

2626
}
2727

28-
public class QueryOverFetchBuilderBase<R, S, T> where R : IQueryOver<S,T>
28+
public class QueryOverFetchBuilderBase<TReturn, TRoot, TSubType> where TReturn : IQueryOver<TRoot,TSubType>
2929
{
3030

31-
protected R root;
31+
protected TReturn root;
3232
protected string path;
3333

34-
protected QueryOverFetchBuilderBase(R root, Expression<Func<S, object>> path)
34+
protected QueryOverFetchBuilderBase(TReturn root, Expression<Func<TRoot, object>> path)
3535
{
3636
this.root = root;
3737
this.path = ExpressionProcessor.FindMemberExpression(path.Body);
3838
}
3939

40-
public R Eager
40+
public TReturn Eager
4141
{
4242
get
4343
{
@@ -46,7 +46,7 @@ public R Eager
4646
}
4747
}
4848

49-
public R Lazy
49+
public TReturn Lazy
5050
{
5151
get
5252
{
@@ -55,7 +55,7 @@ public R Lazy
5555
}
5656
}
5757

58-
public R Default
58+
public TReturn Default
5959
{
6060
get
6161
{

‎src/NHibernate/Criterion/Lambda/QueryOverJoinBuilder.cs

+27-27
Original file line numberDiff line numberDiff line change
@@ -9,118 +9,118 @@
99
namespace NHibernate.Criterion.Lambda
1010
{
1111

12-
public class QueryOverJoinBuilder<S,T> : QueryOverJoinBuilderBase<QueryOver<S,T>, S, T>
12+
public class QueryOverJoinBuilder<TRoot,TSubType> : QueryOverJoinBuilderBase<QueryOver<TRoot,TSubType>, TRoot, TSubType>
1313
{
14-
public QueryOverJoinBuilder(QueryOver<S,T> root, JoinType joinType) : base(root, joinType) { }
14+
public QueryOverJoinBuilder(QueryOver<TRoot,TSubType> root, JoinType joinType) : base(root, joinType) { }
1515

16-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, U>> path)
16+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, U>> path)
1717
{
1818
return root.JoinQueryOver<U>(path, joinType);
1919
}
2020

21-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<U>> path)
21+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<U>> path)
2222
{
2323
return root.JoinQueryOver<U>(path, joinType);
2424
}
2525

26-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias)
26+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, U>> path, Expression<Func<U>> alias)
2727
{
2828
return root.JoinQueryOver<U>(path, alias, joinType);
2929
}
3030

31-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<U>> path, Expression<Func<U>> alias)
31+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<U>> path, Expression<Func<U>> alias)
3232
{
3333
return root.JoinQueryOver<U>(path, alias, joinType);
3434
}
3535

36-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
36+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, IEnumerable<U>>> path)
3737
{
3838
return root.JoinQueryOver<U>(path, joinType);
3939
}
4040

41-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path)
41+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path)
4242
{
4343
return root.JoinQueryOver<U>(path, joinType);
4444
}
4545

46-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias)
46+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, IEnumerable<U>>> path, Expression<Func<U>> alias)
4747
{
4848
return root.JoinQueryOver<U>(path, alias, joinType);
4949
}
5050

51-
public QueryOver<S,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path, Expression<Func<U>> alias)
51+
public QueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path, Expression<Func<U>> alias)
5252
{
5353
return root.JoinQueryOver<U>(path, alias, joinType);
5454
}
5555

5656
}
5757

58-
public class IQueryOverJoinBuilder<S,T> : QueryOverJoinBuilderBase<IQueryOver<S,T>, S, T>
58+
public class IQueryOverJoinBuilder<TRoot,TSubType> : QueryOverJoinBuilderBase<IQueryOver<TRoot,TSubType>, TRoot, TSubType>
5959
{
60-
public IQueryOverJoinBuilder(IQueryOver<S,T> root, JoinType joinType) : base(root, joinType) { }
60+
public IQueryOverJoinBuilder(IQueryOver<TRoot,TSubType> root, JoinType joinType) : base(root, joinType) { }
6161

62-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, U>> path)
62+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, U>> path)
6363
{
6464
return root.JoinQueryOver<U>(path, joinType);
6565
}
6666

67-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<U>> path)
67+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<U>> path)
6868
{
6969
return root.JoinQueryOver<U>(path, joinType);
7070
}
7171

72-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, U>> path, Expression<Func<U>> alias)
72+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, U>> path, Expression<Func<U>> alias)
7373
{
7474
return root.JoinQueryOver<U>(path, alias, joinType);
7575
}
7676

77-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<U>> path, Expression<Func<U>> alias)
77+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<U>> path, Expression<Func<U>> alias)
7878
{
7979
return root.JoinQueryOver<U>(path, alias, joinType);
8080
}
8181

82-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path)
82+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, IEnumerable<U>>> path)
8383
{
8484
return root.JoinQueryOver<U>(path, joinType);
8585
}
8686

87-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path)
87+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path)
8888
{
8989
return root.JoinQueryOver<U>(path, joinType);
9090
}
9191

92-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<T, IEnumerable<U>>> path, Expression<Func<U>> alias)
92+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<TSubType, IEnumerable<U>>> path, Expression<Func<U>> alias)
9393
{
9494
return root.JoinQueryOver<U>(path, alias, joinType);
9595
}
9696

97-
public IQueryOver<S,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path, Expression<Func<U>> alias)
97+
public IQueryOver<TRoot,U> JoinQueryOver<U>(Expression<Func<IEnumerable<U>>> path, Expression<Func<U>> alias)
9898
{
9999
return root.JoinQueryOver<U>(path, alias, joinType);
100100
}
101101

102102
}
103103

104-
public class QueryOverJoinBuilderBase<R, S, T> where R : IQueryOver<S,T>
104+
public class QueryOverJoinBuilderBase<TReturn, TRoot, TSubType> where TReturn : IQueryOver<TRoot,TSubType>
105105
{
106106

107-
protected R root;
107+
protected TReturn root;
108108
protected JoinType joinType;
109109

110-
public QueryOverJoinBuilderBase(R root, JoinType joinType)
110+
public QueryOverJoinBuilderBase(TReturn root, JoinType joinType)
111111
{
112112
this.root = root;
113113
this.joinType = joinType;
114114
}
115115

116-
public R JoinAlias(Expression<Func<T, object>> path, Expression<Func<object>> alias)
116+
public TReturn JoinAlias(Expression<Func<TSubType, object>> path, Expression<Func<object>> alias)
117117
{
118-
return (R)root.JoinAlias(path, alias, joinType);
118+
return (TReturn)root.JoinAlias(path, alias, joinType);
119119
}
120120

121-
public R JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias)
121+
public TReturn JoinAlias(Expression<Func<object>> path, Expression<Func<object>> alias)
122122
{
123-
return (R)root.JoinAlias(path, alias, joinType);
123+
return (TReturn)root.JoinAlias(path, alias, joinType);
124124
}
125125

126126
}

‎src/NHibernate/Criterion/Lambda/QueryOverLockBuilder.cs

+13-13
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,29 @@
99
namespace NHibernate.Criterion.Lambda
1010
{
1111

12-
public class QueryOverLockBuilder<S,T> : QueryOverLockBuilderBase<QueryOver<S,T>, S, T>
12+
public class QueryOverLockBuilder<TRoot,TSubType> : QueryOverLockBuilderBase<QueryOver<TRoot,TSubType>, TRoot, TSubType>
1313
{
1414

15-
public QueryOverLockBuilder(QueryOver<S,T> root, Expression<Func<object>> alias)
15+
public QueryOverLockBuilder(QueryOver<TRoot,TSubType> root, Expression<Func<object>> alias)
1616
: base(root, alias) { }
1717

1818
}
1919

20-
public class IQueryOverLockBuilder<S,T> : QueryOverLockBuilderBase<IQueryOver<S,T>, S, T>
20+
public class IQueryOverLockBuilder<TRoot,TSubType> : QueryOverLockBuilderBase<IQueryOver<TRoot,TSubType>, TRoot, TSubType>
2121
{
2222

23-
public IQueryOverLockBuilder(IQueryOver<S,T> root, Expression<Func<object>> alias)
23+
public IQueryOverLockBuilder(IQueryOver<TRoot,TSubType> root, Expression<Func<object>> alias)
2424
: base(root, alias) { }
2525

2626
}
2727

28-
public class QueryOverLockBuilderBase<R, S, T> where R : IQueryOver<S,T>
28+
public class QueryOverLockBuilderBase<TReturn, TRoot, TSubType> where TReturn : IQueryOver<TRoot,TSubType>
2929
{
3030

31-
protected R root;
31+
protected TReturn root;
3232
protected string alias;
3333

34-
protected QueryOverLockBuilderBase(R root, Expression<Func<object>> alias)
34+
protected QueryOverLockBuilderBase(TReturn root, Expression<Func<object>> alias)
3535
{
3636
this.root = root;
3737

@@ -47,7 +47,7 @@ private void SetLockMode(LockMode lockMode)
4747
root.UnderlyingCriteria.SetLockMode(lockMode);
4848
}
4949

50-
public R Force
50+
public TReturn Force
5151
{
5252
get
5353
{
@@ -56,7 +56,7 @@ public R Force
5656
}
5757
}
5858

59-
public R None
59+
public TReturn None
6060
{
6161
get
6262
{
@@ -65,7 +65,7 @@ public R None
6565
}
6666
}
6767

68-
public R Read
68+
public TReturn Read
6969
{
7070
get
7171
{
@@ -74,7 +74,7 @@ public R Read
7474
}
7575
}
7676

77-
public R Upgrade
77+
public TReturn Upgrade
7878
{
7979
get
8080
{
@@ -83,7 +83,7 @@ public R Upgrade
8383
}
8484
}
8585

86-
public R UpgradeNoWait
86+
public TReturn UpgradeNoWait
8787
{
8888
get
8989
{
@@ -92,7 +92,7 @@ public R UpgradeNoWait
9292
}
9393
}
9494

95-
public R Write
95+
public TReturn Write
9696
{
9797
get
9898
{

‎src/NHibernate/Criterion/Lambda/QueryOverOrderBuilder.cs

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,47 @@
99
namespace NHibernate.Criterion.Lambda
1010
{
1111

12-
public class QueryOverOrderBuilder<S,T> : QueryOverOrderBuilderBase<QueryOver<S,T>, S, T>
12+
public class QueryOverOrderBuilder<TRoot,TSubType> : QueryOverOrderBuilderBase<QueryOver<TRoot,TSubType>, TRoot, TSubType>
1313
{
1414

15-
public QueryOverOrderBuilder(QueryOver<S,T> root, Expression<Func<T, object>> path) : base(root, path)
15+
public QueryOverOrderBuilder(QueryOver<TRoot,TSubType> root, Expression<Func<TSubType, object>> path) : base(root, path)
1616
{}
1717

18-
public QueryOverOrderBuilder(QueryOver<S,T> root, Expression<Func<object>> path) : base(root, path)
18+
public QueryOverOrderBuilder(QueryOver<TRoot,TSubType> root, Expression<Func<object>> path) : base(root, path)
1919
{}
2020

2121
}
2222

23-
public class IQueryOverOrderBuilder<S,T> : QueryOverOrderBuilderBase<IQueryOver<S,T>, S, T>
23+
public class IQueryOverOrderBuilder<TRoot,TSubType> : QueryOverOrderBuilderBase<IQueryOver<TRoot,TSubType>, TRoot, TSubType>
2424
{
2525

26-
public IQueryOverOrderBuilder(IQueryOver<S,T> root, Expression<Func<T, object>> path) : base(root, path)
26+
public IQueryOverOrderBuilder(IQueryOver<TRoot,TSubType> root, Expression<Func<TSubType, object>> path) : base(root, path)
2727
{}
2828

29-
public IQueryOverOrderBuilder(IQueryOver<S,T> root, Expression<Func<object>> path) : base(root, path)
29+
public IQueryOverOrderBuilder(IQueryOver<TRoot,TSubType> root, Expression<Func<object>> path) : base(root, path)
3030
{}
3131

3232
}
3333

34-
public class QueryOverOrderBuilderBase<R, S, T> where R : IQueryOver<S, T>
34+
public class QueryOverOrderBuilderBase<TReturn, TRoot, TSubType> where TReturn : IQueryOver<TRoot, TSubType>
3535
{
3636

37-
protected R root;
37+
protected TReturn root;
3838
protected LambdaExpression path;
3939

40-
protected QueryOverOrderBuilderBase(R root, Expression<Func<T, object>> path)
40+
protected QueryOverOrderBuilderBase(TReturn root, Expression<Func<TSubType, object>> path)
4141
{
4242
this.root = root;
4343
this.path = path;
4444
}
4545

46-
protected QueryOverOrderBuilderBase(R root, Expression<Func<object>> path)
46+
protected QueryOverOrderBuilderBase(TReturn root, Expression<Func<object>> path)
4747
{
4848
this.root = root;
4949
this.path = path;
5050
}
5151

52-
public R Asc
52+
public TReturn Asc
5353
{
5454
get
5555
{
@@ -58,7 +58,7 @@ public R Asc
5858
}
5959
}
6060

61-
public R Desc
61+
public TReturn Desc
6262
{
6363
get
6464
{

0 commit comments

Comments
 (0)