Get rid of chainCriteria

Author: sdeleuze

spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt

@@ -26,15 +26,6 @@ import org.springframework.data.mongodb.core.schema.MongoJsonSchema
 import java.util.regex.Pattern
 import kotlin.reflect.KProperty
 
-/**
- * Chain [TypedCriteria].
- * @author Tjeu Kayim
- * @since 2.2
- */
-fun chainCriteria(vararg operations: TypedCriteria): Criteria {
-	return operations.fold(Criteria()) { chain, criteria -> criteria and chain }
-}
-
 /**
  * Creates a criterion using the given object as a pattern.
  * @author Tjeu Kayim

spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt

@@ -40,22 +40,14 @@ class TypedCriteriaExtensionsTests {
 				.and("price").gt(1100)
 				.and("available").isEqualTo(true)
 		)
-		val typed = Query(
-			chainCriteria(
-				Book::price gt 1100,
-				Book::available isEqualTo true
-			)
-		)
+		val typed = Query((Book::price gt 1100) and (Book::available isEqualTo true))
 		assertThat(classic.queryObject).isEqualTo(typed.queryObject)
 	}
 
 	@Test
 	fun `chaining gt & isEqualTo() should equal classic criteria`() {
 
-		val typed = chainCriteria(
-			Book::title isEqualTo "Moby-Dick",
-			Book::price lt 950
-		)
+		val typed = (Book::title isEqualTo "Moby-Dick") and (Book::price lt 950)
 		val classic = Criteria("title").isEqualTo("Moby-Dick")
 			.and("price").lt(950)
 		assertEqualCriteria(typed, classic)
@@ -377,13 +369,9 @@ class TypedCriteriaExtensionsTests {
 	@Test
 	fun `or operator() should equal classic criteria`() {
 
-		val typed = chainCriteria(
-			Book::title isEqualTo "Moby-Dick",
-			orOperator(
-				(Book::price lt 1200),
-				(Book::price gt 240)
-			)
-		)
+		val typed = (Book::title isEqualTo "Moby-Dick").orOperator(
+				Book::price lt 1200,
+				Book::price gt 240)
 		val classic = Criteria("title").isEqualTo("Moby-Dick")
 			.orOperator(
 				Criteria("price").lt(1200),
@@ -395,13 +383,9 @@ class TypedCriteriaExtensionsTests {
 	@Test
 	fun `nor() should equal classic criteria`() {
 
-		val typed = chainCriteria(
-			Book::title isEqualTo "Moby-Dick",
-			norOperator(
-				(Book::price lt 1200),
-				(Book::price gt 240)
-			)
-		)
+		val typed = (Book::title isEqualTo "Moby-Dick").norOperator(
+				Book::price lt 1200,
+				Book::price gt 240)
 		val classic = Criteria("title").isEqualTo("Moby-Dick")
 			.norOperator(
 				Criteria("price").lt(1200),
@@ -413,13 +397,9 @@ class TypedCriteriaExtensionsTests {
 	@Test
 	fun `and() should equal classic criteria`() {
 
-		val typed = chainCriteria(
-			Book::title isEqualTo "Moby-Dick",
-			andOperator(
-				(Book::price lt 1200),
-				(Book::price gt 240)
-			)
-		)
+		val typed = (Book::title isEqualTo "Moby-Dick").andOperator(
+				Book::price lt 1200,
+				Book::price gt 240)
 		val classic = Criteria("title").isEqualTo("Moby-Dick")
 			.andOperator(
 				Criteria("price").lt(1200),
@@ -444,10 +424,7 @@ class TypedCriteriaExtensionsTests {
 	@Test
 	fun `infix or should equal classic criteria`() {
 
-		val typed = chainCriteria(
-			Book::title isEqualTo "Moby-Dick",
-			(Book::price lt 1200) orOperator (Book::price gt 240)
-		)
+		val typed = (Book::title isEqualTo "Moby-Dick") and (Book::price lt 1200 orOperator (Book::price gt 240))
 		val classic = Criteria("title").isEqualTo("Moby-Dick")
 			.orOperator(Criteria("price").lt(1200), Criteria("price").gt(240))
 		assertEqualCriteria(typed, classic)