DATAMONGO-2138 - Infix or/nor/and operators

Author: TjeuKayim

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

@@ -429,6 +429,16 @@ infix fun KProperty<*>.bits(bitwiseCriteria: Criteria.BitwiseCriteriaOperators.(
  */
 fun orOperator(vararg builders: TypedCriteria) = addOperatorWithCriteria(builders, Criteria::orOperator)
 
+/**
+ * Creates an 'or' criteria using the $or operator for all of the provided criteria
+ *
+ * Note that mongodb doesn't support an $or operator to be wrapped in a $not operator.
+ * @author Tjeu Kayim
+ * @since 2.2
+ * @see Criteria.orOperator
+ */
+infix fun TypedCriteria.or(other: TypedCriteria) = orOperator(this, other)
+
 /**
  * Creates a 'nor' criteria using the $nor operator for all of the provided criteria.
  *
@@ -439,6 +449,16 @@ fun orOperator(vararg builders: TypedCriteria) = addOperatorWithCriteria(builder
  */
 fun norOperator(vararg builders: TypedCriteria) = addOperatorWithCriteria(builders, Criteria::norOperator)
 
+/**
+ * Creates a 'nor' criteria using the $nor operator for all of the provided criteria.
+ *
+ * Note that mongodb doesn't support an $nor operator to be wrapped in a $not operator.
+ * @author Tjeu Kayim
+ * @since 2.2
+ * @see Criteria.norOperator
+ */
+infix fun TypedCriteria.nor(other: TypedCriteria) = norOperator(this, other)
+
 /**
  * Creates an 'and' criteria using the $and operator for all of the provided criteria.
  *
@@ -449,6 +469,16 @@ fun norOperator(vararg builders: TypedCriteria) = addOperatorWithCriteria(builde
  */
 fun andOperator(vararg builders: TypedCriteria) = addOperatorWithCriteria(builders, Criteria::andOperator)
 
+/**
+ * Creates an 'and' criteria using the $and operator for all of the provided criteria.
+ *
+ * Note that mongodb doesn't support an $and operator to be wrapped in a $not operator.
+ * @author Tjeu Kayim
+ * @since 2.2
+ * @see Criteria.andOperator
+ */
+infix fun TypedCriteria.and(other: TypedCriteria) = andOperator(this, other)
+
 private fun addOperatorWithCriteria(
 	builders: Array<out TypedCriteria>,
 	operation: Criteria.(Array<Criteria>) -> Criteria

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

@@ -53,16 +53,13 @@ private fun typedCriteriaSample(mongoOperations: MongoOperations) {
 	// Chain with typedCriteria()
 	typedCriteria(
 		Book::author elemMatch
-				(Author::name isEqualTo "Herman Melville"),
+			(Author::name isEqualTo "Herman Melville"),
 		Book::price exists true
 	)
 	// $or, $nor, $and operators
 	typedCriteria(
 		Book::name isEqualTo "Moby-Dick",
-		orOperator(
-			Book::price lt 1200,
-			Book::price gt 240
-		)
+		(Book::price lt 1200) or (Book::price gt 240)
 	)
 	// Nested Properties (i.e. refer to "book.author")
 	typedCriteria(

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

@@ -416,6 +416,38 @@ class TypedCriteriaExtensionsTests {
 		assertEqualCriteria(typed, classic)
 	}
 
+	@Test
+	fun `infix or & and typed criteria should equal classic criteria`() {
+
+		val typed = (Book::title isEqualTo "Moby-Dick") and ((Book::price lt 1200) or (Book::price gt 240))
+		val classic = Criteria().andOperator(
+			Criteria("title").isEqualTo("Moby-Dick"),
+			Criteria().orOperator(Criteria("price").lt(1200), Criteria("price").gt(240))
+		)
+		println(classic.criteriaObject.toJson())
+		assertEqualCriteria(typed, classic)
+	}
+
+	@Test
+	fun `infix or typed criteria should equal classic criteria`() {
+
+		val typed = typedCriteria(
+			Book::title isEqualTo "Moby-Dick",
+			(Book::price lt 1200) or (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 `infix nor typed criteria should equal classic criteria`() {
+
+		val typed = (Book::price lt 1200) nor (Book::price gt 240)
+		val classic = Criteria().norOperator(Criteria("price").lt(1200), Criteria("price").gt(240))
+		assertEqualCriteria(typed, classic)
+	}
+
 	@Test
 	fun `One level nested typed criteria should equal classic criteria`() {