DATAMONGO-2138 - Implement and with registerCriteriaChainElement

Author: TjeuKayim

Diff for: spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java

@@ -679,7 +679,7 @@ public Criteria andOperator(Criteria... criteria) {
 		return registerCriteriaChainElement(new Criteria("$and").is(bsonList));
 	}
 
-	private Criteria registerCriteriaChainElement(Criteria criteria) {
+	Criteria registerCriteriaChainElement(Criteria criteria) {
 
 		if (lastOperatorWasNot()) {
 			throw new IllegalArgumentException(

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

@@ -391,7 +391,7 @@ infix fun KProperty<*>.bits(bitwiseCriteria: Criteria.BitwiseCriteriaOperators.(
  * @since 2.2
  * @see Criteria.orOperator
  */
-infix fun Criteria.orOperator(other: Criteria): Criteria = this.orOperator(other)
+infix fun Criteria.orOperator(other: Criteria): Criteria = Criteria().orOperator(this, other)
 
 /**
  * Creates a 'nor' criteria using the $nor operator for all of the provided criteria.
@@ -401,7 +401,7 @@ infix fun Criteria.orOperator(other: Criteria): Criteria = this.orOperator(other
  * @since 2.2
  * @see Criteria.norOperator
  */
-infix fun Criteria.norOperator(other: Criteria): Criteria = this.norOperator(other)
+infix fun Criteria.norOperator(other: Criteria): Criteria = Criteria().norOperator(this, other)
 
 /**
  * Creates an 'and' criteria using the $and operator for all of the provided criteria.
@@ -411,10 +411,10 @@ infix fun Criteria.norOperator(other: Criteria): Criteria = this.norOperator(oth
  * @since 2.2
  * @see Criteria.andOperator
  */
-infix fun Criteria.andOperator(other: Criteria): Criteria = this.andOperator(other)
+infix fun Criteria.andOperator(other: Criteria): Criteria = Criteria().andOperator(this, other)
 
 infix fun Criteria.and(other: Criteria): Criteria {
-    // TODO
-    return this
+	// TODO: Fix weird behaviour (test `isEqualTo and orOperator` fails)
+    return registerCriteriaChainElement(other)
 }
 

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

@@ -211,8 +211,8 @@ class TypedCriteriaExtensionsTests {
 	fun `not() should equal classic criteria`() {
 
 		// TODO: improve not() syntax
-		val typed = Book::title.not().isEqualTo("Moby-Dick")
-		val classic = Criteria("title").not().isEqualTo("Moby-Dick")
+		val typed = Book::price.not().lt(123)
+		val classic = Criteria("price").not().lt(123)
 		assertEqualCriteria(typed, classic)
 	}
 
@@ -413,14 +413,45 @@ class TypedCriteriaExtensionsTests {
 	}
 
 	@Test
-	fun `infix or should equal classic criteria`() {
+	fun `isEqualTo and orOperator should equal classic criteria`() {
 
 		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)
 	}
 
+	@Test
+	fun `another complex chained composition`() {
+
+		val typed = (Book::author elemMatch (Author::name ne "Herman Melville")) and
+			(Book::price lt 1200 orOperator (Book::price gt 240)) and
+			(Book::title regex "^a" norOperator (Book::title regex "b$"))
+
+		val classic = Criteria("book.author").ne("Herman Melville")
+			.orOperator(Criteria("price").lt(1200), Criteria("price").gt(240))
+			.norOperator(Criteria("title").regex("^a"), Criteria("title").regex("b$"))
+		assertEqualCriteria(typed, classic)
+	}
+
+	@Test
+	fun `orOperator and isEqualTo should equal classic criteria`() {
+
+		val typed = (Book::price lt 1200 orOperator (Book::price gt 240)) and (Book::title isEqualTo "Moby-Dick")
+		val classic = Criteria()
+			.orOperator(Criteria("price").lt(1200), Criteria("price").gt(240))
+			.and("title").isEqualTo("Moby-Dick")
+		assertEqualCriteria(typed, classic)
+	}
+
+	@Test
+	fun `infix or should equal classic criteria`() {
+
+		val typed = (Book::price lt 1200) orOperator (Book::price gt 240)
+		val classic = Criteria().orOperator(Criteria("price").lt(1200), Criteria("price").gt(240))
+		assertEqualCriteria(typed, classic)
+	}
+
 	@Test
 	fun `infix nor should equal classic criteria`() {