Skip to content

Commit 55ca5d6

Browse files
fredericDelaportefredericDelaporte
committed
NH-4075 - Remove old obsolete
And flag recent ones with the version in which they were obsoleted.
1 parent fc81792 commit 55ca5d6

16 files changed

+23
-147
lines changed

‎src/NHibernate/AdoNet/Util/SqlStatementLogger.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -141,14 +141,6 @@ public string GetParameterLoggableValue(DbParameter parameter)
141141

142142
}
143143

144-
145-
[Obsolete("Use GetParameterLoggableValue(parameter) instead.")]
146-
public string GetParameterLogableValue(DbParameter parameter)
147-
{
148-
return GetParameterLoggableValue(parameter);
149-
}
150-
151-
152144
private static string GetBufferAsHexString(byte[] buffer)
153145
{
154146
const int maxBytes = 128;

‎src/NHibernate/Cfg/Environment.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ public static string Version
8787
/// <summary> A default database catalog name to use for unqualified tablenames</summary>
8888
public const string DefaultCatalog = "default_catalog";
8989

90+
// Since v5
9091
[Obsolete("DefaultEntityMode is deprecated.")]
9192
public const string DefaultEntityMode = "default_entity_mode";
9293

‎src/NHibernate/Engine/ISessionImplementor.cs

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,6 @@ public interface ISessionImplementor
7474
/// </summary>
7575
IBatcher Batcher { get; }
7676

77-
/// <summary>
78-
/// Execute a <c>List()</c> query
79-
/// </summary>
80-
/// <param name="query"></param>
81-
/// <param name="parameters"></param>
82-
/// <returns></returns>
83-
[Obsolete("Use overload with IQueryExpression")]
84-
IList List(string query, QueryParameters parameters);
85-
8677
/// <summary>
8778
/// Execute a <c>List()</c> expression query
8879
/// </summary>
@@ -98,17 +89,8 @@ public interface ISessionImplementor
9889
/// </summary>
9990
IQuery CreateQuery(IQueryExpression queryExpression);
10091

101-
[Obsolete("Use overload with IQueryExpression")]
102-
void List(string query, QueryParameters parameters, IList results);
103-
10492
void List(IQueryExpression queryExpression, QueryParameters queryParameters, IList results);
10593

106-
/// <summary>
107-
/// Strongly-typed version of <see cref="List(string,QueryParameters)" />
108-
/// </summary>
109-
[Obsolete("Use overload with IQueryExpression")]
110-
IList<T> List<T>(string query, QueryParameters queryParameters);
111-
11294
/// <summary>
11395
/// Strongly-typed version of <see cref="List(IQueryExpression,QueryParameters)" />
11496
/// </summary>
@@ -123,15 +105,6 @@ public interface ISessionImplementor
123105

124106
IList List(CriteriaImpl criteria);
125107

126-
/// <summary>
127-
/// Execute an <c>Iterate()</c> query
128-
/// </summary>
129-
/// <param name="query"></param>
130-
/// <param name="parameters"></param>
131-
/// <returns></returns>
132-
[Obsolete("Use overload with IQueryExpression")]
133-
IEnumerable Enumerable(string query, QueryParameters parameters);
134-
135108
/// <summary>
136109
/// Execute an <c>Iterate()</c> query
137110
/// </summary>
@@ -140,12 +113,6 @@ public interface ISessionImplementor
140113
/// <returns></returns>
141114
IEnumerable Enumerable(IQueryExpression query, QueryParameters parameters);
142115

143-
/// <summary>
144-
/// Strongly-typed version of <see cref="Enumerable(string, QueryParameters)" />
145-
/// </summary>
146-
[Obsolete("Use overload with IQueryExpression")]
147-
IEnumerable<T> Enumerable<T>(string query, QueryParameters queryParameters);
148-
149116
/// <summary>
150117
/// Strongly-typed version of <see cref="Enumerable(IQueryExpression, QueryParameters)" />
151118
/// </summary>
@@ -250,9 +217,6 @@ public interface ISessionImplementor
250217
IDictionary<string, IFilter> EnabledFilters { get; }
251218

252219
IQuery GetNamedSQLQuery(string name);
253-
254-
[Obsolete("Use overload with IQueryExpression")]
255-
IQueryTranslator[] GetQueries(string query, bool scalar); // NH specific for MultiQuery
256220

257221
IQueryTranslator[] GetQueries(IQueryExpression query, bool scalar); // NH specific for MultiQuery
258222

@@ -322,10 +286,6 @@ public interface ISessionImplementor
322286
/// <summary> Execute a native SQL update or delete query</summary>
323287
int ExecuteNativeUpdate(NativeSQLQuerySpecification specification, QueryParameters queryParameters);
324288

325-
/// <summary> Execute a HQL update or delete query</summary>
326-
[Obsolete("Use overload with IQueryExpression")]
327-
int ExecuteUpdate(string query, QueryParameters queryParameters);
328-
329289
/// <summary> Execute a HQL update or delete query</summary>
330290
int ExecuteUpdate(IQueryExpression query, QueryParameters queryParameters);
331291

‎src/NHibernate/Engine/Query/QueryPlanCache.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ public ParameterMetadata GetSQLParameterMetadata(string query)
4747
return metadata;
4848
}
4949

50-
[Obsolete("Please use overload with IQueryExpression")]
51-
public IQueryPlan GetHQLQueryPlan(string queryString, bool shallow, IDictionary<string, IFilter> enabledFilters)
52-
{
53-
return GetHQLQueryPlan(queryString.ToQueryExpression(), shallow, enabledFilters);
54-
}
55-
5650
public IQueryExpressionPlan GetHQLQueryPlan(IQueryExpression queryExpression, bool shallow, IDictionary<string, IFilter> enabledFilters)
5751
{
5852
var key = new HQLQueryPlanKey(queryExpression, shallow, enabledFilters);

‎src/NHibernate/Hql/Ast/ANTLR/ASTQueryTranslatorFactory.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ namespace NHibernate.Hql.Ast.ANTLR
1414
/// </summary>
1515
public class ASTQueryTranslatorFactory : IQueryTranslatorFactory
1616
{
17-
public IQueryTranslator[] CreateQueryTranslators(string queryString, string collectionRole, bool shallow, IDictionary<string, IFilter> filters, ISessionFactoryImplementor factory)
18-
{
19-
return CreateQueryTranslators(queryString.ToQueryExpression(), collectionRole, shallow, filters, factory);
20-
}
21-
2217
public IQueryTranslator[] CreateQueryTranslators(IQueryExpression queryExpression, string collectionRole, bool shallow, IDictionary<string, IFilter> filters, ISessionFactoryImplementor factory)
2318
{
2419
return CreateQueryTranslators(queryExpression.Translate(factory, collectionRole != null), queryExpression.Key, collectionRole, shallow, filters, factory);

‎src/NHibernate/Hql/Ast/HqlTreeNode.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ public static HqlExpression AsExpression(this HqlTreeNode node)
112112
return (HqlExpression)node;
113113
}
114114

115+
// Since v5
115116
[Obsolete]
116117
public static HqlBooleanExpression AsBooleanExpression(this HqlTreeNode node)
117118
{

‎src/NHibernate/Hql/IQueryTranslatorFactory.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,6 @@ namespace NHibernate.Hql
1010
/// </summary>
1111
public interface IQueryTranslatorFactory
1212
{
13-
/// <summary>
14-
/// Construct a <see cref="NHibernate.Hql.IQueryTranslator"/> instance
15-
/// capable of translating an HQL query string.
16-
/// </summary>
17-
/// <param name="queryString">The query string to be translated</param>
18-
/// <param name="collectionRole"></param>
19-
/// <param name="shallow"></param>
20-
/// <param name="filters">Currently enabled filters</param>
21-
/// <param name="factory">The session factory</param>
22-
/// <returns>An appropriate translator.</returns>
23-
[Obsolete("Use overload with IQueryExpression")]
24-
IQueryTranslator[] CreateQueryTranslators(string queryString, string collectionRole, bool shallow, IDictionary<string, IFilter> filters, ISessionFactoryImplementor factory);
25-
2613
/// <summary>
2714
/// Construct a <see cref="NHibernate.Hql.IQueryTranslator"/> instance
2815
/// capable of translating a Linq expression.
@@ -35,4 +22,4 @@ public interface IQueryTranslatorFactory
3522
/// <returns>An appropriate translator.</returns>
3623
IQueryTranslator[] CreateQueryTranslators(IQueryExpression queryExpression, string collectionRole, bool shallow, IDictionary<string, IFilter> filters, ISessionFactoryImplementor factory);
3724
}
38-
}
25+
}

‎src/NHibernate/Impl/AbstractSessionImpl.cs

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -83,24 +83,6 @@ public ISessionFactoryImplementor Factory
8383
public abstract IBatcher Batcher { get; }
8484
public abstract void CloseSessionFromDistributedTransaction();
8585

86-
[Obsolete("Use overload with IQueryExpression")]
87-
public virtual IList List(string query, QueryParameters parameters)
88-
{
89-
return List(query.ToQueryExpression(), parameters);
90-
}
91-
92-
[Obsolete("Use overload with IQueryExpression")]
93-
public virtual void List(string query, QueryParameters queryParameters, IList results)
94-
{
95-
List(query.ToQueryExpression(), queryParameters, results);
96-
}
97-
98-
[Obsolete("Use overload with IQueryExpression")]
99-
public virtual IList<T> List<T>(string query, QueryParameters queryParameters)
100-
{
101-
return List<T>(query.ToQueryExpression(), queryParameters);
102-
}
103-
10486
public virtual IList List(IQueryExpression queryExpression, QueryParameters parameters)
10587
{
10688
var results = (IList)typeof(List<>)
@@ -224,12 +206,6 @@ public virtual IQuery GetNamedSQLQuery(string name)
224206
}
225207
}
226208

227-
[Obsolete("Use overload with IQueryExpression")]
228-
public virtual IQueryTranslator[] GetQueries(string query, bool scalar)
229-
{
230-
return GetQueries(query.ToQueryExpression(), scalar);
231-
}
232-
233209
public abstract IQueryTranslator[] GetQueries(IQueryExpression query, bool scalar);
234210
public abstract EventListeners Listeners { get; }
235211
public abstract int DontFlushFromFind { get; }
@@ -394,12 +370,6 @@ public virtual ISQLQuery CreateSQLQuery(string sql)
394370
}
395371
}
396372

397-
[Obsolete("Please use overload with IQueryExpression")]
398-
protected internal virtual IQueryPlan GetHQLQueryPlan(string query, bool shallow)
399-
{
400-
return GetHQLQueryPlan(query.ToQueryExpression(), shallow);
401-
}
402-
403373
protected internal virtual IQueryExpressionPlan GetHQLQueryPlan(IQueryExpression queryExpression, bool shallow)
404374
{
405375
using (new SessionIdLoggingContext(SessionId))
@@ -457,26 +427,8 @@ internal IOuterJoinLoadable GetOuterJoinLoadable(string entityName)
457427

458428
public abstract IEnumerable Enumerable(IQueryExpression queryExpression, QueryParameters queryParameters);
459429

460-
[Obsolete("Use overload with IQueryExpression")]
461-
public virtual IEnumerable Enumerable(string query, QueryParameters queryParameters)
462-
{
463-
return Enumerable(query.ToQueryExpression(), queryParameters);
464-
}
465-
466-
[Obsolete("Use overload with IQueryExpression")]
467-
public virtual IEnumerable<T> Enumerable<T>(string query, QueryParameters queryParameters)
468-
{
469-
return Enumerable<T>(query.ToQueryExpression(), queryParameters);
470-
}
471-
472430
public abstract IEnumerable<T> Enumerable<T>(IQueryExpression queryExpression, QueryParameters queryParameters);
473431

474-
[Obsolete("Use overload with IQueryExpression")]
475-
public virtual int ExecuteUpdate(string query, QueryParameters queryParameters)
476-
{
477-
return ExecuteUpdate(query.ToQueryExpression(), queryParameters);
478-
}
479-
480432
public abstract int ExecuteUpdate(IQueryExpression queryExpression, QueryParameters queryParameters);
481433
}
482434
}

‎src/NHibernate/Linq/EnumerableHelper.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
namespace NHibernate.Linq
88
{
9+
// Since v5
910
[Obsolete("Please use NHibernate.Util.ReflectHelper instead")]
1011
public static class ReflectionHelper
1112
{
@@ -66,6 +67,7 @@ public static MemberInfo GetProperty<TSource, TResult>(Expression<Func<TSource,
6667
}
6768
}
6869

70+
// Since v5
6971
[Obsolete("Please use NHibernate.Util.ReflectHelper instead")]
7072
public static class EnumerableHelper
7173
{
@@ -88,4 +90,4 @@ public static MethodInfo GetMethod(string name, System.Type[] parameterTypes, Sy
8890
.MakeGenericMethod(genericTypeParameters);
8991
}
9092
}
91-
}
93+
}

‎src/NHibernate/Linq/LinqExtensionMethods.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,18 +106,22 @@ public static IQueryable<T> SetOptions<T>(this IQueryable<T> query, Action<IQuer
106106
return new NhQueryable<T>(query.Provider, callExpression);
107107
}
108108

109+
// Since v5
109110
[Obsolete("Please use SetOptions instead.")]
110111
public static IQueryable<T> Cacheable<T>(this IQueryable<T> query)
111112
=> query.SetOptions(o => o.SetCacheable(true));
112113

114+
// Since v5
113115
[Obsolete("Please use SetOptions instead.")]
114116
public static IQueryable<T> CacheMode<T>(this IQueryable<T> query, CacheMode cacheMode)
115117
=> query.SetOptions(o => o.SetCacheMode(cacheMode));
116118

119+
// Since v5
117120
[Obsolete("Please use SetOptions instead.")]
118121
public static IQueryable<T> CacheRegion<T>(this IQueryable<T> query, string region)
119122
=> query.SetOptions(o => o.SetCacheRegion(region));
120123

124+
// Since v5
121125
[Obsolete("Please use SetOptions instead.")]
122126
public static IQueryable<T> Timeout<T>(this IQueryable<T> query, int timeout)
123127
=> query.SetOptions(o => o.SetTimeout(timeout));

‎src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public override Expression Visit(Expression expression)
9191
}
9292
}
9393

94+
// Since v5
9495
[Obsolete]
9596
public static class BooleanToCaseConvertor
9697
{
@@ -106,4 +107,4 @@ public static HqlExpression ConvertBooleanToCase(HqlExpression node)
106107
return node.ToArithmeticExpression();
107108
}
108109
}
109-
}
110+
}

‎src/NHibernate/Properties/ChainedPropertyAccessor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
namespace NHibernate.Properties
44
{
5-
// To be removed in v6.0
6-
[Serializable]
5+
// Since v5
76
[Obsolete("This class has no more usages in NHibernate and will be removed in a future version.")]
7+
[Serializable]
88
public class ChainedPropertyAccessor : IPropertyAccessor
99
{
1010
private readonly IPropertyAccessor[] chain;

‎src/NHibernate/SqlCommand/SqlString.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -350,21 +350,6 @@ public SqlString Append(string text)
350350
return new SqlString(new object[] { this, text });
351351
}
352352

353-
/// <summary>
354-
/// Compacts the SqlString into the fewest parts possible.
355-
/// </summary>
356-
/// <returns>A new SqlString.</returns>
357-
/// <remarks>
358-
/// Combines all SqlParts that are strings and next to each other into
359-
/// one SqlPart.
360-
/// </remarks>
361-
[Obsolete]
362-
public SqlString Compact()
363-
{
364-
// FIXME: As of january 2012, the SqlString is always in compact form. Once this is settled, perhaps we should remove SqlString.Compact()?
365-
return this;
366-
}
367-
368353
/// <summary>
369354
/// Makes a copy of the SqlString, with new parameter references (Placeholders)
370355
/// </summary>
@@ -1046,4 +1031,4 @@ public override string ToString()
10461031
}
10471032
}
10481033
}
1049-
}
1034+
}

‎src/NHibernate/Tool/hbm2ddl/SchemaMetadataUpdater.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ static IEnumerable<string> GetReservedWords(Dialect.Dialect dialect, IConnection
4242
}
4343
}
4444

45+
// Since v5
4546
[Obsolete("Use the overload that passes dialect so keywords will be updated and persisted before auto-quoting")]
4647
public static void QuoteTableAndColumns(Configuration configuration)
4748
{

0 commit comments

Comments
 (0)