Do not generate obsolete members

Author: hazzik

src/NHibernate/Async/Engine/ISessionImplementor.cs

@@ -64,15 +64,6 @@ public partial interface ISessionImplementor
 		/// <returns></returns>
 		Task<object> ImmediateLoadAsync(string entityName, object id);
 
-		/// <summary>
-		/// Execute a <c>List()</c> query
-		/// </summary>
-		/// <param name="query"></param>
-		/// <param name="parameters"></param>
-		/// <returns></returns>
-		[Obsolete("Use overload with IQueryExpression")]
-		Task<IList> ListAsync(string query, QueryParameters parameters);
-
 		/// <summary>
 		/// Execute a <c>List()</c> expression query
 		/// </summary>
@@ -81,17 +72,8 @@ public partial interface ISessionImplementor
 		/// <returns></returns>
 		Task<IList> ListAsync(IQueryExpression queryExpression, QueryParameters parameters);
 
-		[Obsolete("Use overload with IQueryExpression")]
-		Task ListAsync(string query, QueryParameters parameters, IList results);
-
 		Task ListAsync(IQueryExpression queryExpression, QueryParameters queryParameters, IList results);
 
-		/// <summary>
-		/// Strongly-typed version of <see cref="List(string,QueryParameters)" />
-		/// </summary>
-		[Obsolete("Use overload with IQueryExpression")]
-		Task<IList<T>> ListAsync<T>(string query, QueryParameters queryParameters);
-
 		/// <summary>
 		/// Strongly-typed version of <see cref="List(IQueryExpression,QueryParameters)" />
 		/// </summary>
@@ -106,15 +88,6 @@ public partial interface ISessionImplementor
 
 		Task<IList> ListAsync(CriteriaImpl criteria);
 
-		/// <summary>
-		/// Execute an <c>Iterate()</c> query
-		/// </summary>
-		/// <param name="query"></param>
-		/// <param name="parameters"></param>
-		/// <returns></returns>
-		[Obsolete("Use overload with IQueryExpression")]
-		Task<IEnumerable> EnumerableAsync(string query, QueryParameters parameters);
-
 		/// <summary>
 		/// Execute an <c>Iterate()</c> query
 		/// </summary>
@@ -123,12 +96,6 @@ public partial interface ISessionImplementor
 		/// <returns></returns>
 		Task<IEnumerable> EnumerableAsync(IQueryExpression query, QueryParameters parameters);
 
-		/// <summary>
-		/// Strongly-typed version of <see cref="Enumerable(string, QueryParameters)" />
-		/// </summary>
-		[Obsolete("Use overload with IQueryExpression")]
-		Task<IEnumerable<T>> EnumerableAsync<T>(string query, QueryParameters queryParameters);
-
 		/// <summary>
 		/// Strongly-typed version of <see cref="Enumerable(IQueryExpression, QueryParameters)" />
 		/// </summary>
@@ -170,9 +137,6 @@ public partial interface ISessionImplementor
 		Task ListCustomQueryAsync(ICustomQuery customQuery, QueryParameters queryParameters, IList results);
 
 		Task<IList<T>> ListCustomQueryAsync<T>(ICustomQuery customQuery, QueryParameters queryParameters);
-
-		[Obsolete("Use overload with IQueryExpression")]
-		Task<IQueryTranslator[]> GetQueriesAsync(string query, bool scalar); // NH specific for MultiQuery
 
 		Task<IQueryTranslator[]> GetQueriesAsync(IQueryExpression query, bool scalar); // NH specific for MultiQuery
 
@@ -187,10 +151,6 @@ public partial interface ISessionImplementor
 		/// <summary> Execute a native SQL update or delete query</summary>
 		Task<int> ExecuteNativeUpdateAsync(NativeSQLQuerySpecification specification, QueryParameters queryParameters);
 
-		/// <summary> Execute a HQL update or delete query</summary>
-		[Obsolete("Use overload with IQueryExpression")]
-		Task<int> ExecuteUpdateAsync(string query, QueryParameters queryParameters);
-
 		/// <summary> Execute a HQL update or delete query</summary>
 		Task<int> ExecuteUpdateAsync(IQueryExpression query, QueryParameters queryParameters);
 	}

src/NHibernate/Async/Impl/AbstractSessionImpl.cs

@@ -39,45 +39,6 @@ public abstract partial class AbstractSessionImpl : ISessionImplementor
 		public abstract Task<object> InternalLoadAsync(string entityName, object id, bool eager, bool isNullable);
 		public abstract Task<object> ImmediateLoadAsync(string entityName, object id);
 
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task<IList> ListAsync(string query, QueryParameters parameters)
-		{
-			try
-			{
-				return ListAsync(query.ToQueryExpression(), parameters);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IList>(ex);
-			}
-		}
-
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task ListAsync(string query, QueryParameters queryParameters, IList results)
-		{
-			try
-			{
-				return ListAsync(query.ToQueryExpression(), queryParameters, results);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<object>(ex);
-			}
-		}
-
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task<IList<T>> ListAsync<T>(string query, QueryParameters queryParameters)
-		{
-			try
-			{
-				return ListAsync<T>(query.ToQueryExpression(), queryParameters);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IList<T>>(ex);
-			}
-		}
-
 		public virtual async Task<IList> ListAsync(IQueryExpression queryExpression, QueryParameters parameters)
 		{
 			var results = (IList) typeof (List<>).MakeGenericType(queryExpression.Type)
@@ -170,19 +131,6 @@ public virtual async Task<IList<T>> ListCustomQueryAsync<T>(ICustomQuery customQ
 				return results;
 			}
 		}
-
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task<IQueryTranslator[]> GetQueriesAsync(string query, bool scalar)
-		{
-			try
-			{
-				return GetQueriesAsync(query.ToQueryExpression(), scalar);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IQueryTranslator[]>(ex);
-			}
-		}
 
 		public abstract Task<IQueryTranslator[]> GetQueriesAsync(IQueryExpression query, bool scalar);
 		public abstract Task<object> GetEntityUsingInterceptorAsync(EntityKey key);
@@ -194,47 +142,8 @@ public virtual Task<IQueryTranslator[]> GetQueriesAsync(string query, bool scala
 
 		public abstract Task<IEnumerable> EnumerableAsync(IQueryExpression queryExpression, QueryParameters queryParameters);
 
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task<IEnumerable> EnumerableAsync(string query, QueryParameters queryParameters)
-		{
-			try
-			{
-				return EnumerableAsync(query.ToQueryExpression(), queryParameters);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IEnumerable>(ex);
-			}
-		}
-
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task<IEnumerable<T>> EnumerableAsync<T>(string query, QueryParameters queryParameters)
-		{
-			try
-			{
-				return EnumerableAsync<T>(query.ToQueryExpression(), queryParameters);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<IEnumerable<T>>(ex);
-			}
-		}
-
 		public abstract Task<IEnumerable<T>> EnumerableAsync<T>(IQueryExpression queryExpression, QueryParameters queryParameters);
 
-		[Obsolete("Use overload with IQueryExpression")]
-		public virtual Task<int> ExecuteUpdateAsync(string query, QueryParameters queryParameters)
-		{
-			try
-			{
-				return ExecuteUpdateAsync(query.ToQueryExpression(), queryParameters);
-			}
-			catch (Exception ex)
-			{
-				return Task.FromException<int>(ex);
-			}
-		}
-
 		public abstract Task<int> ExecuteUpdateAsync(IQueryExpression queryExpression, QueryParameters queryParameters);
 	}
 }