[Nhibernate-commit] SF.net SVN: nhibernate:[4542] trunk/nhibernate/src/NHibernate

[<Ric...@us...>]

Revision: 4542
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4542&view=rev
Author:   RicBrown
Date:     2009-06-29 18:10:53 +0000 (Mon, 29 Jun 2009)

Log Message:
-----------
Reverted changes to ICriteria to keep ICriteria<T> separate (for now at least).

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/ICriteria.cs
    trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
    trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
    trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj

Removed Paths:
-------------
    trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaFixture.cs

Modified: trunk/nhibernate/src/NHibernate/ICriteria.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/ICriteria.cs	2009-06-28 21:59:29 UTC (rev 4541)
+++ trunk/nhibernate/src/NHibernate/ICriteria.cs	2009-06-29 18:10:53 UTC (rev 4542)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using NHibernate.Criterion;
 using NHibernate.SqlCommand;
 using NHibernate.Transform;
@@ -10,7 +9,7 @@
 {
 	/// <summary>
 	/// Criteria is a simplified API for retrieving entities by composing
-	/// <see cref="Criterion.Expression" /> objects.
+	/// <see cref="Expression" /> objects.
 	/// </summary>
 	/// <remarks>
 	/// <para>
@@ -19,7 +18,7 @@
 	/// </para>
 	/// <para>
 	/// The Session is a factory for ICriteria. Expression instances are usually obtained via 
-	/// the factory methods on <see cref="Criterion.Expression" />. eg:
+	/// the factory methods on <see cref="Expression" />. eg:
 	/// </para>
 	/// <code>
 	/// IList cats = session.CreateCriteria(typeof(Cat)) 
@@ -83,14 +82,6 @@
 		ICriteria Add(ICriterion expression);
 
 		/// <summary>
-		/// Add criterion expressed as a lambda expression
-		/// </summary>
-		/// <typeparam name="T">Type (same as criteria type)</typeparam>
-		/// <param name="expression">Lambda expression</param>
-		/// <returns>criteria instance</returns>
-		ICriteria Add<T>(Expression<Func<T, bool>> expression);
-
-		/// <summary>
 		/// An an Order to the result set 
 		/// </summary>
 		/// <param name="order"></param>

Modified: trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2009-06-28 21:59:29 UTC (rev 4541)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs	2009-06-29 18:10:53 UTC (rev 4542)
@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Text;
 using NHibernate.Criterion;
 using NHibernate.Engine;
@@ -232,11 +231,6 @@
 			return this;
 		}
 
-		public ICriteria Add<T>(Expression<Func<T, bool>> expression)
-		{
-			return Add(ExpressionProcessor.ProcessExpression<T>(expression));
-		}
-
 		public IList List()
 		{
 			ArrayList results = new ArrayList();
@@ -673,11 +667,6 @@
 				return this;
 			}
 
-			public ICriteria Add<T>(Expression<Func<T, bool>> expression)
-			{
-				return Add(ExpressionProcessor.ProcessExpression<T>(expression));
-			}
-
 			public ICriteria AddOrder(Order order)
 			{
 				root.orderEntries.Add(new OrderEntry(order, this));

Deleted: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaFixture.cs	2009-06-28 21:59:29 UTC (rev 4541)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaFixture.cs	2009-06-29 18:10:53 UTC (rev 4542)
@@ -1,34 +0,0 @@
-using System;
-using System.Collections;
-
-using NUnit.Framework;
-
-using NHibernate.Criterion;
-using NHibernate.Transform;
-using NHibernate.Type;
-using NHibernate.Util;
-
-namespace NHibernate.Test.Criteria.Lambda
-{
-
-	[TestFixture]
-	public class CriteriaFixture : LambdaFixtureBase
-	{
-
-		[Test]
-		public void Equality()
-		{
-			ICriteria expected =
-				CreateTestCriteria(typeof(Person))
-					.Add(Restrictions.Eq("Name", "test name"));
-
-			ICriteria actual =
-				CreateTestCriteria(typeof(Person))
-					.Add<Person>(p => p.Name == "test name");
-
-			AssertCriteriaAreEqual(expected, actual);
-		}
-
-	}
-
-}
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2009-06-28 21:59:29 UTC (rev 4541)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2009-06-29 18:10:53 UTC (rev 4542)
@@ -43,30 +43,6 @@
 		}
 
 		[Test]
-		public void ICriteria_SimpleCriterion()
-		{
-			using (ISession s = OpenSession())
-			using (ITransaction t = s.BeginTransaction())
-			{
-				s.Save(new Person() { Name = "test person 1" });
-				s.Save(new Person() { Name = "test person 2" });
-				s.Save(new Person() { Name = "test person 3" });
-
-				t.Commit();
-			}
-
-			using (ISession s = OpenSession())
-			{
-				IList<Person> actual =
-					s.CreateCriteria(typeof(Person))
-						.Add<Person>(p => p.Name == "test person 2")
-						.List<Person>();
-
-				Assert.That(actual.Count, Is.EqualTo(1));
-			}
-		}
-
-		[Test]
 		public void ICriteriaOfT_SimpleCriterion()
 		{
 			using (ISession s = OpenSession())

Modified: trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-06-28 21:59:29 UTC (rev 4541)
+++ trunk/nhibernate/src/NHibernate.Test/NHibernate.Test.csproj	2009-06-29 18:10:53 UTC (rev 4542)
@@ -145,7 +145,6 @@
     <Compile Include="Criteria\DetachedCriteriaSerializable.cs" />
     <Compile Include="Criteria\Enrolment.cs" />
     <Compile Include="Criteria\Lambda\CriteriaAssertFixture.cs" />
-    <Compile Include="Criteria\Lambda\CriteriaFixture.cs" />
     <Compile Include="Criteria\Lambda\CriteriaOfTFixture.cs" />
     <Compile Include="Criteria\Lambda\IntegrationFixture.cs" />
     <Compile Include="Criteria\Lambda\LambdaFixtureBase.cs" />


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.